Update notes for submitted changes

* Remove unused imports and some cleanup