more clean-up of compilation statements