Merge "Remove the comment that is not applicable anymore"