remove in favor of cm

Change-Id: Ibf43ebe0d4f34b0e12aec318730c06aab7f0d643