Simplify RemoteClient to use existing infrastructure.