Update notes for submitted changes

* Kill finally, use addCleanUp