More cleanup and work in CDR for UCP