Update notes for submitted changes

* Cleanup object usage in the rebuild path