Remove envs that don't matter for bundle (again)