clean-up of unnecessary comments