Remove more old CM stuff

Change-Id: Ib67d83d810ea3d193f86d75651e7cc47ed76aec3