get rid of a few CM things

Change-Id: I05c1e164631cd8c1d64c4798246eea1f2210656b