CDK-733: more cleanup