Update notes for submitted changes

* cleanup unused code