CLOUDIFY-2083 cleanup