comments clean-up