Cleaning up cloud class