Clean-up of CCDA service 2.0