Remoce CM stuffs

Change-Id: Idc9dd5560dd7ee600b7746a334303ead52724d43