improved comment removal