remove rpc workaround