diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
index afbbfdddf9..48cc33c3f6 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
@@ -82,7 +82,6 @@ formset
     text
          help   = STRING_TOKEN(STR_RESET),
          text   = STRING_TOKEN(STR_RESET),
-         text   = STRING_TOKEN(STR_NULL_STRING),
          flags  = INTERACTIVE,
          key    = FORM_RESET;
 
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
index c4ccc578a7..1531617dc5 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
@@ -66,14 +66,12 @@ formset
        text
          help   = STRING_TOKEN(STR_SAVE_AND_EXIT),
          text   = STRING_TOKEN(STR_SAVE_AND_EXIT),
-         text   = STRING_TOKEN(STR_NULL_STRING),
          flags  = INTERACTIVE,
          key    = KEY_VALUE_SAVE_AND_EXIT_BOOT;
 
        text
          help   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
          text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
-         text   = STRING_TOKEN(STR_NULL_STRING),
          flags  = INTERACTIVE,
          key    = KEY_VALUE_NO_SAVE_AND_EXIT_BOOT;
 
@@ -117,14 +115,12 @@ formset
        text
          help   = STRING_TOKEN(STR_SAVE_AND_EXIT),
          text   = STRING_TOKEN(STR_SAVE_AND_EXIT),
-         text   = STRING_TOKEN(STR_NULL_STRING),
          flags  = INTERACTIVE,
          key    = KEY_VALUE_SAVE_AND_EXIT_DRIVER;  //BUGBUB: allow duplicate key in one formset???
 
        text
          help   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
          text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
-         text   = STRING_TOKEN(STR_NULL_STRING),
          flags  = INTERACTIVE,
          key    = KEY_VALUE_NO_SAVE_AND_EXIT_DRIVER;
 
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
index 79ec796b64..d5fe4f4c48 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
@@ -106,7 +106,6 @@ formset
     text
       help    = STRING_TOKEN(STR_CONTINUE_HELP),
       text    = STRING_TOKEN(STR_CONTINUE_PROMPT),
-      text    = STRING_TOKEN(STR_NULL_STRING),
       flags   = INTERACTIVE,
       key     = FRONT_PAGE_KEY_CONTINUE;
 
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
index 719353de29..018fe05988 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
@@ -207,7 +207,6 @@ formset
     text
       help   = STRING_TOKEN (STR_SAVE_CHANGES),
       text   = STRING_TOKEN (STR_SAVE_CHANGES),
-        text   = STRING_TOKEN (STR_SAVE_CHANGES),
       flags  = INTERACTIVE,
       key    = KEY_SAVE_CHANGES;
       
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
index c5d74b06df..661f6262c9 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
@@ -82,7 +82,6 @@ formset
     text
       help   = STRING_TOKEN(STR_SAVE_CHANGES),
       text   = STRING_TOKEN(STR_SAVE_CHANGES),
-        text   = STRING_TOKEN(STR_SAVE_CHANGES),
       flags  = INTERACTIVE,
       key    = KEY_SAVE_CHANGES;
       
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr b/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
index a4eede18d0..eb0e3dec55 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
@@ -42,7 +42,6 @@ formset
     text
       help   = STRING_TOKEN(STR_FIRST_REFRESH_HELP),
       text   = STRING_TOKEN(STR_FIRST_REFRESH),
-      text   = STRING_TOKEN(STR_NULL_STRING),
       flags  = INTERACTIVE,
       key    = KEY_VALUE_DEVICE_REFRESH;
 
@@ -102,7 +101,6 @@ formset
     text
       help   = STRING_TOKEN (STR_NULL_STRING),
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),
-        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),
       flags  = INTERACTIVE | RESET_REQUIRED,
       key    = KEY_VALUE_ORDER_SAVE_AND_EXIT;
   endform;
diff --git a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
index 4a322cfd69..80e833f10f 100644
--- a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
+++ b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
@@ -88,14 +88,12 @@ formset
     text
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),
-        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),
       flags  = INTERACTIVE,
       key    = KEY_SAVE_ORDER_CHANGES;
 
     text
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
       text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
-        text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
       flags  = INTERACTIVE,
       key    = KEY_IGNORE_ORDER_CHANGES;
   endform;
@@ -109,14 +107,12 @@ formset
     text
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),
-        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),
       flags  = INTERACTIVE,
       key    = KEY_SAVE_DELETE_ATTEMPT;
 
     text
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
       text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
-        text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
       flags  = INTERACTIVE,
       key    = KEY_IGNORE_DELETE_ATTEMPT;
   endform;    
@@ -353,7 +349,6 @@ formset
     text
       help   = STRING_TOKEN (STR_SAVE_CHANGES_HELP),
       text   = STRING_TOKEN (STR_SAVE_CHANGES),
-        text   = STRING_TOKEN (STR_SAVE_CHANGES),
       flags  = INTERACTIVE,
       key    = KEY_SAVE_ATTEMPT_CONFIG;
       
diff --git a/NetworkPkg/Ip6Dxe/Ip6Config.vfr b/NetworkPkg/Ip6Dxe/Ip6Config.vfr
index de63f4dad3..0d62b0a168 100644
--- a/NetworkPkg/Ip6Dxe/Ip6Config.vfr
+++ b/NetworkPkg/Ip6Dxe/Ip6Config.vfr
@@ -127,7 +127,6 @@ formset
     text
       help   = STRING_TOKEN (STR_SAVE_CHANGES_HELP),
       text   = STRING_TOKEN (STR_SAVE_CHANGES),
-        text   = STRING_TOKEN (STR_NULL),
       flags  = INTERACTIVE,
       key    = KEY_SAVE_CHANGES;
 
@@ -166,14 +165,12 @@ formset
     text
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),
-        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),
       flags  = INTERACTIVE,
       key    = KEY_SAVE_CONFIG_CHANGES;
 
     text
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
       text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
-        text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),
       flags  = INTERACTIVE,
       key    = KEY_IGNORE_CONFIG_CHANGES;
 
diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
index 69f4be8c23..60972203b0 100644
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
+++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
@@ -24,9 +24,8 @@ formset
     title = STRING_TOKEN(STR_FORM_TITLE);
     
     text 
-    	help   = STRING_TOKEN(STR_NULL_STRING),  
+      help   = STRING_TOKEN(STR_NULL_STRING),  
       text   = STRING_TOKEN(STR_INPUT_PASSWORD),
-      text   = STRING_TOKEN(STR_NULL_STRING),
       flags  = INTERACTIVE,
       key    = KEY_GET_PASSWORD;
 
diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
index ebe8195c73..306679776d 100644
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
+++ b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
@@ -27,7 +27,6 @@ formset
       text
         help   = STRING_TOKEN(STR_NULL_STRING),
         text   = STRING_TOKEN(STR_NULL_STRING),
-          text   = STRING_TOKEN(STR_NULL_STRING),
         flags  = INTERACTIVE,
         key    = FORM_OPEN_QUESTION_ID;
     endif;
diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
index fa6d9e4a87..59fb348651 100644
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
@@ -35,7 +35,6 @@ formset
       text
         help   = STRING_TOKEN(STR_NULL_STRING),
         text   = STRING_TOKEN(STR_NULL_STRING),
-          text   = STRING_TOKEN(STR_NULL_STRING),
         flags  = INTERACTIVE,
         key    = QUESTIONID_USER_MANAGE;
     endif;
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
index 9685a9e0c2..aab321e402 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
@@ -495,14 +495,12 @@ formset
      text
        help   = STRING_TOKEN(STR_SAVE_AND_EXIT),
        text   = STRING_TOKEN(STR_SAVE_AND_EXIT),
-       text   = STRING_TOKEN(STR_NULL),
        flags  = INTERACTIVE,
        key    = KEY_VALUE_SAVE_AND_EXIT_PK;
 
      text
        help   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
        text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),
-       text   = STRING_TOKEN(STR_NULL),
        flags  = INTERACTIVE,
        key    = KEY_VALUE_NO_SAVE_AND_EXIT_PK;