diff --git a/crates/starknet_gateway/src/gateway.rs b/crates/starknet_gateway/src/gateway.rs
index 36737d6ba0..5c720b7247 100644
--- a/crates/starknet_gateway/src/gateway.rs
+++ b/crates/starknet_gateway/src/gateway.rs
@@ -26,8 +26,6 @@ use crate::utils::compile_contract_and_build_executable_tx;
 #[path = "gateway_test.rs"]
 pub mod gateway_test;
 
-// TODO(yair): remove the usage of app_state.
-
 pub struct Gateway {
     pub config: GatewayConfig,
     pub stateless_tx_validator: Arc<StatelessTransactionValidator>,
diff --git a/crates/starknet_sequencer_node/src/config/node_config.rs b/crates/starknet_sequencer_node/src/config/node_config.rs
index ea82a122d8..0459d58980 100644
--- a/crates/starknet_sequencer_node/src/config/node_config.rs
+++ b/crates/starknet_sequencer_node/src/config/node_config.rs
@@ -92,7 +92,6 @@ pub static CONFIG_POINTERS: LazyLock<ConfigPointers> = LazyLock::new(|| {
 pub static CONFIG_NON_POINTERS_WHITELIST: LazyLock<Pointers> =
     LazyLock::new(HashSet::<ParamPath>::new);
 
-// TODO(yair): Make the GW and batcher execution config point to the same values.
 /// The configurations of the various components of the node.
 #[derive(Debug, Default, Deserialize, Serialize, Clone, PartialEq, Validate)]
 pub struct SequencerNodeConfig {