remove cm depencies

Change-Id: Ibd34a57c4b8ba1c8f55e7ae7fdb32ae69b14c5ee