diff --git a/futility/updater.c b/futility/updater.c
index a360f2c..25b20a7 100644
--- a/futility/updater.c
+++ b/futility/updater.c
@@ -1088,24 +1088,12 @@
 {
 	int errcnt = 0, i;
 	const char * const names[] = {
-		"RO_PRESERVE",
-		"RW_PRESERVE",
+		"RW_PRESERVE",  /* Only octopus fw branch is using this. */
 		"RO_VPD",
 		"RW_VPD",
 		"SMMSTORE",
 		"RW_NVRAM",
 		"RW_ELOG",
-		/*
-		 * TODO(hungte): b/116326638: Remove RO_FSG after the migration
-		 * is finished.
-		 */
-		"RO_FSG",
-		 /*
-		  * TODO(hungte): crbug.com/936768: Remove SI_GBE, SI_PDR after
-		  * both migrated to the new FMAP based preserve method.
-		  */
-		"SI_GBE",
-		"SI_PDR",
 	};
 
 	for (i = 0; i < ARRAY_SIZE(names); i++) {