comment cleanup [ci skip]