diff --git a/src/evm_config.rs b/src/evm_config.rs
index 6fe8bc5..f866979 100644
--- a/src/evm_config.rs
+++ b/src/evm_config.rs
@@ -167,7 +167,6 @@ impl ConfigureEvmEnv for GnosisEvmConfig {
     fn fill_cfg_env(
         &self,
         cfg_env: &mut CfgEnvWithHandlerCfg,
-        // chain_spec: &ChainSpec,
         header: &Header,
         total_difficulty: U256,
     ) {
diff --git a/src/execute.rs b/src/execute.rs
index fd439c7..4791683 100644
--- a/src/execute.rs
+++ b/src/execute.rs
@@ -105,7 +105,6 @@ where
         GnosisBatchExecutor {
             executor,
             batch_record: BlockBatchRecord::default(),
-            // stats: BlockExecutorStats::default(),
         }
     }
 }
@@ -174,7 +173,6 @@ where
         self.executor.evm_config.fill_cfg_and_block_env(
             &mut cfg,
             &mut block_env,
-            // self.chain_spec(),
             header,
             total_difficulty,
         );
@@ -268,7 +266,6 @@ where
         self.executor.evm_config.fill_cfg_and_block_env(
             &mut cfg,
             &mut block_env,
-            // self.chain_spec(),
             &block.header,
             total_difficulty,
         );
diff --git a/src/lib.rs b/src/lib.rs
index 7d524b6..37c8797 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -70,7 +70,6 @@ impl GnosisNode {
         Node: FullNodeTypes<
             Types: NodeTypesWithEngine<Engine = EthEngineTypes, ChainSpec = ChainSpec>,
         >,
-        // EthereumEngineValidatorBuilder: EngineValidatorBuilder<Node>
     {
         EthereumNode::components::<Node>()
             .node_types::<Node>()
@@ -80,10 +79,6 @@ impl GnosisNode {
             .executor(GnosisExecutorBuilder::default())
             .consensus(GnosisConsensusBuilder::default())
             .engine_validator(EthereumEngineValidatorBuilder::default())
-
-        // ComponentsBuilder::default()
-        //     .node_types::<Node>()
-        //     .pool(EthereumPoolBuilder::default())
     }
 }
 
diff --git a/src/payload_builder.rs b/src/payload_builder.rs
index 2eeff35..43d8b4c 100644
--- a/src/payload_builder.rs
+++ b/src/payload_builder.rs
@@ -45,16 +45,12 @@ use crate::{evm_config::GnosisEvmConfig, execute::gnosis_post_block_system_calls
 #[derive(Debug, Default, Clone)]
 pub struct GnosisPayloadServiceBuilder {
     // The EVM configuration to use for the payload builder.
-    // pub evm_config: EVM,
-    // block_rewards_contract: Address,
 }
 
 impl GnosisPayloadServiceBuilder {
     /// Create a new instance with the given evm config.
     pub const fn new() -> Self {
-        Self {
-            // block_rewards_contract,
-        }
+        Self {}
     }
 }
 
@@ -105,7 +101,6 @@ where
             pool,
             ctx.task_executor().clone(),
             payload_job_config,
-            // ctx.chain_spec(),
             payload_builder,
         );
         let (payload_service, payload_builder) =
@@ -455,15 +450,6 @@ where
     };
 
     // < GNOSIS SPECIFIC
-    // Compute the withdrawals root independent of how they are applied
-    // let withdrawals_root = if !chain_spec.is_shanghai_active_at_timestamp(attributes.timestamp) {
-    //     None
-    // } else if attributes.withdrawals.is_empty() {
-    //     Some(EMPTY_WITHDRAWALS)
-    // } else {
-    //     Some(proofs::calculate_withdrawals_root(&attributes.withdrawals))
-    // };
-
     gnosis_post_block_system_calls(
         &chain_spec,
         &evm_config,