diff --git a/operator/node/src/cli.rs b/operator/node/src/cli.rs
index d661df4e..4d82e134 100644
--- a/operator/node/src/cli.rs
+++ b/operator/node/src/cli.rs
@@ -639,10 +639,11 @@ impl ProviderConfigurations {
             bs_changed = true;
         }
 
-        if let Some(extrinsic_mortality) = self.extrinsic_mortality {
-            bs_options.extrinsic_mortality = Some(extrinsic_mortality);
-            bs_changed = true;
-        }
+        // TODO: restore once PR https://github.com/Moonsong-Labs/storage-hub/pull/671 is merged
+        // if let Some(extrinsic_mortality) = self.extrinsic_mortality {
+        //     bs_options.extrinsic_mortality = Some(extrinsic_mortality);
+        //     bs_changed = true;
+        // }
 
         if let Some(check_for_pending_proofs_period) = self.check_for_pending_proofs_period {
             bs_options.check_for_pending_proofs_period = Some(check_for_pending_proofs_period);
@@ -864,10 +865,11 @@ impl FishermanConfigurations {
             let mut bs_options = BlockchainServiceOptions::default();
             let mut bs_changed = false;
 
-            if let Some(extrinsic_mortality) = self.fisherman_extrinsic_mortality {
-                bs_options.extrinsic_mortality = Some(extrinsic_mortality);
-                bs_changed = true;
-            }
+            // TODO: restore once PR https://github.com/Moonsong-Labs/storage-hub/pull/671 is merged
+            // if let Some(extrinsic_mortality) = self.fisherman_extrinsic_mortality {
+            //     bs_options.extrinsic_mortality = Some(extrinsic_mortality);
+            //     bs_changed = true;
+            // }
 
             if bs_changed {
                 blockchain_service = Some(bs_options);
@@ -886,7 +888,8 @@ impl FishermanConfigurations {
                 maintenance_mode: false, // Skipping maintenance mode for now
                 filtering,
                 ordering,
-                blockchain_service,
+                // TODO: restore once PR https://github.com/Moonsong-Labs/storage-hub/pull/671 is merged
+                // blockchain_service,
             })
         } else {
             None
diff --git a/operator/node/src/command.rs b/operator/node/src/command.rs
index bcd4a3a4..34570177 100644
--- a/operator/node/src/command.rs
+++ b/operator/node/src/command.rs
@@ -427,9 +427,7 @@ pub fn run() -> sc_cli::Result<()> {
                 };
 
                 match config.network.network_backend {
-                    // TODO: Litep2p becomes standard with Polkadot SDK stable2412-7 (should move None to other arm)
-                    // cfr. https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-stable2412-7
-                    Some(sc_network::config::NetworkBackendType::Libp2p) | None => {
+                    sc_network::config::NetworkBackendType::Libp2p => {
                         match config.chain_spec {
                             ref spec if spec.is_mainnet() => {
                                 service::new_full::<
@@ -464,7 +462,7 @@ pub fn run() -> sc_cli::Result<()> {
                         }
                         .map_err(sc_cli::Error::Service)
                     }
-                    Some(sc_network::config::NetworkBackendType::Litep2p) => {
+                    sc_network::config::NetworkBackendType::Litep2p => {
                         match config.chain_spec {
                             ref spec if spec.is_mainnet() => {
                                 service::new_full::<
diff --git a/operator/node/src/rpc.rs b/operator/node/src/rpc.rs
index 25380cdb..84d770f3 100644
--- a/operator/node/src/rpc.rs
+++ b/operator/node/src/rpc.rs
@@ -40,7 +40,7 @@ use sc_consensus_beefy::communication::notification::{
 };
 use sc_consensus_manual_seal::rpc::{EngineCommand, ManualSeal, ManualSealApiServer};
 use sc_network_sync::SyncingService;
-use sc_transaction_pool::{ChainApi, Pool};
+use sc_transaction_pool::ChainApi;
 use sc_transaction_pool_api::TransactionPool;
 use shc_client::types::FileStorageT;
 use shc_common::traits::StorageEnableRuntime;
@@ -54,7 +54,7 @@ use shc_rpc::StorageHubClientRpcConfig;
 use sp_consensus_babe::{BabeApi, SlotDuration};
 use sp_consensus_beefy::AuthorityIdBound;
 use sp_core::H256;
-use sp_runtime::traits::BlakeTwo256;
+use sp_runtime::traits::{BlakeTwo256, Block as BlockT, Header as HeaderT};
 use std::collections::BTreeMap;
 use std::sync::Arc;
 
@@ -69,7 +69,7 @@ pub struct BeefyDeps<AuthorityId: AuthorityIdBound> {
 }
 
 /// Full client dependencies.
-pub struct FullDeps<P, B, AuthorityId: AuthorityIdBound, A: ChainApi, FL, FS, Runtime>
+pub struct FullDeps<P, B, AuthorityId: AuthorityIdBound, FL, FS, Runtime>
 where
     Runtime: StorageEnableRuntime,
 {
@@ -80,7 +80,7 @@ where
     /// BEEFY dependencies.
     pub beefy: BeefyDeps<AuthorityId>,
     /// Graph pool instance.
-    pub graph: Arc<Pool<A>>,
+    pub graph: Arc<P>,
     /// Backend used by the node.
     pub backend: Arc<B>,
     /// Network service
@@ -112,8 +112,8 @@ where
 }
 
 /// Instantiate all full RPC extensions.
-pub fn create_full<P, BE, AuthorityId, A, FL, FSH, Runtime>(
-    deps: FullDeps<P, BE, AuthorityId, A, FL, FSH, Runtime>,
+pub fn create_full<P, BE, AuthorityId, FL, FSH, Runtime>(
+    deps: FullDeps<P, BE, AuthorityId, FL, FSH, Runtime>,
     subscription_task_executor: sc_rpc::SubscriptionTaskExecutor,
     pubsub_notification_sinks: Arc<
         fc_mapping_sync::EthereumBlockNotificationSinks<
@@ -122,11 +122,10 @@ pub fn create_full<P, BE, AuthorityId, A, FL, FSH, Runtime>(
     >,
 ) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>
 where
-    P: TransactionPool<Block = Block> + 'static,
+    P: TransactionPool<Block = Block, Hash = <Block as BlockT>::Hash> + 'static,
     BE: Backend<Block> + Send + Sync + 'static,
     BE::State: StateBackend<BlakeTwo256>,
     AuthorityId: AuthorityIdBound,
-    A: ChainApi<Block = Block> + 'static,
     Runtime: StorageEnableRuntime,
     Runtime::RuntimeApi: StorageEnableRuntimeApi<
         RuntimeApi: mmr_rpc::MmrRuntimeApi<
@@ -225,7 +224,7 @@ where
     };
 
     module.merge(
-        Eth::<_, _, _, _, _, _, _, DefaultEthConfig<StorageHubClient<Runtime::RuntimeApi>, BE>>::new(
+        Eth::<_, _, _, _, _, _, DefaultEthConfig<StorageHubClient<Runtime::RuntimeApi>, BE>>::new(
             Arc::clone(&client),
             Arc::clone(&pool),
             graph.clone(),
diff --git a/operator/node/src/service.rs b/operator/node/src/service.rs
index 7b307420..dd2963d3 100644
--- a/operator/node/src/service.rs
+++ b/operator/node/src/service.rs
@@ -572,7 +572,7 @@ where
         Vec::default(),
     ));
 
-    let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
+    let (network, system_rpc_tx, tx_handler_controller, sync_service) =
         sc_service::build_network(sc_service::BuildNetworkParams {
             config: &config,
             net_config,
@@ -698,7 +698,7 @@ where
                 let deps = crate::rpc::FullDeps {
                     client: client.clone(),
                     pool: pool.clone(),
-                    graph: pool.pool().clone(),
+                    graph: pool.clone(),
                     beefy: BeefyDeps::<BeefyId> {
                         beefy_finality_proof_stream: beefy_rpc_links
                             .from_voter_justif_stream
@@ -996,7 +996,6 @@ where
         .await?;
     }
 
-    network_starter.start_network();
     Ok(task_manager)
 }
 
@@ -1332,10 +1331,11 @@ where
             // Set the indexer db pool
             builder.with_indexer_db_pool(Some(db_pool));
 
+            // TODO: restore once PR https://github.com/Moonsong-Labs/storage-hub/pull/671 is merged
             // Configure blockchain service options for the fisherman
-            if let Some(c) = fisherman_options.blockchain_service.clone() {
-                builder.with_blockchain_service_config(c);
-            }
+            // if let Some(c) = fisherman_options.blockchain_service.clone() {
+            //     builder.with_blockchain_service_config(c);
+            // }
 
             // Spawn the fisherman service
             builder
diff --git a/operator/runtime/stagenet/src/configs/mod.rs b/operator/runtime/stagenet/src/configs/mod.rs
index db9782a0..66272a1f 100644
--- a/operator/runtime/stagenet/src/configs/mod.rs
+++ b/operator/runtime/stagenet/src/configs/mod.rs
@@ -80,7 +80,6 @@ impl Default for ProxyType {
 }
 use core::{
     convert::{From, Into},
-    prelude::*,
 };
 use datahaven_runtime_common::{
     deal_with_fees::{
diff --git a/operator/runtime/testnet/src/configs/mod.rs b/operator/runtime/testnet/src/configs/mod.rs
index 7a7b14d4..67c1fc29 100644
--- a/operator/runtime/testnet/src/configs/mod.rs
+++ b/operator/runtime/testnet/src/configs/mod.rs
@@ -80,7 +80,6 @@ impl Default for ProxyType {
 }
 use core::{
     convert::{From, Into},
-    prelude::*,
 };
 use datahaven_runtime_common::{
     deal_with_fees::{