Remove cm files

Change-Id: I942f96f4af144d440f33fcf66d3687e2c04a8712