Not really needed as each module will get both ImageHandle and SystemTable

sdk/xtdk/bltypes.h

@@ -28,8 +28,6 @@ typedef VOID (*PBL_DEBUG_PRINT)(IN PUINT16 Format, IN ...);
 typedef EFI_STATUS (*PBL_EXIT_BOOT_SERVICES)(IN UINT_PTR MapKey);
 typedef EFI_STATUS (*PBL_FREE_PAGES)(IN UINT64 Size, IN EFI_PHYSICAL_ADDRESS Memory);
 typedef EFI_STATUS (*PBL_FREE_POOL)(IN PVOID Memory);
-typedef EFI_HANDLE (*PBL_GET_EFI_IMAGE_HANDLE)();
-typedef PEFI_SYSTEM_TABLE (*PBL_GET_EFI_SYSTEM_TABLE)();
 typedef EFI_STATUS (*PBL_OPEN_XT_PROTOCOL)(OUT PVOID *ProtocolHandler, IN PEFI_GUID ProtocolGuid);
 typedef VOID (*PBL_SLEEP_EXECUTION)(IN ULONG_PTR Milliseconds);
 
@@ -81,8 +79,6 @@ typedef struct _XTBL_LOADER_PROTOCOL
     struct
     {
         PBL_EXIT_BOOT_SERVICES ExitBootServices;
-        PBL_GET_EFI_IMAGE_HANDLE GetImageHandle;
-        PBL_GET_EFI_SYSTEM_TABLE GetSystemTable;
         PBL_SLEEP_EXECUTION SleepExecution;
     } Util;
 } XTBL_LOADER_PROTOCOL, *PXTBL_LOADER_PROTOCOL;

xtldr2/efiutils.c

@@ -44,34 +44,6 @@ BlExitBootServices(IN UINT_PTR MapKey)
     return Status;
 }
 
-/**
- * Returns the EFI image handle.
- *
- * @return This routine returns the current EFI image handle.
- *
- * @since XT 1.0
- */
-XTCDECL
-EFI_HANDLE
-BlGetEfiImageHandle()
-{
-    return BlpStatus.ImageHandle;
-}
-
-/**
- * Returns the EFI system table.
- *
- * @return This routine returns the current EFI system table.
- *
- * @since XT 1.0
- */
-XTCDECL
-PEFI_SYSTEM_TABLE
-BlGetEfiSystemTable()
-{
-    return BlpStatus.SystemTable;
-}
-
 /**
  * Puts the system to sleep for the specified number of milliseconds.
  *

xtldr2/includes/bootman.h

@@ -52,14 +52,6 @@ VOID
 BlDebugPrint(IN PUINT16 Format,
              IN ...);
 
-XTCDECL
-EFI_HANDLE
-BlGetEfiImageHandle();
-
-XTCDECL
-PEFI_SYSTEM_TABLE
-BlGetEfiSystemTable();
-
 XTCDECL
 EFI_STATUS
 BlMemoryFreePages(IN UINT64 Pages,

xtldr2/protocol.c

@@ -101,8 +101,6 @@ BlpRegisterXtLoaderProtocol()
     LdrProtocol.Memory.FreePool = BlMemoryFreePool;
     LdrProtocol.Protocol.Open = BlOpenXtProtocol;
     LdrProtocol.Util.ExitBootServices = BlExitBootServices;
-    LdrProtocol.Util.GetImageHandle = BlGetEfiImageHandle;
-    LdrProtocol.Util.GetSystemTable = BlGetEfiSystemTable;
     LdrProtocol.Util.SleepExecution = BlSleepExecution;
 
     /* Register XTLDR loader protocol */