diff --git a/src/index/fetcher.rs b/src/index/fetcher.rs
index 774405b9f5..9bb38d9e80 100644
--- a/src/index/fetcher.rs
+++ b/src/index/fetcher.rs
@@ -1,10 +1,7 @@
 use {
-  crate::Options,
-  anyhow::{anyhow, Result},
+  super::*,
   base64::Engine,
-  bitcoin::{Transaction, Txid},
   hyper::{client::HttpConnector, Body, Client, Method, Request, Uri},
-  serde::Deserialize,
   serde_json::{json, Value},
 };
 
diff --git a/src/index/reorg.rs b/src/index/reorg.rs
index fc6164282c..3102cdc7d7 100644
--- a/src/index/reorg.rs
+++ b/src/index/reorg.rs
@@ -85,7 +85,8 @@ impl Reorg {
 
     if (height < SAVEPOINT_INTERVAL || height % SAVEPOINT_INTERVAL == 0)
       && index
-        .client
+        .options
+        .bitcoin_rpc_client()?
         .get_blockchain_info()?
         .headers
         .saturating_sub(height)