diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go
index fceb45d62..98fdcdcda 100644
--- a/abci/example/kvstore/kvstore.go
+++ b/abci/example/kvstore/kvstore.go
@@ -433,9 +433,6 @@ func (app *Application) execPrepareTx(tx []byte) *types.ExecTxResult {
 // substPrepareTx subst all the preparetx in the blockdata
 // to null string(could be any arbitrary string).
 func (app *Application) substPrepareTx(blockData [][]byte) []*types.TxRecord {
-	// TODO: this mechanism will change with the current spec of PrepareProposal
-	// We now have a special type for marking a tx as changed
-
 	trs := make([]*types.TxRecord, len(blockData))
 	for i, tx := range blockData {
 		if isPrepareTx(tx) {
diff --git a/abci/types/types.go b/abci/types/types.go
index cfdc13a63..59aaaebc8 100644
--- a/abci/types/types.go
+++ b/abci/types/types.go
@@ -251,6 +251,9 @@ func (rpp *ResponsePrepareProposal) Validate(maxSizeBytes int64, otxs [][]byte)
 	if !rpp.ModifiedTx {
 		// This method currently only checks the validity of the TxRecords field.
 		// If ModifiedTx is false, then we can ignore the validity of the TxRecords field.
+		//
+		// TODO: When implementing VoteExensions, AppSignedUpdates may be modified by the application
+		// and this method should be updated to validate the AppSignedUpdates.
 		return nil
 	}
 
diff --git a/internal/state/execution.go b/internal/state/execution.go
index 9016965f5..c32dc24da 100644
--- a/internal/state/execution.go
+++ b/internal/state/execution.go
@@ -429,7 +429,7 @@ func extendedCommitInfo(c abci.CommitInfo) abci.ExtendedCommitInfo {
 			Validator:       c.Votes[i].Validator,
 			SignedLastBlock: c.Votes[i].SignedLastBlock,
 			/*
-				TODO: Include extended vote information once vote extension vote is complete.
+				TODO: Include vote extensions information when implementing vote extension is complete.
 				VoteExtension:   []byte{},
 			*/
 		}