diff --git a/src/dfx/src/commands/identity/deploy_wallet.rs b/src/dfx/src/commands/identity/deploy_wallet.rs
index 7a14617ff4..2f3ab438cb 100644
--- a/src/dfx/src/commands/identity/deploy_wallet.rs
+++ b/src/dfx/src/commands/identity/deploy_wallet.rs
@@ -1,7 +1,7 @@
 use crate::lib::environment::Environment;
 use crate::lib::error::DfxResult;
 use crate::lib::identity::Identity;
-use crate::lib::provider::{create_agent_environment, get_network_descriptor};
+use crate::lib::provider::create_agent_environment;
 use crate::lib::root_key::fetch_root_key_if_needed;
 
 use anyhow::bail;
@@ -17,7 +17,7 @@ pub struct DeployWalletOpts {
 }
 
 pub fn exec(env: &dyn Environment, opts: DeployWalletOpts, network: Option<String>) -> DfxResult {
-    let agent_env = create_agent_environment(env, network.clone())?;
+    let agent_env = create_agent_environment(env, network)?;
     let runtime = Runtime::new().expect("Unable to create a runtime");
 
     runtime.block_on(async { fetch_root_key_if_needed(&agent_env).await })?;
@@ -26,13 +26,13 @@ pub fn exec(env: &dyn Environment, opts: DeployWalletOpts, network: Option<Strin
         .get_selected_identity()
         .expect("No selected identity.")
         .to_string();
-    let network = get_network_descriptor(&agent_env, network)?;
+    let network = agent_env.get_network_descriptor();
 
     let canister_id = opts.canister_id;
     match CanisterId::from_text(&canister_id) {
         Ok(id) => {
             runtime.block_on(async {
-                Identity::create_wallet(&agent_env, &network, &identity_name, Some(id)).await?;
+                Identity::create_wallet(&agent_env, network, &identity_name, Some(id)).await?;
                 DfxResult::Ok(())
             })?;
         }
diff --git a/src/dfx/src/commands/identity/get_wallet.rs b/src/dfx/src/commands/identity/get_wallet.rs
index b559fa9c1e..3dc0fcd5d2 100644
--- a/src/dfx/src/commands/identity/get_wallet.rs
+++ b/src/dfx/src/commands/identity/get_wallet.rs
@@ -1,7 +1,7 @@
 use crate::lib::environment::Environment;
 use crate::lib::error::DfxResult;
 use crate::lib::identity::Identity;
-use crate::lib::provider::{create_agent_environment, get_network_descriptor};
+use crate::lib::provider::create_agent_environment;
 use crate::lib::root_key::fetch_root_key_if_needed;
 
 use clap::Parser;
@@ -12,7 +12,7 @@ use tokio::runtime::Runtime;
 pub struct GetWalletOpts {}
 
 pub fn exec(env: &dyn Environment, _opts: GetWalletOpts, network: Option<String>) -> DfxResult {
-    let agent_env = create_agent_environment(env, network.clone())?;
+    let agent_env = create_agent_environment(env, network)?;
     let runtime = Runtime::new().expect("Unable to create a runtime");
 
     runtime.block_on(async { fetch_root_key_if_needed(&agent_env).await })?;
@@ -21,12 +21,12 @@ pub fn exec(env: &dyn Environment, _opts: GetWalletOpts, network: Option<String>
         .get_selected_identity()
         .expect("No selected identity.")
         .to_string();
-    let network = get_network_descriptor(&agent_env, network)?;
+    let network = agent_env.get_network_descriptor();
 
     runtime.block_on(async {
         println!(
             "{}",
-            Identity::get_or_create_wallet(&agent_env, &network, &identity_name, false).await?
+            Identity::get_or_create_wallet(&agent_env, network, &identity_name, false).await?
         );
         DfxResult::Ok(())
     })?;
diff --git a/src/dfx/src/commands/identity/set_wallet.rs b/src/dfx/src/commands/identity/set_wallet.rs
index e9c01e2e4b..f2df857bda 100644
--- a/src/dfx/src/commands/identity/set_wallet.rs
+++ b/src/dfx/src/commands/identity/set_wallet.rs
@@ -3,7 +3,7 @@ use crate::lib::environment::Environment;
 use crate::lib::error::{DfxError, DfxResult};
 use crate::lib::identity::Identity;
 use crate::lib::models::canister_id_store::CanisterIdStore;
-use crate::lib::provider::{create_agent_environment, get_network_descriptor};
+use crate::lib::provider::create_agent_environment;
 
 use anyhow::{anyhow, Context};
 use clap::Parser;
@@ -24,7 +24,7 @@ pub struct SetWalletOpts {
 }
 
 pub fn exec(env: &dyn Environment, opts: SetWalletOpts, network: Option<String>) -> DfxResult {
-    let agent_env = create_agent_environment(env, network.clone())?;
+    let agent_env = create_agent_environment(env, network)?;
     let env = &agent_env;
     let log = env.get_logger();
 
@@ -35,7 +35,7 @@ pub fn exec(env: &dyn Environment, opts: SetWalletOpts, network: Option<String>)
         .expect("No selected identity.")
         .to_string();
 
-    let network = get_network_descriptor(&agent_env, network)?;
+    let network = agent_env.get_network_descriptor();
 
     let canister_name = opts.canister_name.as_str();
     let canister_id = match Principal::from_text(canister_name) {
@@ -100,7 +100,7 @@ pub fn exec(env: &dyn Environment, opts: SetWalletOpts, network: Option<String>)
         network.name,
         canister_id
     );
-    Identity::set_wallet_id(env, &network, &identity_name, canister_id)?;
+    Identity::set_wallet_id(env, network, &identity_name, canister_id)?;
     info!(log, "Wallet set successfully.");
 
     Ok(())