diff --git a/src/gates/interpolation.rs b/src/gates/interpolation.rs
index f7934b71..0225ce59 100644
--- a/src/gates/interpolation.rs
+++ b/src/gates/interpolation.rs
@@ -25,6 +25,21 @@ pub(crate) struct HighDegreeInterpolationGate<F: RichField + Extendable<D>, cons
     _phantom: PhantomData<F>,
 }
 
+impl<F: RichField + Extendable<D>, const D: usize> InterpolationGate<F, D>
+    for HighDegreeInterpolationGate<F, D>
+{
+    fn new(subgroup_bits: usize) -> Self {
+        Self {
+            subgroup_bits,
+            _phantom: PhantomData,
+        }
+    }
+
+    fn num_points(&self) -> usize {
+        1 << self.subgroup_bits
+    }
+}
+
 impl<F: RichField + Extendable<D>, const D: usize> HighDegreeInterpolationGate<F, D> {
     /// End of wire indices, exclusive.
     fn end(&self) -> usize {
@@ -64,74 +79,6 @@ impl<F: RichField + Extendable<D>, const D: usize> HighDegreeInterpolationGate<F
     }
 }
 
-impl<F: RichField + Extendable<D>, const D: usize> InterpolationGate<F, D>
-    for HighDegreeInterpolationGate<F, D>
-{
-    fn new(subgroup_bits: usize) -> Self {
-        Self {
-            subgroup_bits,
-            _phantom: PhantomData,
-        }
-    }
-
-    fn num_points(&self) -> usize {
-        1 << self.subgroup_bits
-    }
-
-    /// Wire index of the coset shift.
-    fn wire_shift(&self) -> usize {
-        0
-    }
-
-    fn start_values(&self) -> usize {
-        1
-    }
-
-    /// Wire indices of the `i`th interpolant value.
-    fn wires_value(&self, i: usize) -> Range<usize> {
-        debug_assert!(i < self.num_points());
-        let start = self.start_values() + i * D;
-        start..start + D
-    }
-
-    fn start_evaluation_point(&self) -> usize {
-        self.start_values() + self.num_points() * D
-    }
-
-    /// Wire indices of the point to evaluate the interpolant at.
-    fn wires_evaluation_point(&self) -> Range<usize> {
-        let start = self.start_evaluation_point();
-        start..start + D
-    }
-
-    fn start_evaluation_value(&self) -> usize {
-        self.start_evaluation_point() + D
-    }
-
-    /// Wire indices of the interpolated value.
-    fn wires_evaluation_value(&self) -> Range<usize> {
-        let start = self.start_evaluation_value();
-        start..start + D
-    }
-
-    fn start_coeffs(&self) -> usize {
-        self.start_evaluation_value() + D
-    }
-
-    /// The number of routed wires required in the typical usage of this gate, where the points to
-    /// interpolate, the evaluation point, and the corresponding value are all routed.
-    fn num_routed_wires(&self) -> usize {
-        self.start_coeffs()
-    }
-
-    /// Wire indices of the interpolant's `i`th coefficient.
-    fn wires_coeff(&self, i: usize) -> Range<usize> {
-        debug_assert!(i < self.num_points());
-        let start = self.start_coeffs() + i * D;
-        start..start + D
-    }
-}
-
 impl<F: RichField + Extendable<D>, const D: usize> Gate<F, D>
     for HighDegreeInterpolationGate<F, D>
 {
@@ -227,7 +174,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Gate<F, D>
     ) -> Vec<Box<dyn WitnessGenerator<F>>> {
         let gen = InterpolationGenerator::<F, D> {
             gate_index,
-            gate: self.clone(),
+            gate: *self,
             _phantom: PhantomData,
         };
         vec![Box::new(gen.adapter())]
diff --git a/src/gates/low_degree_interpolation.rs b/src/gates/low_degree_interpolation.rs
index abbdb00e..1c2b41e4 100644
--- a/src/gates/low_degree_interpolation.rs
+++ b/src/gates/low_degree_interpolation.rs
@@ -38,63 +38,6 @@ impl<F: RichField + Extendable<D>, const D: usize> InterpolationGate<F, D>
     fn num_points(&self) -> usize {
         1 << self.subgroup_bits
     }
-
-    /// Wire index of the coset shift.
-    fn wire_shift(&self) -> usize {
-        0
-    }
-
-    fn start_values(&self) -> usize {
-        1
-    }
-
-    /// Wire indices of the `i`th interpolant value.
-    fn wires_value(&self, i: usize) -> Range<usize> {
-        debug_assert!(i < self.num_points());
-        let start = self.start_values() + i * D;
-        start..start + D
-    }
-
-    fn start_evaluation_point(&self) -> usize {
-        self.start_values() + self.num_points() * D
-    }
-
-    /// Wire indices of the point to evaluate the interpolant at.
-    fn wires_evaluation_point(&self) -> Range<usize> {
-        let start = self.start_evaluation_point();
-        start..start + D
-    }
-
-    fn start_evaluation_value(&self) -> usize {
-        self.start_evaluation_point() + D
-    }
-
-    /// Wire indices of the interpolated value.
-    fn wires_evaluation_value(&self) -> Range<usize> {
-        let start = self.start_evaluation_value();
-        start..start + D
-    }
-
-    fn start_coeffs(&self) -> usize {
-        self.start_evaluation_value() + D
-    }
-
-    /// The number of routed wires required in the typical usage of this gate, where the points to
-    /// interpolate, the evaluation point, and the corresponding value are all routed.
-    fn num_routed_wires(&self) -> usize {
-        self.start_coeffs()
-    }
-
-    /// Wire indices of the interpolant's `i`th coefficient.
-    fn wires_coeff(&self, i: usize) -> Range<usize> {
-        debug_assert!(i < self.num_points());
-        let start = self.start_coeffs() + i * D;
-        start..start + D
-    }
-
-    fn end_coeffs(&self) -> usize {
-        self.start_coeffs() + D * self.num_points()
-    }
 }
 
 impl<F: RichField + Extendable<D>, const D: usize> LowDegreeInterpolationGate<F, D> {
@@ -322,7 +265,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Gate<F, D> for LowDegreeInter
     ) -> Vec<Box<dyn WitnessGenerator<F>>> {
         let gen = InterpolationGenerator::<F, D> {
             gate_index,
-            gate: self.clone(),
+            gate: *self,
             _phantom: PhantomData,
         };
         vec![Box::new(gen.adapter())]