CDR cleanup