DC: bigger cleanup

Change-Id: I393ba5a07ce642f2a40e3fcabd2486f7dd021485