comment removal, clean-up + build-up of env