Cmp clean up