comment cleanup pt1