CLOUDIFY-188 cleanup