diff --git a/circuits/circom/messageValidator.circom b/circuits/circom/messageValidator.circom
index 734975f846..796d2c72e4 100644
--- a/circuits/circom/messageValidator.circom
+++ b/circuits/circom/messageValidator.circom
@@ -19,7 +19,6 @@ template MessageValidator() {
     validStateLeafIndex.in[0] <== stateTreeIndex;
     validStateLeafIndex.in[1] <== numSignUps;
 
-    // @todo check if we need this if we do the check inside processOne 
     // b) Whether the max vote option tree index is correct
     signal input voteOptionIndex;
     signal input maxVoteOptions;
diff --git a/circuits/circom/processMessages.circom b/circuits/circom/processMessages.circom
index f2db72eca6..3121b46f47 100644
--- a/circuits/circom/processMessages.circom
+++ b/circuits/circom/processMessages.circom
@@ -619,8 +619,6 @@ template ProcessOne(stateTreeDepth, voteOptionTreeDepth) {
     validVoteOptionIndex.in[1] <== maxVoteOptions;
 
     // @note pick the correct vote option index based on whether the index is < max vote options 
-    // @todo can probably add one output to messageValidator and take from there
-    // or maybe we can remove altogther from messageValidator so we don't double check this
     component cmdVoteOptionIndexMux = Mux1();
     cmdVoteOptionIndexMux.s <== validVoteOptionIndex.out;
     cmdVoteOptionIndexMux.c[0] <== 0;
diff --git a/circuits/circom/processMessagesNonQv.circom b/circuits/circom/processMessagesNonQv.circom
index 56d44d8e28..190a0c1fdf 100644
--- a/circuits/circom/processMessagesNonQv.circom
+++ b/circuits/circom/processMessagesNonQv.circom
@@ -541,8 +541,6 @@ template ProcessOneNonQv(stateTreeDepth, voteOptionTreeDepth) {
     validVoteOptionIndex.in[1] <== maxVoteOptions;
 
     // @note pick the correct vote option index based on whether the index is < max vote options 
-    // @todo can probably add one output to messageValidator and take from there
-    // or maybe we can remove altogther from messageValidator so we don't double check this
     component cmdVoteOptionIndexMux = Mux1();
     cmdVoteOptionIndexMux.s <== validVoteOptionIndex.out;
     cmdVoteOptionIndexMux.c[0] <== 0;