CLOUDIFY-2603 cleanup