remove cm dependencies

Change-Id: I16fd682700ab1fa22d635238780bb487884e1a6c