Cleanup for Cloud Deployment