Disabled references to environment_server