diff --git a/applications/tari_base_node/src/bootstrap.rs b/applications/tari_base_node/src/bootstrap.rs
index d2975aaa22..0a0a455eea 100644
--- a/applications/tari_base_node/src/bootstrap.rs
+++ b/applications/tari_base_node/src/bootstrap.rs
@@ -43,6 +43,7 @@ use tari_core::{
     consensus::ConsensusManager,
     mempool,
     mempool::{service::MempoolHandle, Mempool, MempoolServiceInitializer, MempoolSyncInitializer},
+    proof_of_work::randomx_factory::RandomXFactory,
     transactions::CryptoFactories,
 };
 use tari_p2p::{
@@ -153,6 +154,8 @@ where B: BlockchainBackend + 'static
                 base_node_config.state_machine.clone(),
                 self.rules,
                 self.factories,
+                RandomXFactory::new(self.app_config.base_node.max_randomx_vms),
+                self.app_config.base_node.bypass_range_proof_verification,
             ))
             .build()
             .await?;
diff --git a/applications/tari_base_node/src/config.rs b/applications/tari_base_node/src/config.rs
index 184ff83e9a..8346fd95d2 100644
--- a/applications/tari_base_node/src/config.rs
+++ b/applications/tari_base_node/src/config.rs
@@ -103,10 +103,8 @@ pub struct BaseNodeConfig {
     /// The relative path to store the lmbd data
     pub lmdb_path: PathBuf,
     /// The maximum amount of VMs that RandomX will be use
-    // TODO: This is a potential conflict with 'BaseNodeStateMachineConfig::max_randomx_vms'
     pub max_randomx_vms: usize,
     /// Bypass range proof verification to speed up validation
-    // TODO: This is a potential conflict with 'BaseNodeStateMachineConfig::bypass_range_proof_verification'
     pub bypass_range_proof_verification: bool,
     /// The p2p config settings
     pub p2p: P2pConfig,
diff --git a/base_layer/core/src/base_node/state_machine_service/initializer.rs b/base_layer/core/src/base_node/state_machine_service/initializer.rs
index 6061a6c435..bec8856d78 100644
--- a/base_layer/core/src/base_node/state_machine_service/initializer.rs
+++ b/base_layer/core/src/base_node/state_machine_service/initializer.rs
@@ -51,6 +51,8 @@ pub struct BaseNodeStateMachineInitializer<B> {
     config: BaseNodeStateMachineConfig,
     rules: ConsensusManager,
     factories: CryptoFactories,
+    randomx_factory: RandomXFactory,
+    bypass_range_proof_verification: bool,
 }
 
 impl<B> BaseNodeStateMachineInitializer<B>
@@ -61,12 +63,16 @@ where B: BlockchainBackend + 'static
         config: BaseNodeStateMachineConfig,
         rules: ConsensusManager,
         factories: CryptoFactories,
+        randomx_factory: RandomXFactory,
+        bypass_range_proof_verification: bool,
     ) -> Self {
         Self {
             db,
             config,
             rules,
             factories,
+            randomx_factory,
+            bypass_range_proof_verification,
         }
     }
 }
@@ -91,6 +97,8 @@ where B: BlockchainBackend + 'static
         let rules = self.rules.clone();
         let db = self.db.clone();
         let config = self.config.clone();
+        let randomx_factory = self.randomx_factory.clone();
+        let bypass_range_proof_verification = self.bypass_range_proof_verification;
 
         let mut mdc = vec![];
         log_mdc::iter(|k, v| mdc.push((k.to_owned(), v.to_owned())));
@@ -105,10 +113,9 @@ where B: BlockchainBackend + 'static
                 db.clone(),
                 rules.clone(),
                 factories,
-                config.bypass_range_proof_verification,
+                bypass_range_proof_verification,
                 config.blockchain_sync_config.validation_concurrency,
             );
-            let max_randomx_vms = config.max_randomx_vms;
 
             let node = BaseNodeStateMachine::new(
                 db,
@@ -120,7 +127,7 @@ where B: BlockchainBackend + 'static
                 sync_validators,
                 status_event_sender,
                 state_event_publisher,
-                RandomXFactory::new(max_randomx_vms),
+                randomx_factory,
                 rules,
                 handles.get_shutdown_signal(),
             );
diff --git a/base_layer/core/src/base_node/state_machine_service/state_machine.rs b/base_layer/core/src/base_node/state_machine_service/state_machine.rs
index 7825570213..23bcf7020e 100644
--- a/base_layer/core/src/base_node/state_machine_service/state_machine.rs
+++ b/base_layer/core/src/base_node/state_machine_service/state_machine.rs
@@ -52,14 +52,9 @@ const LOG_TARGET: &str = "c::bn::base_node";
 pub struct BaseNodeStateMachineConfig {
     pub blockchain_sync_config: BlockchainSyncConfig,
     /// The maximum amount of VMs that RandomX will be use
-    // TODO: This is a potential conflict with 'BaseNodeConfig::max_randomx_vms'
-    pub max_randomx_vms: usize,
     /// The amount of blocks this node can be behind a peer before considered to be lagging (to test the block
     /// propagation by delaying lagging)
     pub blocks_behind_before_considered_lagging: u64,
-    /// Bypass range proof verification to speed up validation
-    // TODO: This is a potential conflict with 'BaseNodeConfig::bypass_range_proof_verification'
-    pub bypass_range_proof_verification: bool,
 }
 
 #[allow(clippy::derivable_impls)]
@@ -67,9 +62,7 @@ impl Default for BaseNodeStateMachineConfig {
     fn default() -> Self {
         Self {
             blockchain_sync_config: Default::default(),
-            max_randomx_vms: 0,
             blocks_behind_before_considered_lagging: 0,
-            bypass_range_proof_verification: false,
         }
     }
 }
diff --git a/common/config/presets/c_base_node.toml b/common/config/presets/c_base_node.toml
index ca3c7aa19c..092be9a138 100644
--- a/common/config/presets/c_base_node.toml
+++ b/common/config/presets/c_base_node.toml
@@ -141,8 +141,6 @@ track_reorgs = true
 # The amount of blocks this node can be behind a peer before considered to be lagging (to test the block
 # propagation by delaying lagging) (default = 0)
 #blocks_behind_before_considered_lagging = 0
-# Bypass range proof verification to speed up validation (default = false)
-#bypass_range_proof_verification = false
 
 [base_node.p2p]
 # The node's publicly-accessible hostname. This is the host name that is advertised on the network so that