Removed remnants of old ssh handling from the merge