diff --git a/tooling/nargo/src/ops/compile.rs b/tooling/nargo/src/ops/compile.rs
index d4164eaa865..02159345086 100644
--- a/tooling/nargo/src/ops/compile.rs
+++ b/tooling/nargo/src/ops/compile.rs
@@ -85,22 +85,9 @@ pub fn compile_program(
             }
         };
 
-    // TODO: we say that pedersen hashing is supported by all backends for now
-    let is_opcode_supported_pedersen_hash = |opcode: &Opcode| -> bool {
-        if let Opcode::BlackBoxFuncCall(
-            acvm::acir::circuit::opcodes::BlackBoxFuncCall::PedersenHash { .. },
-        ) = opcode
-        {
-            true
-        } else {
-            is_opcode_supported(opcode)
-        }
-    };
-
     // Apply backend specific optimizations.
-    let optimized_program =
-        crate::ops::optimize_program(program, np_language, &is_opcode_supported_pedersen_hash)
-            .expect("Backend does not support an opcode that is in the IR");
+    let optimized_program = crate::ops::optimize_program(program, np_language, is_opcode_supported)
+        .expect("Backend does not support an opcode that is in the IR");
 
     (context.file_manager, Ok((optimized_program, warnings)))
 }
diff --git a/tooling/nargo_cli/src/cli/compile_cmd.rs b/tooling/nargo_cli/src/cli/compile_cmd.rs
index 02ba0d13e87..7b97cc8afdc 100644
--- a/tooling/nargo_cli/src/cli/compile_cmd.rs
+++ b/tooling/nargo_cli/src/cli/compile_cmd.rs
@@ -1,6 +1,5 @@
 use std::path::Path;
 
-use acvm::acir::circuit::opcodes::BlackBoxFuncCall;
 use acvm::acir::circuit::Opcode;
 use acvm::Language;
 use backend_interface::BackendOpcodeSupport;
@@ -213,19 +212,9 @@ fn compile_program(
         }
     };
 
-    // TODO: we say that pedersen hashing is supported by all backends for now
-    let is_opcode_supported_pedersen_hash = |opcode: &Opcode| -> bool {
-        if let Opcode::BlackBoxFuncCall(BlackBoxFuncCall::PedersenHash { .. }) = opcode {
-            true
-        } else {
-            is_opcode_supported(opcode)
-        }
-    };
-
     // Apply backend specific optimizations.
-    let optimized_program =
-        nargo::ops::optimize_program(program, np_language, &is_opcode_supported_pedersen_hash)
-            .expect("Backend does not support an opcode that is in the IR");
+    let optimized_program = nargo::ops::optimize_program(program, np_language, is_opcode_supported)
+        .expect("Backend does not support an opcode that is in the IR");
 
     save_program(optimized_program.clone(), package, &workspace.target_directory_path());