diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
index e1cf40f65f..2785eac0a4 100644
--- a/beacon_node/beacon_chain/src/beacon_chain.rs
+++ b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -1249,10 +1249,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
     pub fn get_blobs(&self, block_root: &Hash256) -> Result<BlobSidecarList<T::EthSpec>, Error> {
         match self.store.get_blobs(block_root)? {
             Some(blobs) => Ok(blobs),
-            None => Ok(BlobSidecarList::empty(
-                // TODO(pawan): fix this
-                self.spec.max_blobs_per_block(Epoch::new(0)) as usize,
-            )),
+            None => Ok(BlobSidecarList::empty_uninitialized()),
         }
     }
 
diff --git a/beacon_node/network/src/sync/network_context.rs b/beacon_node/network/src/sync/network_context.rs
index bcfc9a7da2..84e968a595 100644
--- a/beacon_node/network/src/sync/network_context.rs
+++ b/beacon_node/network/src/sync/network_context.rs
@@ -1239,8 +1239,6 @@ fn to_fixed_blob_sidecar_list<E: EthSpec>(
     blobs: Vec<Arc<BlobSidecar<E>>>,
     max_len: usize,
 ) -> Result<FixedBlobSidecarList<E>, LookupVerifyError> {
-    // TODO(pawan): have a method on fixed runtime vector that just initializes a raw vec with max_len = None
-    // to signify an empty fixed runtime vector
     let mut fixed_list = FixedBlobSidecarList::new(vec![None; max_len]);
     for blob in blobs.into_iter() {
         let index = blob.index as usize;
diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs
index 5af0f349de..2c28c3d31d 100644
--- a/consensus/types/src/chain_spec.rs
+++ b/consensus/types/src/chain_spec.rs
@@ -1176,7 +1176,6 @@ impl ChainSpec {
             max_request_data_column_sidecars: default_max_request_data_column_sidecars(),
             min_epochs_for_blob_sidecars_requests: 16384,
             blob_sidecar_subnet_count: default_blob_sidecar_subnet_count(),
-            // TODO(pawan): check if gnosis preset values match
             max_blobs_per_block: default_max_blobs_per_block(),
 
             /*