Remove CM stuff + fix build

Change-Id: Iffa1f1ae6979f4b21e656b43395dcced0f5a031a