SSH, SunBeam & some cleanup