clean-up of the commented