diff --git a/common/client-core/src/client/topology_control/accessor.rs b/common/client-core/src/client/topology_control/accessor.rs
index 7b78da0a6a..f4b50be059 100644
--- a/common/client-core/src/client/topology_control/accessor.rs
+++ b/common/client-core/src/client/topology_control/accessor.rs
@@ -132,10 +132,7 @@ impl TopologyAccessor {
     }
 
     pub async fn current_topology(&self) -> Option<NymTopology> {
-        let read_lock = self.inner.topology.read().await;
-        let topology = read_lock.clone();
-        drop(read_lock);
-        topology
+        self.inner.topology.read().await.clone()
     }
 
     pub async fn manually_change_topology(&self, new_topology: NymTopology) {
diff --git a/common/client-libs/mixnet-client/src/client.rs b/common/client-libs/mixnet-client/src/client.rs
index 949ac9f59c..51b03b799e 100644
--- a/common/client-libs/mixnet-client/src/client.rs
+++ b/common/client-libs/mixnet-client/src/client.rs
@@ -112,15 +112,6 @@ impl Client {
                     // if we managed to connect, reset the reconnection count (whatever it might have been)
                     current_reconnection.store(0, Ordering::Release);
                     //Get the topology, because we need the keys for the handshake
-                    // let topology_permit = topology_access.get_read_permit().await;
-                    // let topology_ref = match topology_permit.try_get_raw_topology_ref() {
-                    //     Ok(topology) => topology,
-                    //     Err(err) => {
-                    //         error!("Cannot perform Noise handshake to {address}, due to topology error - {err}");
-                    //         return;
-                    //     }
-                    // };
-
                     let topology_ref = match topology_access.current_topology().await {
                         Some(topology) => topology,
                         None => {
diff --git a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs
index 54a8e97ace..095cd1121e 100644
--- a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs
+++ b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs
@@ -195,17 +195,7 @@ impl<St: Storage> ConnectionHandler<St> {
         debug!("Starting connection handler for {:?}", remote);
         shutdown.mark_as_success();
 
-        let topology_access_clonne = self.topology_access.clone();
-        // let topology_permit = topology_access_clonne.get_read_permit().await;
-        // let topology_ref = match topology_permit.try_get_raw_topology_ref() {
-        //     Ok(topology) => topology,
-        //     Err(err) => {
-        //         error!("Cannot connect to {remote}, due to topology error - {err}");
-        //         return;
-        //     }
-        // };
-
-        let topology_ref = match topology_access_clonne.current_topology().await {
+        let topology_ref = match self.topology_access.current_topology().await {
             Some(topology) => topology,
             None => {
                 error!("Cannot perform Noise handshake to {remote}, due to topology error");
diff --git a/mixnode/src/node/listener/connection_handler/mod.rs b/mixnode/src/node/listener/connection_handler/mod.rs
index a4275a1dca..ed37e39372 100644
--- a/mixnode/src/node/listener/connection_handler/mod.rs
+++ b/mixnode/src/node/listener/connection_handler/mod.rs
@@ -98,15 +98,6 @@ impl ConnectionHandler {
 
         shutdown.mark_as_success();
 
-        // let topology_permit = self.topology_access.get_read_permit().await;
-        // let topology_ref = match topology_permit.try_get_raw_topology_ref() {
-        //     Ok(topology) => topology,
-        //     Err(err) => {
-        //         error!("Cannot connect to {remote}, due to topology error - {err}");
-        //         return;
-        //     }
-        // };
-
         let topology_ref = match self.topology_access.current_topology().await {
             Some(topology) => topology,
             None => {