CDO tidy up...