Cloud Viewers cleanup