Merge "Remove Suggestion v1 code."