cleaned up cli and net-ssh