Remove some CM stuff

Change-Id: I0c55a339b0e817bd2b2ac5ae64201c5cfb0657dd