Remove an unused file -- moved to common

Change-Id: I7155a558caf84dd80bb24b775400c60510788682
Remove cm stuff

Change-Id: I00bcd33b64ccd303dab87284ddb6682d381c7e3d