diff --git a/.cargo/config b/.cargo/config.toml
similarity index 100%
rename from .cargo/config
rename to .cargo/config.toml
diff --git a/ci/bootstrap-env/src/main.rs b/ci/bootstrap-env/src/main.rs
index c1c321c91..83d6b82c9 100644
--- a/ci/bootstrap-env/src/main.rs
+++ b/ci/bootstrap-env/src/main.rs
@@ -183,7 +183,8 @@ fn main() -> Result<()> {
     );
 
     // Persist contract code_ids in local.yaml so we can use SKIP_CONTRACT_STORE locally to avoid having to re-store them again
-    cfg.contract_deploy_info = orc.contract_map.deploy_info().clone();
+    cfg.contract_deploy_info
+        .clone_from(orc.contract_map.deploy_info());
     fs::write(
         "ci/configs/cosm-orc/local.yaml",
         serde_yaml::to_string(&cfg)?,
diff --git a/ci/integration-tests/.cargo/config b/ci/integration-tests/.cargo/config.toml
similarity index 100%
rename from ci/integration-tests/.cargo/config
rename to ci/integration-tests/.cargo/config.toml
diff --git a/ci/integration-tests/src/helpers/chain.rs b/ci/integration-tests/src/helpers/chain.rs
index 20b3d27d4..fd7445cde 100644
--- a/ci/integration-tests/src/helpers/chain.rs
+++ b/ci/integration-tests/src/helpers/chain.rs
@@ -99,7 +99,8 @@ fn global_setup() -> Cfg {
             .unwrap();
         save_gas_report(&orc, &gas_report_dir);
         // persist stored code_ids in CONFIG, so we can reuse for all tests
-        cfg.contract_deploy_info = orc.contract_map.deploy_info().clone();
+        cfg.contract_deploy_info
+            .clone_from(orc.contract_map.deploy_info());
     }
 
     Cfg {
diff --git a/contracts/dao-dao-core/.cargo/config b/contracts/dao-dao-core/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/dao-dao-core/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/external/cw-admin-factory/.cargo/config b/contracts/external/cw-admin-factory/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/external/cw-admin-factory/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/external/cw-fund-distributor/.cargo/config b/contracts/external/cw-fund-distributor/.cargo/config
deleted file mode 100644
index 5ea56d6f3..000000000
--- a/contracts/external/cw-fund-distributor/.cargo/config
+++ /dev/null
@@ -1,5 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
-
diff --git a/contracts/external/cw-payroll-factory/.cargo/config b/contracts/external/cw-payroll-factory/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/external/cw-payroll-factory/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/external/cw-token-swap/.cargo/config b/contracts/external/cw-token-swap/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/external/cw-token-swap/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/external/cw-tokenfactory-issuer/.cargo/config b/contracts/external/cw-tokenfactory-issuer/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/external/cw-tokenfactory-issuer/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/external/cw-vesting/.cargo/config b/contracts/external/cw-vesting/.cargo/config
deleted file mode 100644
index 8d4bc738b..000000000
--- a/contracts/external/cw-vesting/.cargo/config
+++ /dev/null
@@ -1,6 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-wasm-debug = "build --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-integration-test = "test --test integration"
-schema = "run --example schema"
diff --git a/contracts/external/cw721-roles/.cargo/config b/contracts/external/cw721-roles/.cargo/config
deleted file mode 100644
index 7d1a066c8..000000000
--- a/contracts/external/cw721-roles/.cargo/config
+++ /dev/null
@@ -1,5 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-wasm-debug = "build --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/external/cw721-roles/src/contract.rs b/contracts/external/cw721-roles/src/contract.rs
index 833007e46..ea31936a1 100644
--- a/contracts/external/cw721-roles/src/contract.rs
+++ b/contracts/external/cw721-roles/src/contract.rs
@@ -319,7 +319,7 @@ pub fn execute_update_token_role(
     let mut token = contract.tokens.load(deps.storage, &token_id)?;
 
     // Update role with new value
-    token.extension.role = role.clone();
+    token.extension.role.clone_from(&role);
     contract.tokens.save(deps.storage, &token_id, &token)?;
 
     Ok(Response::default()
@@ -341,7 +341,7 @@ pub fn execute_update_token_uri(
     let mut token = contract.tokens.load(deps.storage, &token_id)?;
 
     // Set new token URI
-    token.token_uri = token_uri.clone();
+    token.token_uri.clone_from(&token_uri);
     contract.tokens.save(deps.storage, &token_id, &token)?;
 
     Ok(Response::new()
diff --git a/contracts/external/dao-migrator/.cargo/config b/contracts/external/dao-migrator/.cargo/config
deleted file mode 100644
index ab407a024..000000000
--- a/contracts/external/dao-migrator/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --lib --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/pre-propose/dao-pre-propose-approval-single/.cargo/config b/contracts/pre-propose/dao-pre-propose-approval-single/.cargo/config
deleted file mode 100644
index ab407a024..000000000
--- a/contracts/pre-propose/dao-pre-propose-approval-single/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --lib --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/pre-propose/dao-pre-propose-approver/.cargo/config b/contracts/pre-propose/dao-pre-propose-approver/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/pre-propose/dao-pre-propose-approver/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/pre-propose/dao-pre-propose-multiple/.cargo/config b/contracts/pre-propose/dao-pre-propose-multiple/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/pre-propose/dao-pre-propose-multiple/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/pre-propose/dao-pre-propose-single/.cargo/config b/contracts/pre-propose/dao-pre-propose-single/.cargo/config
deleted file mode 100644
index ab407a024..000000000
--- a/contracts/pre-propose/dao-pre-propose-single/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --lib --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/proposal/dao-proposal-condorcet/.cargo/config b/contracts/proposal/dao-proposal-condorcet/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/proposal/dao-proposal-condorcet/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/proposal/dao-proposal-multiple/.cargo/config b/contracts/proposal/dao-proposal-multiple/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/proposal/dao-proposal-multiple/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/proposal/dao-proposal-single/.cargo/config b/contracts/proposal/dao-proposal-single/.cargo/config
deleted file mode 100644
index ab407a024..000000000
--- a/contracts/proposal/dao-proposal-single/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --lib --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/staking/cw20-stake-external-rewards/.cargo/config b/contracts/staking/cw20-stake-external-rewards/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/staking/cw20-stake-external-rewards/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/staking/cw20-stake-reward-distributor/.cargo/config b/contracts/staking/cw20-stake-reward-distributor/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/staking/cw20-stake-reward-distributor/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/staking/cw20-stake/.cargo/config b/contracts/staking/cw20-stake/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/staking/cw20-stake/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/test/dao-proposal-hook-counter/.cargo/config b/contracts/test/dao-proposal-hook-counter/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/test/dao-proposal-hook-counter/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/test/dao-proposal-sudo/.cargo/config b/contracts/test/dao-proposal-sudo/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/test/dao-proposal-sudo/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/test/dao-test-custom-factory/.cargo/config b/contracts/test/dao-test-custom-factory/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/test/dao-test-custom-factory/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/test/dao-voting-cw20-balance/.cargo/config b/contracts/test/dao-voting-cw20-balance/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/test/dao-voting-cw20-balance/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/voting/dao-voting-cw20-staked/.cargo/config b/contracts/voting/dao-voting-cw20-staked/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/voting/dao-voting-cw20-staked/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/voting/dao-voting-cw4/.cargo/config b/contracts/voting/dao-voting-cw4/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/voting/dao-voting-cw4/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/voting/dao-voting-cw721-roles/.cargo/config b/contracts/voting/dao-voting-cw721-roles/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/voting/dao-voting-cw721-roles/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/voting/dao-voting-cw721-staked/.cargo/config b/contracts/voting/dao-voting-cw721-staked/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/voting/dao-voting-cw721-staked/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/contracts/voting/dao-voting-token-staked/.cargo/config b/contracts/voting/dao-voting-token-staked/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/contracts/voting/dao-voting-token-staked/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"
diff --git a/packages/dao-dao-macros/.cargo/config b/packages/dao-dao-macros/.cargo/config
deleted file mode 100644
index e44e70f31..000000000
--- a/packages/dao-dao-macros/.cargo/config
+++ /dev/null
@@ -1,2 +0,0 @@
-[alias]
-schema = "run --example schema"
diff --git a/packages/dao-interface/.cargo/config b/packages/dao-interface/.cargo/config
deleted file mode 100644
index e44e70f31..000000000
--- a/packages/dao-interface/.cargo/config
+++ /dev/null
@@ -1,2 +0,0 @@
-[alias]
-schema = "run --example schema"
diff --git a/packages/dao-pre-propose-base/.cargo/config b/packages/dao-pre-propose-base/.cargo/config
deleted file mode 100644
index 336b618a1..000000000
--- a/packages/dao-pre-propose-base/.cargo/config
+++ /dev/null
@@ -1,4 +0,0 @@
-[alias]
-wasm = "build --release --target wasm32-unknown-unknown"
-unit-test = "test --lib"
-schema = "run --example schema"