Merge "Remove obsolete comments."