diff --git a/nssa/core/src/program.rs b/nssa/core/src/program.rs
index 7f6038f1..54a7a97e 100644
--- a/nssa/core/src/program.rs
+++ b/nssa/core/src/program.rs
@@ -142,7 +142,7 @@ fn validate_uniqueness_of_account_ids(pre_states: &[AccountWithMetadata]) -> boo
     let number_of_accounts = pre_states.len();
     let number_of_account_ids = pre_states
         .iter()
-        .map(|account| account.account_id.clone())
+        .map(|account| account.account_id)
         .collect::<HashSet<_>>()
         .len();
 
diff --git a/nssa/src/privacy_preserving_transaction/circuit.rs b/nssa/src/privacy_preserving_transaction/circuit.rs
index bd786b10..37f07dd9 100644
--- a/nssa/src/privacy_preserving_transaction/circuit.rs
+++ b/nssa/src/privacy_preserving_transaction/circuit.rs
@@ -56,7 +56,7 @@ pub fn execute_and_prove(
     let mut program_outputs = Vec::new();
 
     for _i in 0..MAX_NUMBER_CHAINED_CALLS {
-        let inner_receipt = execute_and_prove_program(&program, &pre_states, &instruction_data)?;
+        let inner_receipt = execute_and_prove_program(program, &pre_states, &instruction_data)?;
 
         let program_output: ProgramOutput = inner_receipt
             .journal
diff --git a/nssa/src/program.rs b/nssa/src/program.rs
index 91fada41..f646798c 100644
--- a/nssa/src/program.rs
+++ b/nssa/src/program.rs
@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 
 use crate::program_methods::{AUTHENTICATED_TRANSFER_ELF, PINATA_ELF, TOKEN_ELF};
 use nssa_core::{
diff --git a/nssa/src/state.rs b/nssa/src/state.rs
index 0f83a152..8c07116e 100644
--- a/nssa/src/state.rs
+++ b/nssa/src/state.rs
@@ -244,9 +244,18 @@ pub mod tests {
     use std::collections::HashMap;
 
     use crate::{
-        error::NssaError, execute_and_prove, privacy_preserving_transaction::{
-            circuit::{self, ProgramWithDependencies}, message::Message, witness_set::WitnessSet, PrivacyPreservingTransaction
-        }, program::Program, public_transaction, signature::PrivateKey, Address, PublicKey, PublicTransaction, V02State
+        Address, PublicKey, PublicTransaction, V02State,
+        error::NssaError,
+        execute_and_prove,
+        privacy_preserving_transaction::{
+            PrivacyPreservingTransaction,
+            circuit::{self, ProgramWithDependencies},
+            message::Message,
+            witness_set::WitnessSet,
+        },
+        program::Program,
+        public_transaction,
+        signature::PrivateKey,
     };
 
     use nssa_core::{