4 files changed, 0 insertions, 8 deletions
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
index b5b93d4c86..daa2577383 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
@@ -19,8 +19,6 @@ formset
   guid     = DRIVER_SAMPLE_INVENTORY_GUID,
   title    = STRING_TOKEN(STR_INV_FORM_SET_TITLE),
   help     = STRING_TOKEN(STR_INV_FORM_SET_HELP),
-  class    = 0x04,
-  subclass = 0x03,
 
   form formid = 1,
        title  = STRING_TOKEN(STR_INV_FORM1_TITLE);  // note formid is a variable (for readability) (UINT16) - also added Form to the line to signify the Op-Code
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
index 018fe05988..2456c51c8c 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
@@ -20,8 +20,6 @@ formset
   guid     = IP4_ISCSI_CONFIG_GUID,
   title    = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),
   help     = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),
-  class    = EFI_NETWORK_DEVICE_CLASS,
-  subclass = 0x03,
 
   varstore ISCSI_CONFIG_IFR_NVDATA,
     name = ISCSI_CONFIG_IFR_NVDATA,
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
index 661f6262c9..bd3e36ad06 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
@@ -19,8 +19,6 @@ formset
   guid     = EFI_NIC_IP4_CONFIG_NVDATA_GUID,
   title    = STRING_TOKEN(STR_IP4_CONFIG_FORM_TITLE),
   help     = STRING_TOKEN(STR_IP4_CONFIG_FORM_HELP),
-  class    = EFI_NETWORK_DEVICE_CLASS,
-  subclass = 0x03,
 
   varstore IP4_CONFIG_IFR_NVDATA,
     name = EfiNicIp4ConfigVariable,
diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr b/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
index eb0e3dec55..52240a1f77 100644
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
@@ -28,8 +28,6 @@ formset
   guid     = PLAT_OVER_MNGR_GUID,
   title    = STRING_TOKEN(STR_ENTRY_TITLE),
   help     = STRING_TOKEN(STR_TITLE_HELP),
-  class    = EFI_DISK_DEVICE_CLASS,
-  subclass = 0xff,
 
   varstore PLAT_OVER_MNGR_DATA,
     varid = VARSTORE_ID_PLAT_OVER_MNGR,