Removed some CM related stuff

Change-Id: I639f736a9f4f160adc58925544cdc69bda3bc83d