Fix build, remove some cm stuff

Change-Id: I98307934ce1e50adafc8fb81eebf1a343848ce7f
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>