Clean up strings

Update cm_arrays.xml was a clean up too.