diff --git a/packages/access/src/tests/test_ownable_twostep.cairo b/packages/access/src/tests/test_ownable_twostep.cairo
index e922ec130..661253840 100644
--- a/packages/access/src/tests/test_ownable_twostep.cairo
+++ b/packages/access/src/tests/test_ownable_twostep.cairo
@@ -6,7 +6,6 @@ use openzeppelin_access::tests::mocks::ownable_mocks::DualCaseTwoStepOwnableMock
 use openzeppelin_test_common::ownable::OwnableSpyHelpers;
 use openzeppelin_testing::constants::{ZERO, OWNER, OTHER, NEW_OWNER};
 use openzeppelin_testing::events::EventSpyExt;
-use openzeppelin_utils::serde::SerializedAppend;
 use snforge_std::{EventSpy, spy_events, start_cheat_caller_address, test_address};
 use starknet::ContractAddress;
 
diff --git a/packages/account/src/tests/test_account.cairo b/packages/account/src/tests/test_account.cairo
index 518f8b63b..8cb7d8cda 100644
--- a/packages/account/src/tests/test_account.cairo
+++ b/packages/account/src/tests/test_account.cairo
@@ -24,7 +24,6 @@ use snforge_std::{
 };
 use snforge_std::{spy_events, declare, test_address, start_cheat_caller_address};
 use starknet::account::Call;
-use starknet::{contract_address_const, ContractAddress, ClassHash};
 
 //
 // Setup
diff --git a/packages/account/src/tests/test_dual_account.cairo b/packages/account/src/tests/test_dual_account.cairo
index 48d552e3c..b157d2ba4 100644
--- a/packages/account/src/tests/test_dual_account.cairo
+++ b/packages/account/src/tests/test_dual_account.cairo
@@ -2,12 +2,12 @@ use openzeppelin_account::dual_account::{DualCaseAccountABI, DualCaseAccount};
 use openzeppelin_account::interface::{AccountABIDispatcherTrait, AccountABIDispatcher};
 use openzeppelin_introspection::interface::ISRC5_ID;
 
-use openzeppelin_test_common::account::{SIGNED_TX_DATA, get_accept_ownership_signature};
+use openzeppelin_test_common::account::{get_accept_ownership_signature};
 use openzeppelin_testing as utils;
 use openzeppelin_testing::constants::TRANSACTION_HASH;
 use openzeppelin_testing::constants::stark::{KEY_PAIR, KEY_PAIR_2};
 use openzeppelin_testing::signing::{StarkKeyPair, StarkSerializedSigning};
-use snforge_std::{declare, start_cheat_caller_address};
+use snforge_std::{start_cheat_caller_address};
 
 //
 // Setup
diff --git a/packages/account/src/tests/test_dual_eth_account.cairo b/packages/account/src/tests/test_dual_eth_account.cairo
index 6169cdaaa..dcb6c714d 100644
--- a/packages/account/src/tests/test_dual_eth_account.cairo
+++ b/packages/account/src/tests/test_dual_eth_account.cairo
@@ -1,7 +1,6 @@
 use openzeppelin_account::dual_eth_account::{DualCaseEthAccountABI, DualCaseEthAccount};
 use openzeppelin_account::interface::{EthAccountABIDispatcherTrait, EthAccountABIDispatcher};
 use openzeppelin_account::utils::secp256k1::{DebugSecp256k1Point, Secp256k1PointPartialEq};
-use openzeppelin_account::utils::signature::EthSignature;
 use openzeppelin_introspection::interface::ISRC5_ID;
 
 use openzeppelin_test_common::eth_account::get_accept_ownership_signature;
diff --git a/packages/account/src/tests/test_eth_account.cairo b/packages/account/src/tests/test_eth_account.cairo
index 11126e292..02f9d451e 100644
--- a/packages/account/src/tests/test_eth_account.cairo
+++ b/packages/account/src/tests/test_eth_account.cairo
@@ -1,4 +1,3 @@
-use core::starknet::SyscallResultTrait;
 use openzeppelin_account::EthAccountComponent::{InternalTrait, SRC6CamelOnlyImpl};
 use openzeppelin_account::EthAccountComponent::{PublicKeyCamelImpl, PublicKeyImpl};
 use openzeppelin_account::EthAccountComponent;
@@ -27,7 +26,6 @@ use snforge_std::{
     start_cheat_caller_address
 };
 use snforge_std::{spy_events, test_address};
-use starknet::ContractAddress;
 use starknet::account::Call;
 
 //
diff --git a/packages/governance/src/tests/test_timelock.cairo b/packages/governance/src/tests/test_timelock.cairo
index 5fba53ef1..5b848a5b4 100644
--- a/packages/governance/src/tests/test_timelock.cairo
+++ b/packages/governance/src/tests/test_timelock.cairo
@@ -1,5 +1,4 @@
 use core::hash::{HashStateTrait, HashStateExTrait};
-use core::num::traits::Zero;
 use core::pedersen::PedersenTrait;
 use openzeppelin_access::accesscontrol::AccessControlComponent::{
     AccessControlImpl, InternalImpl as AccessControlInternalImpl
@@ -7,16 +6,11 @@ use openzeppelin_access::accesscontrol::AccessControlComponent::{
 use openzeppelin_access::accesscontrol::DEFAULT_ADMIN_ROLE;
 use openzeppelin_access::accesscontrol::interface::IACCESSCONTROL_ID;
 use openzeppelin_access::accesscontrol::interface::IAccessControl;
-use openzeppelin_governance::tests::mocks::timelock_mocks::MockContract;
 use openzeppelin_governance::tests::mocks::timelock_mocks::{
     IMockContractDispatcher, IMockContractDispatcherTrait
 };
-use openzeppelin_governance::tests::mocks::timelock_mocks::{
-    ITimelockAttackerDispatcher, ITimelockAttackerDispatcherTrait
-};
-use openzeppelin_governance::tests::mocks::timelock_mocks::{
-    TimelockControllerMock, TimelockAttackerMock
-};
+use openzeppelin_governance::tests::mocks::timelock_mocks::{ITimelockAttackerDispatcher};
+use openzeppelin_governance::tests::mocks::timelock_mocks::{TimelockControllerMock};
 use openzeppelin_governance::timelock::OperationState;
 use openzeppelin_governance::timelock::TimelockControllerComponent::{
     CallScheduled, CallExecuted, CallSalt, CallCancelled, MinDelayChanged
diff --git a/packages/presets/src/tests/test_universal_deployer.cairo b/packages/presets/src/tests/test_universal_deployer.cairo
index ca220f452..8c2242d0d 100644
--- a/packages/presets/src/tests/test_universal_deployer.cairo
+++ b/packages/presets/src/tests/test_universal_deployer.cairo
@@ -9,7 +9,7 @@ use openzeppelin_utils::interfaces::{
     IUniversalDeployerDispatcher, IUniversalDeployerDispatcherTrait
 };
 use openzeppelin_utils::serde::SerializedAppend;
-use snforge_std::{EventSpy, spy_events, declare, start_cheat_caller_address};
+use snforge_std::{EventSpy, spy_events, start_cheat_caller_address};
 use starknet::{ClassHash, ContractAddress};
 
 fn ERC20_CLASS_HASH() -> ClassHash {
diff --git a/packages/test_common/src/account.cairo b/packages/test_common/src/account.cairo
index 1b8b2b1a5..1456ae47f 100644
--- a/packages/test_common/src/account.cairo
+++ b/packages/test_common/src/account.cairo
@@ -5,7 +5,6 @@ use openzeppelin_account::AccountComponent;
 use openzeppelin_testing::constants::TRANSACTION_HASH;
 use openzeppelin_testing::events::EventSpyExt;
 use openzeppelin_testing::signing::StarkKeyPair;
-use openzeppelin_token::erc20::interface::IERC20Dispatcher;
 use snforge_std::EventSpy;
 use snforge_std::signature::stark_curve::StarkCurveSignerImpl;
 use starknet::ContractAddress;
diff --git a/packages/test_common/src/erc20.cairo b/packages/test_common/src/erc20.cairo
index 58c597e5e..1307dbcf5 100644
--- a/packages/test_common/src/erc20.cairo
+++ b/packages/test_common/src/erc20.cairo
@@ -3,7 +3,7 @@ use openzeppelin_testing::constants::{NAME, SYMBOL};
 use openzeppelin_testing::events::EventSpyExt;
 use openzeppelin_token::erc20::ERC20Component::{Approval, Transfer};
 use openzeppelin_token::erc20::ERC20Component;
-use openzeppelin_token::erc20::interface::{IERC20Dispatcher, IERC20DispatcherTrait};
+use openzeppelin_token::erc20::interface::{IERC20Dispatcher};
 use openzeppelin_utils::serde::SerializedAppend;
 use snforge_std::EventSpy;
 use starknet::ContractAddress;
diff --git a/packages/test_common/src/ownable.cairo b/packages/test_common/src/ownable.cairo
index 401d2f146..8a5651693 100644
--- a/packages/test_common/src/ownable.cairo
+++ b/packages/test_common/src/ownable.cairo
@@ -1,7 +1,6 @@
 use openzeppelin_access::ownable::OwnableComponent::OwnershipTransferred;
 use openzeppelin_access::ownable::OwnableComponent;
 use openzeppelin_testing::EventSpyExt;
-use openzeppelin_utils::serde::SerializedAppend;
 use snforge_std::EventSpy;
 use starknet::ContractAddress;
 
diff --git a/packages/test_common/src/upgrades.cairo b/packages/test_common/src/upgrades.cairo
index b573401d2..67ee94079 100644
--- a/packages/test_common/src/upgrades.cairo
+++ b/packages/test_common/src/upgrades.cairo
@@ -1,7 +1,7 @@
 use openzeppelin_testing::events::EventSpyExt;
 use openzeppelin_upgrades::UpgradeableComponent::Upgraded;
 use openzeppelin_upgrades::UpgradeableComponent;
-use snforge_std::{EventSpy, EventSpyAssertionsTrait};
+use snforge_std::{EventSpy};
 use starknet::{ContractAddress, ClassHash};
 
 #[generate_trait]
diff --git a/packages/testing/src/deployment.cairo b/packages/testing/src/deployment.cairo
index 85503f385..9ed7b42bc 100644
--- a/packages/testing/src/deployment.cairo
+++ b/packages/testing/src/deployment.cairo
@@ -1,7 +1,5 @@
-use core::starknet::SyscallResultTrait;
 use openzeppelin_testing::panic_data_to_byte_array;
-use snforge_std::{declare, get_class_hash, ContractClass, ContractClassTrait};
-use snforge_std::{start_cheat_caller_address, stop_cheat_caller_address};
+use snforge_std::{ContractClass, ContractClassTrait};
 use starknet::ContractAddress;
 
 /// Declares a contract with a `snforge` `declare` call and unwraps the result.
diff --git a/packages/testing/src/signing.cairo b/packages/testing/src/signing.cairo
index 2a45f1a0f..4e4d5da2f 100644
--- a/packages/testing/src/signing.cairo
+++ b/packages/testing/src/signing.cairo
@@ -1,6 +1,6 @@
 use snforge_std::signature::secp256k1_curve::{Secp256k1CurveSignerImpl, Secp256k1CurveKeyPairImpl};
 use snforge_std::signature::stark_curve::{StarkCurveSignerImpl, StarkCurveKeyPairImpl};
-use snforge_std::signature::{KeyPair, KeyPairTrait};
+use snforge_std::signature::{KeyPair};
 use starknet::secp256k1::Secp256k1Point;
 
 pub type StarkKeyPair = KeyPair<felt252, felt252>;
diff --git a/packages/token/src/tests/erc1155/test_dual1155_receiver.cairo b/packages/token/src/tests/erc1155/test_dual1155_receiver.cairo
index 7d1a3f5fd..d72beb549 100644
--- a/packages/token/src/tests/erc1155/test_dual1155_receiver.cairo
+++ b/packages/token/src/tests/erc1155/test_dual1155_receiver.cairo
@@ -4,12 +4,8 @@ use openzeppelin_token::erc1155::dual1155_receiver::{
     DualCaseERC1155Receiver, DualCaseERC1155ReceiverTrait
 };
 use openzeppelin_token::erc1155::interface::IERC1155_RECEIVER_ID;
-use openzeppelin_token::erc1155::interface::{
-    IERC1155ReceiverCamelDispatcher, IERC1155ReceiverCamelDispatcherTrait
-};
-use openzeppelin_token::erc1155::interface::{
-    IERC1155ReceiverDispatcher, IERC1155ReceiverDispatcherTrait
-};
+use openzeppelin_token::erc1155::interface::{IERC1155ReceiverCamelDispatcher};
+use openzeppelin_token::erc1155::interface::{IERC1155ReceiverDispatcher};
 
 //
 // Setup
diff --git a/packages/token/src/tests/erc1155/test_erc1155.cairo b/packages/token/src/tests/erc1155/test_erc1155.cairo
index b710eb086..55ae49ddb 100644
--- a/packages/token/src/tests/erc1155/test_erc1155.cairo
+++ b/packages/token/src/tests/erc1155/test_erc1155.cairo
@@ -14,11 +14,9 @@ use openzeppelin_token::erc1155::ERC1155Component::ERC1155CamelImpl;
 use openzeppelin_token::erc1155::ERC1155Component::{
     ERC1155Impl, ERC1155MetadataURIImpl, InternalImpl
 };
-use openzeppelin_token::erc1155::ERC1155Component::{TransferBatch, ApprovalForAll, TransferSingle};
 use openzeppelin_token::erc1155::ERC1155Component;
 use openzeppelin_token::erc1155;
 use openzeppelin_token::tests::mocks::erc1155_mocks::DualCaseERC1155Mock;
-use openzeppelin_utils::serde::SerializedAppend;
 use snforge_std::{spy_events, test_address, start_cheat_caller_address};
 use starknet::ContractAddress;
 
diff --git a/packages/token/src/tests/erc20/test_erc20.cairo b/packages/token/src/tests/erc20/test_erc20.cairo
index 70a322dbf..b8a8c1143 100644
--- a/packages/token/src/tests/erc20/test_erc20.cairo
+++ b/packages/token/src/tests/erc20/test_erc20.cairo
@@ -3,14 +3,11 @@ use openzeppelin_test_common::erc20::ERC20SpyHelpers;
 use openzeppelin_testing::constants::{
     ZERO, OWNER, SPENDER, RECIPIENT, NAME, SYMBOL, DECIMALS, SUPPLY, VALUE
 };
-use openzeppelin_token::erc20::ERC20Component::{Approval, Transfer};
 use openzeppelin_token::erc20::ERC20Component::{ERC20CamelOnlyImpl, ERC20Impl};
 use openzeppelin_token::erc20::ERC20Component::{ERC20MetadataImpl, InternalImpl};
 use openzeppelin_token::erc20::ERC20Component;
 use openzeppelin_token::tests::mocks::erc20_mocks::DualCaseERC20Mock;
-use openzeppelin_utils::serde::SerializedAppend;
 use snforge_std::{spy_events, test_address, start_cheat_caller_address};
-use starknet::ContractAddress;
 
 //
 // Setup
diff --git a/packages/token/src/tests/erc20/test_erc20_votes.cairo b/packages/token/src/tests/erc20/test_erc20_votes.cairo
index 620809adc..53961b4a7 100644
--- a/packages/token/src/tests/erc20/test_erc20_votes.cairo
+++ b/packages/token/src/tests/erc20/test_erc20_votes.cairo
@@ -13,7 +13,6 @@ use openzeppelin_token::erc20::extensions::erc20_votes::Delegation;
 use openzeppelin_token::tests::mocks::erc20_votes_mocks::DualCaseERC20VotesMock::SNIP12MetadataImpl;
 use openzeppelin_token::tests::mocks::erc20_votes_mocks::DualCaseERC20VotesMock;
 use openzeppelin_utils::cryptography::snip12::OffchainMessageHash;
-use openzeppelin_utils::serde::SerializedAppend;
 use openzeppelin_utils::structs::checkpoint::{Checkpoint, TraceTrait};
 use snforge_std::signature::KeyPairTrait;
 use snforge_std::signature::stark_curve::{StarkCurveKeyPairImpl, StarkCurveSignerImpl};
@@ -21,7 +20,7 @@ use snforge_std::{
     cheat_block_timestamp_global, start_cheat_caller_address, spy_events, cheat_chain_id_global,
     test_address
 };
-use snforge_std::{EventSpy, EventSpyAssertionsTrait};
+use snforge_std::{EventSpy};
 use starknet::ContractAddress;
 use starknet::contract_address_const;
 
diff --git a/packages/token/src/tests/erc721/test_dual721.cairo b/packages/token/src/tests/erc721/test_dual721.cairo
index 071e522e8..05a9679a7 100644
--- a/packages/token/src/tests/erc721/test_dual721.cairo
+++ b/packages/token/src/tests/erc721/test_dual721.cairo
@@ -9,7 +9,7 @@ use openzeppelin_token::erc721::interface::{
 };
 use openzeppelin_token::erc721::interface::{IERC721Dispatcher, IERC721DispatcherTrait};
 use openzeppelin_utils::serde::SerializedAppend;
-use snforge_std::{test_address, start_cheat_caller_address};
+use snforge_std::{start_cheat_caller_address};
 use starknet::ContractAddress;
 
 //
diff --git a/packages/token/src/tests/erc721/test_dual721_receiver.cairo b/packages/token/src/tests/erc721/test_dual721_receiver.cairo
index 29ca18343..e01b7f81c 100644
--- a/packages/token/src/tests/erc721/test_dual721_receiver.cairo
+++ b/packages/token/src/tests/erc721/test_dual721_receiver.cairo
@@ -4,19 +4,8 @@ use openzeppelin_token::erc721::dual721_receiver::{
     DualCaseERC721Receiver, DualCaseERC721ReceiverTrait
 };
 use openzeppelin_token::erc721::interface::IERC721_RECEIVER_ID;
-use openzeppelin_token::erc721::interface::{
-    IERC721ReceiverCamelDispatcher, IERC721ReceiverCamelDispatcherTrait
-};
-use openzeppelin_token::erc721::interface::{
-    IERC721ReceiverDispatcher, IERC721ReceiverDispatcherTrait
-};
-use openzeppelin_token::tests::mocks::erc721_receiver_mocks::{
-    CamelERC721ReceiverMock, CamelERC721ReceiverPanicMock
-};
-use openzeppelin_token::tests::mocks::erc721_receiver_mocks::{
-    SnakeERC721ReceiverMock, SnakeERC721ReceiverPanicMock
-};
-use openzeppelin_token::tests::mocks::non_implementing_mock::NonImplementingMock;
+use openzeppelin_token::erc721::interface::{IERC721ReceiverCamelDispatcher};
+use openzeppelin_token::erc721::interface::{IERC721ReceiverDispatcher};
 
 //
 // Setup
diff --git a/packages/upgrades/src/tests/test_upgradeable.cairo b/packages/upgrades/src/tests/test_upgradeable.cairo
index f7d336bb9..e64d7c970 100644
--- a/packages/upgrades/src/tests/test_upgradeable.cairo
+++ b/packages/upgrades/src/tests/test_upgradeable.cairo
@@ -1,8 +1,6 @@
 use openzeppelin_test_common::upgrades::UpgradeableSpyHelpers;
-use openzeppelin_testing::constants::{CLASS_HASH_ZERO, ZERO, FELT_VALUE as VALUE};
-use openzeppelin_testing::events::EventSpyExt;
+use openzeppelin_testing::constants::{CLASS_HASH_ZERO, FELT_VALUE as VALUE};
 use openzeppelin_testing::{declare_class, deploy};
-use openzeppelin_upgrades::UpgradeableComponent;
 use openzeppelin_upgrades::tests::mocks::upgrades_mocks::{
     IUpgradesV1Dispatcher, IUpgradesV1DispatcherTrait
 };
diff --git a/packages/utils/src/tests/test_snip12.cairo b/packages/utils/src/tests/test_snip12.cairo
index 6469a5e26..b828cf550 100644
--- a/packages/utils/src/tests/test_snip12.cairo
+++ b/packages/utils/src/tests/test_snip12.cairo
@@ -1,4 +1,4 @@
-use core::hash::{Hash, HashStateTrait, HashStateExTrait};
+use core::hash::{HashStateTrait, HashStateExTrait};
 use core::poseidon::{PoseidonTrait, poseidon_hash_span};
 use openzeppelin_testing::constants::{OWNER, RECIPIENT};
 use openzeppelin_utils::cryptography::snip12::{