Removing redundant RPC stuff