dmarc: cleanup rebase litter