diff --git a/lightclient-circuits/src/committee_update_circuit.rs b/lightclient-circuits/src/committee_update_circuit.rs
index 0e735bc..42a481c 100644
--- a/lightclient-circuits/src/committee_update_circuit.rs
+++ b/lightclient-circuits/src/committee_update_circuit.rs
@@ -331,11 +331,11 @@ mod tests {
         let witness = load_circuit_args();
         let params: ParamsKZG<Bn256> = gen_srs(K);
 
-        let circuit = CommitteeUpdateCircuit::<Testnet, Fr>::mock_circuit(
-            &params,
+        let circuit = CommitteeUpdateCircuit::<Testnet, Fr>::create_circuit(
             CircuitBuilderStage::Mock,
             None,
             &witness,
+            &params,
         )
         .unwrap();
 
diff --git a/lightclient-circuits/src/sync_step_circuit.rs b/lightclient-circuits/src/sync_step_circuit.rs
index bd6776f..2cc17f1 100644
--- a/lightclient-circuits/src/sync_step_circuit.rs
+++ b/lightclient-circuits/src/sync_step_circuit.rs
@@ -470,11 +470,11 @@ mod tests {
         let witness = load_circuit_args();
         let params: ParamsKZG<Bn256> = gen_srs(K);
 
-        let circuit = StepCircuit::<Testnet, Fr>::mock_circuit(
-            &params,
+        let circuit = StepCircuit::<Testnet, Fr>::create_circuit(
             CircuitBuilderStage::Mock,
             None,
             &witness,
+            &params,
         )
         .unwrap();
 
diff --git a/lightclient-circuits/src/util/circuit.rs b/lightclient-circuits/src/util/circuit.rs
index fda78e6..030cea3 100644
--- a/lightclient-circuits/src/util/circuit.rs
+++ b/lightclient-circuits/src/util/circuit.rs
@@ -248,16 +248,6 @@ pub trait AppCircuit {
 
         Ok(calldata)
     }
-
-    /// Same as [`AppCircuit::create_circuit`] but with a mock circuit.
-    fn mock_circuit(
-        params: &ParamsKZG<Bn256>,
-        stage: CircuitBuilderStage,
-        pinning: Option<Self::Pinning>,
-        witness: &Self::Witness,
-    ) -> Result<impl crate::util::PinnableCircuit<Fr>, Error> {
-        Self::create_circuit(stage, pinning, witness, params)
-    }
 }
 
 pub fn custom_gen_evm_verifier_shplonk<C: CircuitExt<Fr>>(
diff --git a/lightclient-circuits/src/witness/rotation.rs b/lightclient-circuits/src/witness/rotation.rs
index d723ea9..e19bf1e 100644
--- a/lightclient-circuits/src/witness/rotation.rs
+++ b/lightclient-circuits/src/witness/rotation.rs
@@ -115,11 +115,11 @@ mod tests {
         let witness = CommitteeUpdateArgs::<Testnet>::default();
         let params: ParamsKZG<Bn256> = gen_srs(K);
 
-        let circuit = CommitteeUpdateCircuit::<Testnet, Fr>::mock_circuit(
-            &params,
+        let circuit = CommitteeUpdateCircuit::<Testnet, Fr>::create_circuit(
             CircuitBuilderStage::Mock,
             None,
             &witness,
+            &params,
         )
         .unwrap();
 
diff --git a/lightclient-circuits/src/witness/step.rs b/lightclient-circuits/src/witness/step.rs
index 2848048..1e48e0f 100644
--- a/lightclient-circuits/src/witness/step.rs
+++ b/lightclient-circuits/src/witness/step.rs
@@ -143,11 +143,11 @@ mod tests {
         let witness = SyncStepArgs::<Testnet>::default();
         let params: ParamsKZG<Bn256> = gen_srs(K);
 
-        let circuit = StepCircuit::<Testnet, Fr>::mock_circuit(
-            &params,
+        let circuit = StepCircuit::<Testnet, Fr>::create_circuit(
             CircuitBuilderStage::Mock,
             None,
             &witness,
+            &params,
         )
         .unwrap();
 
diff --git a/lightclient-circuits/tests/step.rs b/lightclient-circuits/tests/step.rs
index ca954c5..0eae2a1 100644
--- a/lightclient-circuits/tests/step.rs
+++ b/lightclient-circuits/tests/step.rs
@@ -158,11 +158,11 @@ fn test_eth2_spec_evm_verify(
 
     let pinning = Eth2ConfigPinning::from_path("./config/sync_step_21.json");
 
-    let circuit = StepCircuit::<Minimal, bn256::Fr>::mock_circuit(
-        &params,
+    let circuit = StepCircuit::<Minimal, bn256::Fr>::create_circuit(
         CircuitBuilderStage::Prover,
         Some(pinning),
         &witness,
+        &params,
     )
     .unwrap();
 
diff --git a/preprocessor/src/lib.rs b/preprocessor/src/lib.rs
index 1b12e52..468d9e6 100644
--- a/preprocessor/src/lib.rs
+++ b/preprocessor/src/lib.rs
@@ -268,9 +268,13 @@ mod tests {
 
         let params: ParamsKZG<Bn256> = gen_srs(K);
 
-        let circuit =
-            StepCircuit::<Testnet, Fr>::mock_circuit(&params, CircuitBuilderStage::Mock, None, &s)
-                .unwrap();
+        let circuit = StepCircuit::<Testnet, Fr>::create_circuit(
+            CircuitBuilderStage::Mock,
+            None,
+            &s,
+            &params,
+        )
+        .unwrap();
 
         let prover = MockProver::<Fr>::run(K, &circuit, circuit.instances()).unwrap();
         prover.assert_satisfied_par();
@@ -278,11 +282,11 @@ mod tests {
         const CONFIG_PATH: &str = "../lightclient-circuits/config/committee_update_testnet.json";
 
         let pinning = Eth2ConfigPinning::from_path(CONFIG_PATH);
-        let circuit = CommitteeUpdateCircuit::<Testnet, Fr>::mock_circuit(
-            &params,
+        let circuit = CommitteeUpdateCircuit::<Testnet, Fr>::create_circuit(
             CircuitBuilderStage::Mock,
             Some(pinning),
             &c,
+            &params,
         )
         .unwrap();
 
diff --git a/preprocessor/src/rotation.rs b/preprocessor/src/rotation.rs
index 8688c4f..1166356 100644
--- a/preprocessor/src/rotation.rs
+++ b/preprocessor/src/rotation.rs
@@ -132,11 +132,11 @@ mod tests {
         let pinning = Eth2ConfigPinning::from_path(CONFIG_PATH);
         let params: ParamsKZG<Bn256> = gen_srs(K);
 
-        let circuit = CommitteeUpdateCircuit::<Testnet, Fr>::mock_circuit(
-            &params,
+        let circuit = CommitteeUpdateCircuit::<Testnet, Fr>::create_circuit(
             CircuitBuilderStage::Mock,
             Some(pinning),
             &witness,
+            &params,
         )
         .unwrap();
 
diff --git a/preprocessor/src/step.rs b/preprocessor/src/step.rs
index 89e9f94..df207c7 100644
--- a/preprocessor/src/step.rs
+++ b/preprocessor/src/step.rs
@@ -183,11 +183,11 @@ mod tests {
         let witness = fetch_step_args::<Testnet, _>(&client).await.unwrap();
         let params: ParamsKZG<Bn256> = gen_srs(K);
 
-        let circuit = StepCircuit::<Testnet, Fr>::mock_circuit(
-            &params,
+        let circuit = StepCircuit::<Testnet, Fr>::create_circuit(
             CircuitBuilderStage::Mock,
             None,
             &witness,
+            &params,
         )
         .unwrap();