diff --git a/src/circuit/mont.rs b/src/circuit/mont.rs
index 37995fb..0141c8e 100644
--- a/src/circuit/mont.rs
+++ b/src/circuit/mont.rs
@@ -218,10 +218,6 @@ impl<E: JubjubEngine, Var: Copy> EdwardsPoint<E, Var> {
     {
         // -x^2 + y^2 = 1 + dx^2y^2
 
-        // TODO: This code uses a naive method to determine if the
-        // point is on the curve, but it could be optimized to three
-        // constraints.
-
         let x2 = x.square(cs.namespace(|| "x^2"))?;
         let y2 = y.square(cs.namespace(|| "y^2"))?;
         let x2y2 = x2.mul(cs.namespace(|| "x^2 y^2"), &y2)?;
@@ -249,9 +245,6 @@ impl<E: JubjubEngine, Var: Copy> EdwardsPoint<E, Var> {
     ) -> Result<Self, SynthesisError>
         where CS: ConstraintSystem<E, Variable=Var>
     {
-        // TODO: doubling can be optimized to just 5
-        // constraints.
-
         self.add(cs, self, params)
     }
 
diff --git a/src/circuit/num.rs b/src/circuit/num.rs
index 749d49a..8656e4b 100644
--- a/src/circuit/num.rs
+++ b/src/circuit/num.rs
@@ -303,10 +303,6 @@ impl<E: Engine, Var: Copy> AllocatedNum<E, Var> {
     ) -> Result<(Self, Self), SynthesisError>
         where CS: ConstraintSystem<E, Variable=Var>
     {
-        // TODO: Technically this need only be 1 constraint.
-        // However this interface does not currently support
-        // returning linear combinations.
-
         let c = Self::alloc(
             cs.namespace(|| "conditional reversal result 1"),
             || {
diff --git a/src/jubjub/mod.rs b/src/jubjub/mod.rs
index 0a53660..c265d84 100644
--- a/src/jubjub/mod.rs
+++ b/src/jubjub/mod.rs
@@ -140,7 +140,6 @@ impl JubjubBls12 {
             let mut pedersen_hash_generators = vec![];
 
             while pedersen_hash_generators.len() < 10 {
-                // TODO: personalize
                 let gh = group_hash(&[cur], &tmp);
                 // We don't want to overflow and start reusing generators
                 assert!(cur != u8::max_value());
@@ -160,7 +159,6 @@ impl JubjubBls12 {
             let mut fixed_base_generators = vec![];
 
             while fixed_base_generators.len() < (FixedGenerators::Max as usize) {
-                // TODO: personalize
                 let gh = group_hash(&[cur], &tmp);
                 // We don't want to overflow and start reusing generators
                 assert!(cur != u8::max_value());