cloud: remove a bunch of cruft
    
    Pretty much all of it is obsolete or not needed any longer because
    bugs were fixed at one time or another.
    
    (cherry picked from commit c94861c9e8589c19bafd202ac14d53c70c3153bd)