diff --git a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
index 282eb150c7..61fc191618 100644
--- a/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
+++ b/BaseTools/Source/C/Include/Common/UefiInternalFormRepresentation.h
@@ -681,7 +681,6 @@ typedef union {
 #define EFI_IFR_CATENATE_OP            0x5E
 #define EFI_IFR_GUID_OP                0x5F
 #define EFI_IFR_SECURITY_OP            0x60
-#define EFI_IFR_MODAL_TAG_OP           0x61
 
 
 typedef struct _EFI_IFR_OP_HEADER {
@@ -772,10 +771,6 @@ typedef struct _EFI_IFR_IMAGE {
   EFI_IMAGE_ID             Id;
 } EFI_IFR_IMAGE;
 
-typedef struct _EFI_IFR_MODAL {
-  EFI_IFR_OP_HEADER        Header;
-} EFI_IFR_MODAL;
-
 typedef struct _EFI_IFR_LOCKED {
   EFI_IFR_OP_HEADER        Header;
 } EFI_IFR_LOCKED;
diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
index 3c82b53c79..571af91b0a 100644
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
@@ -1305,7 +1305,6 @@ static struct {
   { sizeof (EFI_IFR_CATENATE), 0 },            // EFI_IFR_CATENATE_OP
   { sizeof (EFI_IFR_GUID), 0 },                // EFI_IFR_GUID_OP
   { sizeof (EFI_IFR_SECURITY), 0 },            // EFI_IFR_SECURITY_OP - 0x60
-  { sizeof (EFI_IFR_MODAL), 0},                // EFI_IFR_MODAL_OP - 0x61
 };
 
 #ifdef CIFROBJ_DEUBG
@@ -1328,7 +1327,7 @@ static struct {
   "EFI_IFR_STRING_REF1","EFI_IFR_STRING_REF2",          "EFI_IFR_CONDITIONAL",   "EFI_IFR_QUESTION_REF3",   "EFI_IFR_ZERO",          "EFI_IFR_ONE",
   "EFI_IFR_ONES",       "EFI_IFR_UNDEFINED",            "EFI_IFR_LENGTH",        "EFI_IFR_DUP",             "EFI_IFR_THIS",          "EFI_IFR_SPAN",
   "EFI_IFR_VALUE",      "EFI_IFR_DEFAULT",              "EFI_IFR_DEFAULTSTORE",  "EFI_IFR_FORM_MAP",        "EFI_IFR_CATENATE",      "EFI_IFR_GUID",
-  "EFI_IFR_SECURITY",   "EFI_IFR_MODAL",
+  "EFI_IFR_SECURITY",
 };
 
 VOID
diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
index 543852108f..4cdd1cc5db 100644
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
@@ -809,16 +809,6 @@ public:
   }
 };
 
-class CIfrModal : public CIfrObj, public CIfrOpHeader {
-private:
-  EFI_IFR_MODAL *mModal;
-
-public:
-  CIfrModal () : CIfrObj (EFI_IFR_MODAL_TAG_OP, (CHAR8 **)&mModal),
-                 CIfrOpHeader (EFI_IFR_MODAL_TAG_OP, &mModal->Header) {
-  }
-};
-
 class CIfrLocked : public CIfrObj, public CIfrOpHeader {
 private:
   EFI_IFR_LOCKED *mLocked;
diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
index df09e9b655..02a7b5c1f4 100644
--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
@@ -237,7 +237,6 @@ VfrParserStart (
 #token EndGuidOp("endguidop")                   "endguidop"
 #token DataType("datatype")                     "datatype"
 #token Data("data")                             "data"
-#token Modal("modal")                           "modal"
 
 //
 // Define the class and subclass tokens
@@ -1252,8 +1251,7 @@ vfrFormDefinition :
     vfrStatementBanner                       |
     // Just for framework vfr compatibility
     vfrStatementInvalid                      |
-    vfrStatementExtension                    |
-    vfrStatementModal
+    vfrStatementExtension
   )*
   E:EndForm                                         <<
                                                       if (mCompatibleMode) {
@@ -1312,8 +1310,7 @@ vfrFormMapDefinition :
     vfrStatementConditional                  |
     vfrStatementLabel                        |
     vfrStatementBanner                       |
-    vfrStatementExtension                    |
-    vfrStatementModal
+    vfrStatementExtension
   )*
   E:EndForm                                         << CRT_END_OP (E); >>
   ";"
@@ -2493,11 +2490,6 @@ vfrLockedTag :
   L:Locked                                             << LObj.SetLineNo(L->getLine()); >>
   ;
 
-vfrModalTag :
-  << CIfrModal MObj; >>
-  L:Modal                                             << MObj.SetLineNo(L->getLine()); >>
-  ;
-
 vfrStatementStatTag :
   vfrImageTag  |
   vfrLockedTag
@@ -2512,11 +2504,6 @@ vfrStatementImage :
   ";"
   ;
 
-vfrStatementModal :
-  vfrModalTag
-  ";"
-  ;
-
 vfrStatementLocked :
   vfrLockedTag
   ";"