2 files changed, 2 insertions, 20 deletions
diff --git a/MdePkg/Include/Guid/GlobalVariable.h b/MdePkg/Include/Guid/GlobalVariable.h
index e58f7a1e8c..1e4fbc8227 100644
--- a/MdePkg/Include/Guid/GlobalVariable.h
+++ b/MdePkg/Include/Guid/GlobalVariable.h
@@ -126,20 +126,6 @@ extern EFI_GUID gEfiGlobalVariableGuid;
 ///
 #define EFI_SETUP_MODE_NAME                         L"SetupMode"
 ///
-/// Whether the system is operating in audit mode (1) or not (0).
-/// All other values are reserved. Should be treated as read-only except when DeployedMode is 0.
-/// Always becomes read-only after ExitBootServices() is called.
-/// Its attribute is BS+RT.
-///
-#define EFI_AUDIT_MODE_NAME                         L"AuditMode"
-///
-/// Whether the system is operating in deployed mode (1) or not (0).
-/// All other values are reserved. Should be treated as read-only when its value is 1.
-/// Always becomes read-only after ExitBootServices() is called.
-/// Its attribute is BS+RT.
-///
-#define EFI_DEPLOYED_MODE_NAME                      L"DeployedMode"
-///
 /// The Key Exchange Key Signature Database.
 /// Its attribute is NV+BS+RT+AT.
 ///
diff --git a/MdePkg/Include/Guid/ImageAuthentication.h b/MdePkg/Include/Guid/ImageAuthentication.h
index 2f51935c0c..b59fae54f5 100644
--- a/MdePkg/Include/Guid/ImageAuthentication.h
+++ b/MdePkg/Include/Guid/ImageAuthentication.h
@@ -43,12 +43,8 @@
 
 #define SECURE_BOOT_MODE_ENABLE           1
 #define SECURE_BOOT_MODE_DISABLE          0
-#define SETUP_MODE_ENABLE                 1
-#define SETUP_MODE_DISABLE                0
-#define DEPLOYED_MODE_ENABLE              1
-#define DEPLOYED_MODE_DISABLE             0
-#define AUDIT_MODE_ENABLE                 1
-#define AUDIT_MODE_DISABLE                0
+#define SETUP_MODE                        1
+#define USER_MODE                         0
 
 //***********************************************************************
 // Signature Database