Add sync
Remove orchestrator