Update notes for submitted changes

* Fix cleanup for sahara