diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index e57a053de..95f13cbf0 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -412,50 +412,20 @@ proc initFullNode(
         Future[Result[void, VerifierError]] {.async: (raises: [CancelledError]).} =
       withBlck(signedBlock):
         when consensusFork >= ConsensusFork.Deneb:
-          let
-            localSubnetCount = 
-                if supernode:
-                  DATA_COLUMN_SIDECAR_SUBNET_COUNT.uint64
-                else:
-                  CUSTODY_REQUIREMENT.uint64
-            localCustodyColumns = get_custody_columns(node.network.nodeId,
-                                                      max(SAMPLES_PER_SLOT.uint64,
-                                                      localSubnetCount))
-            accumulatedColumns = dataColumnQuarantine[].accumulateDataColumns(forkyBlck)
-          if accumulatedColumns.len == 0:
-            return await blockProcessor[].addBlock(MsgSource.gossip, signedBlock,
-                                      Opt.none(BlobSidecars), Opt.none(DataColumnSidecars),
-                                      maybeFinalized = maybeFinalized)
-          elif supernode == true and accumulatedColumns.len <= localCustodyColumns.len div 2 :
+          if not dataColumnQuarantine[].hasEnoughDataColumns(forkyBlck):
             # We don't have all the data columns for this block, so we have
             # to put it in columnless quarantine.
             if not quarantine[].addColumnless(dag.finalizedHead.slot, forkyBlck):
-              return err(VerifierError.UnviableFork)
+              err(VerifierError.UnviableFork)
             else:
-              return err(VerifierError.MissingParent)
-          elif supernode == true and accumulatedColumns.len == localCustodyColumns.len:
-            let data_columns = dataColumnQuarantine[].popDataColumns(forkyBlck.root, forkyBlck)
-            return await blockProcessor[].addBlock(MsgSource.gossip, signedBlock,
-                                      Opt.none(BlobSidecars), Opt.some(data_columns),
-                                      maybeFinalized = maybeFinalized)
-          elif supernode == true and accumulatedColumns.len >= localCustodyColumns.len div 2:
-            let data_columns = dataColumnQuarantine[].popDataColumns(forkyBlck.root, forkyBlck)
-            return await blockProcessor[].addBlock(MsgSource.gossip, signedBlock,
-                                      Opt.none(BlobSidecars), Opt.some(data_columns),
-                                      maybeFinalized = maybeFinalized)
-          elif supernode == false and accumulatedColumns.len <= localCustodyColumns.len:
-            # We don't have all the data columns for this block, so we have
-            # to put it in columnless quarantine.
-            if not quarantine[].addColumnless(dag.finalizedHead.slot, forkyBlck):
-              return err(VerifierError.UnviableFork)
-            else:
-              return err(VerifierError.MissingParent)
+              err(VerifierError.MissingParent)
           else:
-            return await blockProcessor[].addBlock(MsgSource.gossip, signedBlock,
-                                      Opt.none(BlobSidecars), Opt.none(DataColumnSidecars),
-                                      maybeFinalized = maybeFinalized) 
+            let data_columns = dataColumnQuarantine[].popDataColumns(forkyBlck.root, forkyBlck)
+            await blockProcessor[].addBlock(MsgSource.gossip, signedBlock,
+                                      Opt.none(BlobSidecars), Opt.some(data_columns),
+                                      maybeFinalized = maybeFinalized)
         else:
-          return await blockProcessor[].addBlock(MsgSource.gossip, signedBlock,
+          await blockProcessor[].addBlock(MsgSource.gossip, signedBlock,
                                     Opt.none(BlobSidecars), Opt.none(DataColumnSidecars),
                                     maybeFinalized = maybeFinalized)
 
diff --git a/beacon_chain/sync/sync_manager.nim b/beacon_chain/sync/sync_manager.nim
index 008a97ebf..9b6305b9b 100644
--- a/beacon_chain/sync/sync_manager.nim
+++ b/beacon_chain/sync/sync_manager.nim
@@ -708,13 +708,9 @@ proc syncWorker[A, B](man: SyncManager[A, B], index: int) {.async: (raises: [Can
       await man.notInSyncEvent.wait()
       man.workers[index].status = SyncWorkerStatus.WaitingPeer
       peer = await man.pool.acquire()
-      if peer.remoteAgent == Eth2Agent.Prysm:
-        await man.syncStep(index, peer)
-        man.pool.release(peer)
-        peer = nil
-      else:
-        man.pool.release(peer)
-        peer = nil
+      await man.syncStep(index, peer)
+      man.pool.release(peer)
+      peer = nil
   finally:
     if not(isNil(peer)):
       man.pool.release(peer)
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index 21cbe3a91..b5fb7b3a9 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit 21cbe3a91a70811522554e89e6a791172cebfef2
+Subproject commit b5fb7b3a97d8977d969d786633f70c4094cd0eaf