diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/ack_commitment.rs b/relayer/crates/starknet-chain-components/src/impls/queries/ack_commitment.rs
index aa7fd12c..4de10450 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/ack_commitment.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/ack_commitment.rs
@@ -97,7 +97,6 @@ where
 
         let chain_status = chain.query_chain_status().await?;
 
-        // hack(rano): passing block hash to message builder
         let unsigned_membership_proof_bytes = MembershipVerifierContainer {
             state_root: chain_status.block_hash.to_bytes_be().to_vec(),
             prefix: chain.ibc_commitment_prefix().clone(),
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/channel_end.rs b/relayer/crates/starknet-chain-components/src/impls/queries/channel_end.rs
index dee5c136..bd8ecd0f 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/channel_end.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/channel_end.rs
@@ -121,7 +121,6 @@ where
 
         let chain_status = chain.query_chain_status().await?;
 
-        // hack(rano): passing block hash to message builder
         let unsigned_membership_proof_bytes = MembershipVerifierContainer {
             state_root: chain_status.block_hash.to_bytes_be().to_vec(),
             prefix: chain.ibc_commitment_prefix().clone(),
@@ -132,7 +131,6 @@ where
         }
         .canonical_bytes();
 
-        // TODO(rano): how to get the proof?
         let dummy_proof = StarknetCommitmentProof {
             proof_height: chain_status.height,
             unsigned_membership_proof_bytes,
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/connection_end.rs b/relayer/crates/starknet-chain-components/src/impls/queries/connection_end.rs
index 153d488d..0d37e153 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/connection_end.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/connection_end.rs
@@ -109,7 +109,6 @@ where
 
         let chain_status = chain.query_chain_status().await?;
 
-        // hack(rano): passing block hash to message builder
         let unsigned_membership_proof_bytes = MembershipVerifierContainer {
             state_root: chain_status.block_hash.to_bytes_be().to_vec(),
             prefix: chain.ibc_commitment_prefix().clone(),
@@ -120,7 +119,6 @@ where
         }
         .canonical_bytes();
 
-        // TODO(rano): how to get the proof?
         let dummy_proof = StarknetCommitmentProof {
             proof_height: chain_status.height,
             // FIXME(hack) we are passing msg hash as proof as we don't have access to signer
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/packet_commitment.rs b/relayer/crates/starknet-chain-components/src/impls/queries/packet_commitment.rs
index f6e6d6c6..2ef48b2e 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/packet_commitment.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/packet_commitment.rs
@@ -96,7 +96,6 @@ where
 
         let chain_status = chain.query_chain_status().await?;
 
-        // hack(rano): passing block hash to message builder
         let unsigned_membership_proof_bytes = MembershipVerifierContainer {
             state_root: chain_status.block_hash.to_bytes_be().to_vec(),
             prefix: chain.ibc_commitment_prefix().clone(),
@@ -107,7 +106,6 @@ where
         }
         .canonical_bytes();
 
-        // TODO(rano): how to get the proof?
         let dummy_proof = StarknetCommitmentProof {
             proof_height: chain_status.height,
             unsigned_membership_proof_bytes,
diff --git a/relayer/crates/starknet-chain-components/src/impls/queries/packet_receipt.rs b/relayer/crates/starknet-chain-components/src/impls/queries/packet_receipt.rs
index 09ce05a1..a514abac 100644
--- a/relayer/crates/starknet-chain-components/src/impls/queries/packet_receipt.rs
+++ b/relayer/crates/starknet-chain-components/src/impls/queries/packet_receipt.rs
@@ -96,7 +96,6 @@ where
 
         let chain_status = chain.query_chain_status().await?;
 
-        // hack(rano): passing block hash to message builder
         let unsigned_membership_proof_bytes = MembershipVerifierContainer {
             state_root: chain_status.block_hash.to_bytes_be().to_vec(),
             prefix: chain.ibc_commitment_prefix().clone(),
@@ -107,7 +106,6 @@ where
         }
         .canonical_bytes();
 
-        // TODO(rano): how to get the proof?
         let dummy_proof = StarknetCommitmentProof {
             proof_height: chain_status.height,
             unsigned_membership_proof_bytes,