Remove CM

Change-Id: If177d5edfbc5fc70c8f6e8ee1710ad6b4409a49a