CDK-733: cleanup