Update notes for submitted changes

* Fixed NPE due to missing cleanup of stale elements.