DC: cleanup

Change-Id: I31a13a24bf958329ad4df792922fbb6d12d44a73