Remove CM profiles
and some other minor things

Change-Id: I2a8c05f613ac6f62911c30f92a1f6e1248a5591d