Merge "Removed dead code in DcTracker"