Merge "Remove old suggestion code."