Update notes for submitted changes

* Remove cleanup code according to TODO comment