diff --git a/fdbclient/BlobGranuleCommon.h b/fdbclient/BlobGranuleCommon.h
index fd7ef1d788..c9b4d11d43 100644
--- a/fdbclient/BlobGranuleCommon.h
+++ b/fdbclient/BlobGranuleCommon.h
@@ -27,7 +27,6 @@
 #include "fdbclient/CommitTransaction.h"
 #include "fdbclient/FDBTypes.h"
 
-// TODO should GranuleSnapshot and GranuleDeltas just be typedefs instead of subclasses?
 // file format of actual blob files
 struct GranuleSnapshot : VectorRef<KeyValueRef> {
 
@@ -48,7 +47,6 @@ struct GranuleDeltas : VectorRef<MutationsAndVersionRef> {
 	}
 };
 
-// TODO better name?
 struct BlobFilePointerRef {
 	constexpr static FileIdentifier file_identifier = 5253554;
 	StringRef filename;
diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index d677ce0203..71a46eada8 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -1753,7 +1753,6 @@ ACTOR Future<ChangeFeedReply> getChangeFeedMutations(StorageServer* data, Change
 		    reply.arena, MutationsAndVersionRef(finalVersion, finalVersion == dequeVersion ? dequeKnownCommit : 0));
 	}
 
-	// TODO REMOVE or only do if mutation tracking is enabled
 	if (MUTATION_TRACKING_ENABLED) {
 		for (auto& mutations : reply.mutations) {
 			for (auto& m : mutations.mutations) {