Clean unused cruft
Clean up cloud.py