Update notes for submitted changes

* moves addCleanup few lines upper to avoid potential leftovers