Remove cm files

Change-Id: Id283ad62a6bd3d3882c0c7644a27218441d7f063