Remove CliMachine and use RemoteMachine instead