Update notes for submitted changes

* Add cleanup for orchestrator