Update notes for submitted changes

* Cleanup unused states