cleanup, removing comments