Remove obsolete CDA classes and methods