diff --git a/src/zcash/circuit/commitment.tcc b/src/zcash/circuit/commitment.tcc
index 769749a6..d1b0b10f 100644
--- a/src/zcash/circuit/commitment.tcc
+++ b/src/zcash/circuit/commitment.tcc
@@ -89,10 +89,6 @@ public:
     }
 
     void generate_r1cs_constraints() {
-        // TODO: This may not be necessary if SHA256 constrains
-        // its output digests to be boolean anyway.
-        intermediate_hash->generate_r1cs_constraints();
-
         hasher1->generate_r1cs_constraints();
         hasher2->generate_r1cs_constraints();
     }
diff --git a/src/zcash/circuit/note.tcc b/src/zcash/circuit/note.tcc
index 87912b34..f472cb15 100644
--- a/src/zcash/circuit/note.tcc
+++ b/src/zcash/circuit/note.tcc
@@ -96,11 +96,6 @@ public:
         a_sk->generate_r1cs_constraints();
         rho->generate_r1cs_constraints();
 
-        // TODO: These constraints may not be necessary if SHA256
-        // already boolean constrains its outputs.
-        a_pk->generate_r1cs_constraints();
-        commitment->generate_r1cs_constraints();
-
         spend_authority->generate_r1cs_constraints();
         expose_nullifiers->generate_r1cs_constraints();
 
@@ -222,10 +217,6 @@ public:
 
         a_pk->generate_r1cs_constraints();
 
-        // TODO: This constraint may not be necessary if SHA256
-        // already boolean constrains its outputs.
-        rho->generate_r1cs_constraints();
-
         prevent_faerie_gold->generate_r1cs_constraints();
 
         commit_to_outputs->generate_r1cs_constraints();