Remove reference to envs