Update notes for submitted changes

* Remove CM stuff we dont use and clean up the settings app