Cleaned up RPC.Client