TAMAYA-3:  Removed outdated EnvironmentSelector