Update notes for submitted changes

* Removing cm_strings entails painful merging of upstream cm commits