Remove unwanted CM code

Change-Id: If31c9e9d6a6e9b6440455a040a37757e99c5eac0