Remove CM dependencies and fix DU dependencies

Change-Id: I0560770357d6ab11280cbd47558d6e36adaa0ca9