Cleanup in cm_strings

Change-Id: I286cc0ac82eb0e3268fd475a3a57a532b2615e58