diff --git a/sdk/rust/nym-sdk/src/mixnet/client.rs b/sdk/rust/nym-sdk/src/mixnet/client.rs
index c075acdfef..bba70e96a1 100644
--- a/sdk/rust/nym-sdk/src/mixnet/client.rs
+++ b/sdk/rust/nym-sdk/src/mixnet/client.rs
@@ -414,7 +414,7 @@ where
     }
 
     /// Client keys are generated at client creation if none were found. The gateway shared
-    /// key, however, is created during the gateway registration handshake so it might not
+    /// key, however, is created during the gateway registration handshake, so it might not
     /// necessarily be available.
     /// Furthermore, it has to be coupled with particular gateway's config.
     async fn has_valid_gateway_info(&self) -> bool {
@@ -466,7 +466,7 @@ where
         let api_endpoints = self.get_api_endpoints();
 
         let gateway_setup = if self.has_valid_gateway_info().await {
-            GatewaySetup::MustLoad
+            GatewaySetup::MustLoad { gateway_id: None }
         } else {
             let selection_spec = GatewaySelectionSpecification::new(
                 self.config.user_chosen_gateway.clone(),
diff --git a/sdk/rust/nym-sdk/src/mixnet/paths.rs b/sdk/rust/nym-sdk/src/mixnet/paths.rs
index 88ae655d6a..8051b49350 100644
--- a/sdk/rust/nym-sdk/src/mixnet/paths.rs
+++ b/sdk/rust/nym-sdk/src/mixnet/paths.rs
@@ -1,8 +1,7 @@
-// Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
+// Copyright 2022-2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::error::{Error, Result};
-use nym_client_core::client::base_client::non_wasm_helpers::setup_fs_gateways_storage;
 use nym_client_core::client::base_client::storage::OnDiskGatewaysDetails;
 use nym_client_core::client::base_client::{non_wasm_helpers, storage};
 use nym_client_core::client::key_manager::persistence::OnDiskKeys;
@@ -32,20 +31,13 @@ pub struct StoragePaths {
     /// Key for handling acks
     pub ack_key: PathBuf,
 
-    /// Key setup after authenticating with a gateway
-    #[deprecated]
-    pub gateway_shared_key: PathBuf,
-
     /// The database containing credentials
     pub credential_database_path: PathBuf,
 
     /// The database storing reply surbs in-between sessions
     pub reply_surb_database_path: PathBuf,
 
-    /// Details of the used gateway
-    #[deprecated]
-    pub gateway_details_path: PathBuf,
-
+    /// Details of the used gateways
     pub gateway_registrations: PathBuf,
 }
 
@@ -68,10 +60,8 @@ impl StoragePaths {
             private_encryption: dir.join("private_encryption.pem"),
             public_encryption: dir.join("public_encryption.pem"),
             ack_key: dir.join("ack_key.pem"),
-            gateway_shared_key: dir.join("gateway_shared.pem"),
             credential_database_path: dir.join("db.sqlite"),
             reply_surb_database_path: dir.join("persistent_reply_store.sqlite"),
-            gateway_details_path: dir.join("gateway_details.json"),
             gateway_registrations: dir.join("gateways_registrations.sqlite"),
         })
     }
@@ -145,7 +135,6 @@ impl StoragePaths {
             public_identity_key_file: self.public_identity.clone(),
             private_encryption_key_file: self.private_encryption.clone(),
             public_encryption_key_file: self.public_encryption.clone(),
-            gateway_shared_key_file: self.gateway_shared_key.clone(),
             ack_key_file: self.ack_key.clone(),
         }
     }
@@ -159,10 +148,8 @@ impl From<StoragePaths> for CommonClientPaths {
                 public_identity_key_file: value.public_identity,
                 private_encryption_key_file: value.private_encryption,
                 public_encryption_key_file: value.public_encryption,
-                gateway_shared_key_file: value.gateway_shared_key,
                 ack_key_file: value.ack_key,
             },
-            gateway_details: value.gateway_details_path,
             gateway_registrations: value.gateway_registrations,
             credentials_database: value.credential_database_path,
             reply_surb_database: value.reply_surb_database_path,
@@ -178,10 +165,8 @@ impl From<CommonClientPaths> for StoragePaths {
             private_encryption: value.keys.private_encryption_key_file,
             public_encryption: value.keys.public_encryption_key_file,
             ack_key: value.keys.ack_key_file,
-            gateway_shared_key: value.keys.gateway_shared_key_file,
             credential_database_path: value.credentials_database,
             reply_surb_database_path: value.reply_surb_database,
-            gateway_details_path: value.gateway_details,
             gateway_registrations: value.gateway_registrations,
         }
     }
diff --git a/sdk/rust/nym-sdk/src/mixnet/socks5_client.rs b/sdk/rust/nym-sdk/src/mixnet/socks5_client.rs
index ab340447f9..6bc2a46a06 100644
--- a/sdk/rust/nym-sdk/src/mixnet/socks5_client.rs
+++ b/sdk/rust/nym-sdk/src/mixnet/socks5_client.rs
@@ -56,7 +56,7 @@ impl Socks5MixnetClient {
 
     /// Get the SOCKS5 proxy URL that a HTTP(S) client can connect to.
     pub fn socks5_url(&self) -> String {
-        format!("socks5h://{}", self.socks5_config.bind_adddress)
+        format!("socks5h://{}", self.socks5_config.bind_address)
     }
 
     /// Get a shallow clone of [`LaneQueueLengths`]. This is useful to manually implement some form