Update notes for submitted changes

* Unset all stubs before running other cleanups.