cleanpup, removal of comments