cm removal derp

Change-Id: I749becd2f3d6e021fd1d4df7c90b756c9af40b62