Clean up ssh options
Clean up deprecated cmd passing