diff --git a/aztec/src/context/public_context.nr b/aztec/src/context/public_context.nr
index 0a3da729..be95853c 100644
--- a/aztec/src/context/public_context.nr
+++ b/aztec/src/context/public_context.nr
@@ -4,7 +4,6 @@ use dep::protocol_types::constants::MAX_FIELD_VALUE;
 use dep::protocol_types::traits::{Serialize, Deserialize, Empty};
 use dep::protocol_types::abis::function_selector::FunctionSelector;
 use crate::context::gas::GasOpts;
-use crate::hash::ArgsHasher;
 
 pub struct PublicContext {
     args_hash: Option<Field>,
@@ -204,7 +203,6 @@ fn gas_for_call(user_gas: GasOpts) -> [Field; 2] {
 }
 
 // Unconstrained opcode wrappers (do not use directly).
-// TODO(https://github.com/AztecProtocol/aztec-packages/issues/6420): reconsider.
 unconstrained fn address() -> AztecAddress {
     address_opcode()
 }
diff --git a/aztec/src/test/mocks/mock_note.nr b/aztec/src/test/mocks/mock_note.nr
index 13f1723d..eb1456b4 100644
--- a/aztec/src/test/mocks/mock_note.nr
+++ b/aztec/src/test/mocks/mock_note.nr
@@ -1,9 +1,9 @@
 use crate::{
-    context::PrivateContext, generators::Ga1 as G_val, hash::poseidon2_hash_with_separator,
+    context::PrivateContext, generators::Ga1 as G_val,
     note::{note_header::NoteHeader, note_interface::NoteInterface, utils::compute_note_hash_for_nullify}
 };
 
-use dep::protocol_types::{address::AztecAddress, constants::GENERATOR_INDEX__NOTE_NULLIFIER, traits::Eq};
+use dep::protocol_types::{address::AztecAddress, constants::GENERATOR_INDEX__NOTE_NULLIFIER, hash::poseidon2_hash_with_separator};
 use dep::std::{embedded_curve_ops::multi_scalar_mul, hash::from_field_unsafe};
 use crate::note::note_interface::NullifiableNote;