CLOUDIFY-2027 Cleanup