[#2125] comment cleanup