Remove unnecessary rpc call