Merge "remove invalid comment"