Remove unnecessary rpc