5 files changed, 0 insertions, 10 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
index 48cc33c3f6..0d35c2c37e 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
@@ -20,8 +20,6 @@ formset
   title = STRING_TOKEN(STR_FORM_MAIN_TITLE),
   help = STRING_TOKEN(STR_NULL_STRING),
   classguid = BOOT_MAINT_FORMSET_GUID,
-  class = 0,
-  subclass = 0,
 
   varstore BMM_FAKE_NV_DATA,
     varid = VARSTORE_ID_BOOT_MAINT,
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
index 1531617dc5..056694ebef 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
@@ -20,8 +20,6 @@ formset
   title = STRING_TOKEN(STR_FILE_EXPLORER_TITLE),
   help = STRING_TOKEN(STR_NULL_STRING),
   classguid = FILE_EXPLORE_FORMSET_GUID,
-  class = 0,
-  subclass = 0,
 
   varstore FILE_EXPLORER_NV_DATA,
     varid = VARSTORE_ID_BOOT_MAINT,
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
index 293e4e7832..0d8142c17d 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
@@ -28,8 +28,6 @@ formset
   title     = STRING_TOKEN(STR_BM_BANNER),
   help      = STRING_TOKEN(STR_LAST_STRING),
   classguid = BOOT_MANAGER_FORMSET_GUID,
-  class     = BOOT_MANAGER_CLASS,
-  subclass  = BOOT_MANAGER_SUBCLASS,
 
   form formid = BOOT_MANAGER_FORM_ID,
        title  = STRING_TOKEN(STR_BM_BANNER);
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
index 4d7d43b7d1..0ad671bdca 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
@@ -30,8 +30,6 @@ formset
   title     = STRING_TOKEN(STR_DEVICE_MANAGER_TITLE),
   help      = STRING_TOKEN(STR_EMPTY_STRING),
   classguid = DEVICE_MANAGER_FORMSET_GUID,
-  class     = DEVICE_MANAGER_CLASS,
-  subclass  = FRONT_PAGE_SUBCLASS,
 
   form formid = DEVICE_MANAGER_FORM_ID,
        title  = STRING_TOKEN(STR_DEVICE_MANAGER_TITLE);
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
index d5fe4f4c48..43e21ec516 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
@@ -41,8 +41,6 @@ formset
   title    = STRING_TOKEN(STR_FRONT_PAGE_TITLE),
   help     = STRING_TOKEN(STR_NULL_STRING),
   classguid = FRONT_PAGE_FORMSET_GUID,
-  class    = FRONT_PAGE_CLASS,
-  subclass = FRONT_PAGE_SUBCLASS,
 
   form formid = FRONT_PAGE_FORM_ID,
        title  = STRING_TOKEN(STR_FRONT_PAGE_TITLE);