Removed more OperationManager stuff