Refactor out EnvironmentV1.