CLOUDIFY-1997 Clean up of cloud files