remove cm dependencies

Change-Id: I69e751155ae270183a2a5543b8a43bb5ad78bfe0