MAINT remove deprecated code from CD