Remove CM prop

Change-Id: I9ca429aa8db7a9d9d35254e2529d4111da18fac2