tidy up cloud & hpcloud components