diff --git a/noir-projects/aztec-nr/value-note/src/utils.nr b/noir-projects/aztec-nr/value-note/src/utils.nr
index 466cf660d3f8..8b0b6e2dac95 100644
--- a/noir-projects/aztec-nr/value-note/src/utils.nr
+++ b/noir-projects/aztec-nr/value-note/src/utils.nr
@@ -52,18 +52,7 @@ pub fn decrement_by_at_most(
     let mut decremented = 0;
     for i in 0..opt_notes.len() {
         if opt_notes[i].is_some() {
-            let note = opt_notes[i].unwrap_unchecked();
-
-            // This is similar to destroy_note, except we only compute the owner_npk_m_hash once instead of doing it in
-            // each loop iteration.
-
-            // Ensure the note is actually owned by the owner (to prevent user from generating a valid proof while
-            // spending someone else's notes).
-            // TODO (#6312): This will break with key rotation. Fix this. Will not be able to pass this after rotating keys.
-            assert(note.npk_m_hash.eq(owner_npk_m_hash));
-            decremented += note.value;
-
-            balance.remove(note);
+            decremented += destroy_note(balance, owner, opt_notes[i].unwrap_unchecked());
         }
     }