diff --git a/src/gates/gate.rs b/src/gates/gate.rs
index 83b799be..1765191e 100644
--- a/src/gates/gate.rs
+++ b/src/gates/gate.rs
@@ -1,12 +1,9 @@
 use std::hash::{Hash, Hasher};
-use std::iter::FromIterator;
-use std::ops::Index;
 use std::sync::Arc;
 
 use crate::circuit_builder::CircuitBuilder;
 use crate::field::extension_field::target::ExtensionTarget;
 use crate::field::extension_field::{Extendable, FieldExtension};
-use crate::field::field::Field;
 use crate::generator::WitnessGenerator;
 use crate::vars::{EvaluationTargets, EvaluationVars, EvaluationVarsBase};
 
diff --git a/src/generator.rs b/src/generator.rs
index db81172f..d760df05 100644
--- a/src/generator.rs
+++ b/src/generator.rs
@@ -2,7 +2,6 @@ use std::collections::{HashMap, HashSet};
 use std::fmt::Debug;
 
 use crate::field::field::Field;
-use crate::permutation_argument::TargetPartitions;
 use crate::target::Target;
 use crate::witness::PartialWitness;
 
diff --git a/src/plonk_common.rs b/src/plonk_common.rs
index b92a4c57..731d5741 100644
--- a/src/plonk_common.rs
+++ b/src/plonk_common.rs
@@ -116,7 +116,7 @@ pub(crate) fn eval_vanishing_poly<F: Extendable<D>, const D: usize>(
 /// Like `eval_vanishing_poly`, but specialized for base field points.
 pub(crate) fn eval_vanishing_poly_base<F: Extendable<D>, const D: usize>(
     common_data: &CommonCircuitData<F, D>,
-    i: usize,
+    index: usize,
     x: F,
     vars: EvaluationVarsBase<F>,
     local_plonk_zs: &[F],
@@ -138,7 +138,7 @@ pub(crate) fn eval_vanishing_poly_base<F: Extendable<D>, const D: usize>(
     for i in 0..common_data.config.num_challenges {
         let z_x = local_plonk_zs[i];
         let z_gz = next_plonk_zs[i];
-        vanishing_z_1_terms.push(z_h_on_coset.eval_l1(i, x) * (z_x - F::ONE));
+        vanishing_z_1_terms.push(z_h_on_coset.eval_l1(index, x) * (z_x - F::ONE));
 
         let mut f_prime = F::ONE;
         let mut g_prime = F::ONE;
diff --git a/src/polynomial/commitment.rs b/src/polynomial/commitment.rs
index aa70fd68..5ace678c 100644
--- a/src/polynomial/commitment.rs
+++ b/src/polynomial/commitment.rs
@@ -8,7 +8,6 @@ use crate::fri::{prover::fri_proof, verifier::verify_fri_proof, FriConfig};
 use crate::merkle_tree::MerkleTree;
 use crate::plonk_challenger::Challenger;
 use crate::plonk_common::PlonkPolynomials;
-use crate::plonk_common::{reduce_polys_with_iter, reduce_with_iter};
 use crate::polynomial::polynomial::{PolynomialCoeffs, PolynomialValues};
 use crate::proof::{FriProof, FriProofTarget, Hash, OpeningSet};
 use crate::timed;
diff --git a/src/prover.rs b/src/prover.rs
index 06a215e5..6ea0b8fc 100644
--- a/src/prover.rs
+++ b/src/prover.rs
@@ -5,7 +5,6 @@ use rayon::prelude::*;
 
 use crate::circuit_data::{CommonCircuitData, ProverOnlyCircuitData};
 use crate::field::extension_field::Extendable;
-use crate::field::fft::ifft;
 use crate::generator::generate_partial_witness;
 use crate::plonk_challenger::Challenger;
 use crate::plonk_common::{eval_vanishing_poly_base, ZeroPolyOnCoset};
@@ -76,7 +75,7 @@ pub(crate) fn prove<F: Extendable<D>, const D: usize>(
     let gammas = challenger.get_n_challenges(num_challenges);
 
     let plonk_z_vecs = timed!(
-        compute_zs(&witness, &betas, &gammas, &prover_data, &common_data),
+        compute_zs(&witness, &betas, &gammas, prover_data, common_data),
         "to compute Z's"
     );
 
@@ -247,9 +246,9 @@ fn compute_quotient_polys<'a, F: Extendable<D>, const D: usize>(
             let i_next = (i + next_step) % lde_size;
             let local_constants = get_at_index(&prover_data.constants_commitment, i);
             let s_sigmas = get_at_index(&prover_data.sigmas_commitment, i);
-            let local_wires = get_at_index(&wires_commitment, i);
-            let local_plonk_zs = get_at_index(&plonk_zs_commitment, i);
-            let next_plonk_zs = get_at_index(&plonk_zs_commitment, i_next);
+            let local_wires = get_at_index(wires_commitment, i);
+            let local_plonk_zs = get_at_index(plonk_zs_commitment, i);
+            let next_plonk_zs = get_at_index(plonk_zs_commitment, i_next);
 
             debug_assert_eq!(local_wires.len(), common_data.config.num_wires);
             debug_assert_eq!(local_plonk_zs.len(), num_challenges);