diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index 17b4d99c82..3dfacca746 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
@@ -34,7 +34,6 @@ Revision History:
 
 #pragma pack(1)
 typedef struct {
-  UINT16  WhatIsThePassword[20];
   UINT16  WhatIsThePassword2[20];
   UINT16  MyStringData[40];
   UINT16  PasswordClearText[20];
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 6e7b96bd8b..fe9a4495e2 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -458,16 +458,6 @@ formset
       help     = STRING_TOKEN(STR_MANUFACTURE_DEFAULT_HELP),
     endresetbutton;
 
-    //
-    // Non-interactive password, validate by Setup Browser
-    //
-    password  varid    = MyIfrNVData.WhatIsThePassword,
-              prompt   = STRING_TOKEN(STR_PASSWORD_PROMPT),
-              help     = STRING_TOKEN(STR_PASSWORD_HELP),
-              minsize  = 6,
-              maxsize  = 20,
-    endpassword;
-
     string    varid    = MyIfrNVData.PasswordClearText,
               prompt   = STRING_TOKEN(STR_MY_STRING_PROMPT),
               help     = STRING_TOKEN(STR_MY_STRING_HELP),