Remove some CM stuff

Change-Id: I193f724def14f056cc5765976f8715e5fa709113
Signed-off-by: Evan Anderson <evan1124@gmail.com>

More

Change-Id: I7f21b094171c315557853a2df8969e8eef9d2db8
Signed-off-by: Evan Anderson <evan1124@gmail.com>