diff --git a/yarn-project/aztec-nr/aztec/src/types/grumpkin_scalar.nr b/yarn-project/aztec-nr/aztec/src/types/grumpkin_scalar.nr
deleted file mode 100644
index 00b0041b8e33..000000000000
--- a/yarn-project/aztec-nr/aztec/src/types/grumpkin_scalar.nr
+++ /dev/null
@@ -1,31 +0,0 @@
-use crate::types::type_serialisation::TypeSerialisationInterface;
-
-struct GrumpkinScalar {
-    high: Field,
-    low: Field,
-}
-
-impl GrumpkinScalar {
-    fn new(high: Field, low: Field) -> Self {
-        // TODO: max value check
-        GrumpkinScalar { high, low }
-    }
-}
-
-global GRUMPKIN_SCALAR_SERIALISED_LEN: Field = 2;
-
-fn deserialise_grumpkin_scalar(fields: [Field; GRUMPKIN_SCALAR_SERIALISED_LEN]) -> GrumpkinScalar {
-    GrumpkinScalar {
-        high: fields[0],
-        low: fields[1],
-    }
-}
-
-fn serialise_grumpkin_scalar(scalar: GrumpkinScalar) -> [Field; GRUMPKIN_SCALAR_SERIALISED_LEN] {
-    [scalar.high, scalar.low]
-}
-
-global GrumpkinScalarSerialisationMethods = TypeSerialisationInterface {
-    deserialise: deserialise_grumpkin_scalar,
-    serialise: serialise_grumpkin_scalar,
-};
\ No newline at end of file
diff --git a/yarn-project/aztec-nr/value-note/src/value_note.nr b/yarn-project/aztec-nr/value-note/src/value_note.nr
index 1c10e15286fd..2f9ed483068b 100644
--- a/yarn-project/aztec-nr/value-note/src/value_note.nr
+++ b/yarn-project/aztec-nr/value-note/src/value_note.nr
@@ -6,7 +6,6 @@ use dep::aztec::note::{
 use dep::aztec::oracle::{
     rand::rand,
     get_secret_key::get_secret_key,
-    get_public_key::get_public_key,
 };
 
 global VALUE_NOTE_LEN: Field = 3; // 3 plus a header.
@@ -59,7 +58,6 @@ impl ValueNote {
     fn compute_nullifier(self) -> Field {
         let note_hash_for_nullify = compute_note_hash_for_read_or_nullify(ValueNoteMethods, self);
         let secret = get_secret_key(self.owner);
-
         // TODO(#1205) Should use a non-zero generator index.
         dep::std::hash::pedersen([
             note_hash_for_nullify,
diff --git a/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr b/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr
index 35f2655351da..ccd5084d8fdf 100644
--- a/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr
+++ b/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/src/ecdsa_public_key_note.nr
@@ -1,10 +1,7 @@
 use dep::aztec::note::note_interface::NoteInterface;
 use dep::aztec::note::note_header::NoteHeader;
 use dep::aztec::note::utils::compute_unique_siloed_note_hash;
-use dep::aztec::oracle::{
-    get_secret_key::get_secret_key,
-    get_public_key::get_public_key,
-};
+use dep::aztec::oracle::get_secret_key::get_secret_key;
 
 global ECDSA_PUBLIC_KEY_NOTE_LEN: Field = 5;
 
@@ -56,7 +53,6 @@ impl EcdsaPublicKeyNote {
     fn compute_nullifier(self) -> Field {
         let unique_siloed_note_hash = compute_unique_siloed_note_hash(EcdsaPublicKeyNoteInterface, self);
         let secret = get_secret_key(self.owner);
-
         // TODO(#1205) Should use a non-zero generator index.
         dep::std::hash::pedersen([
             unique_siloed_note_hash,
diff --git a/yarn-project/noir-contracts/src/contracts/escrow_contract/src/address_note.nr b/yarn-project/noir-contracts/src/contracts/escrow_contract/src/address_note.nr
index db3b5407d328..652c664dcb2d 100644
--- a/yarn-project/noir-contracts/src/contracts/escrow_contract/src/address_note.nr
+++ b/yarn-project/noir-contracts/src/contracts/escrow_contract/src/address_note.nr
@@ -1,10 +1,7 @@
 use dep::aztec::note::note_interface::NoteInterface;
 use dep::aztec::note::note_header::NoteHeader;
 use dep::aztec::note::utils::compute_siloed_note_hash;
-use dep::aztec::oracle::{
-    get_secret_key::get_secret_key,
-    get_public_key::get_public_key,
-};
+use dep::aztec::oracle::get_secret_key::get_secret_key;
 
 global ADDRESS_NOTE_LEN: Field = 2;
 
@@ -31,7 +28,6 @@ impl AddressNote {
     fn compute_nullifier(self) -> Field {
         let siloed_note_hash = compute_siloed_note_hash(AddressNoteMethods, self);
         let secret = get_secret_key(self.owner);
-
         // TODO(#1205) Should use a non-zero generator index.
         dep::std::hash::pedersen([
             siloed_note_hash,
diff --git a/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/src/address_note.nr b/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/src/address_note.nr
index 9f1060dede46..6801a040542b 100644
--- a/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/src/address_note.nr
+++ b/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/src/address_note.nr
@@ -1,10 +1,7 @@
 use dep::aztec::note::note_interface::NoteInterface;
 use dep::aztec::note::note_header::NoteHeader;
 use dep::aztec::note::utils::compute_unique_siloed_note_hash;
-use dep::aztec::oracle::{
-    get_secret_key::get_secret_key,
-    get_public_key::get_public_key,
-};
+use dep::aztec::oracle::get_secret_key::get_secret_key;
 
 global ADDRESS_NOTE_LEN: Field = 1;
 
@@ -30,7 +27,6 @@ impl AddressNote {
     fn compute_nullifier(self) -> Field {
         let unique_siloed_note_hash = compute_unique_siloed_note_hash(AddressNoteMethods, self);
         let secret = get_secret_key(self.address);
-
         // TODO(#1205) Should use a non-zero generator index.
         dep::std::hash::pedersen([
             unique_siloed_note_hash,
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/src/public_key_note.nr b/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/src/public_key_note.nr
index 592ce79dfa2b..771ca860327e 100644
--- a/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/src/public_key_note.nr
+++ b/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/src/public_key_note.nr
@@ -1,10 +1,7 @@
 use dep::aztec::note::note_interface::NoteInterface;
 use dep::aztec::note::note_header::NoteHeader;
 use dep::aztec::note::utils::compute_unique_siloed_note_hash;
-use dep::aztec::oracle::{
-    get_secret_key::get_secret_key,
-    get_public_key::get_public_key,
-};
+use dep::aztec::oracle::get_secret_key::get_secret_key;
 
 global PUBLIC_KEY_NOTE_LEN: Field = 3;
 
@@ -35,7 +32,6 @@ impl PublicKeyNote {
     fn compute_nullifier(self) -> Field {
         let unique_siloed_note_hash = compute_unique_siloed_note_hash(PublicKeyNoteMethods, self);
         let secret = get_secret_key(self.owner);
-
         // TODO(#1205) Should use a non-zero generator index.
         dep::std::hash::pedersen([
             unique_siloed_note_hash,