Cleaning up on the cloud code stuff.