Merge "Delete OrchestrationManager, and its unusual credentials"