refactor(dccd): code cleanup
fix(dccd): fix removals reporting

closes #1097