Finish consolidating get on envs