diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
index a34ac85046..564a228b7c 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
@@ -867,9 +867,6 @@ BootMaintCallback (
   BMM_CALLBACK_DATA *Private;
   BM_MENU_ENTRY     *NewMenuEntry;
   BMM_FAKE_NV_DATA  *CurrentFakeNVMap;
-  UINTN             OldValue;
-  UINTN             NewValue;
-  UINTN             Number;
   UINTN             Index;
   EFI_DEVICE_PATH_PROTOCOL * File;
 
@@ -879,9 +876,6 @@ BootMaintCallback (
     //
     return EFI_UNSUPPORTED;
   }
-  OldValue       = 0;
-  NewValue       = 0;
-  Number         = 0;
 
   Private        = BMM_CALLBACK_DATA_FROM_THIS (This);
   //
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
index cd1756aa58..484f1acda1 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
@@ -581,7 +581,6 @@ UpdateOrderPage (
   UINT16            Index;
   UINT16            OptionIndex;
   VOID              *OptionsOpCodeHandle;
-  BM_LOAD_CONTEXT   *NewLoadContext;
   BOOLEAN           BootOptionFound;
   UINT32            *OptionOrder;
   EFI_QUESTION_ID   QuestionId;
@@ -619,7 +618,6 @@ UpdateOrderPage (
     BootOptionFound = FALSE;
     for (Index = 0; Index < OptionMenu->MenuNumber; Index++) {
       NewMenuEntry   = BOpt_GetMenuEntry (OptionMenu, Index);
-      NewLoadContext = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;
       if ((UINT32) (NewMenuEntry->OptionNumber + 1) == OptionOrder[OptionIndex]) {
         BootOptionFound = TRUE;
         break;