Merge "Remove obsolete comments"