Remove cruft, add cloud as requirement