diff --git a/xtoskrnl/includes/globals.h b/xtoskrnl/includes/globals.h
index 64de0f1..882dd1e 100644
--- a/xtoskrnl/includes/globals.h
+++ b/xtoskrnl/includes/globals.h
@@ -75,9 +75,6 @@ EXTERN ULONG MmNumberOfPhysicalPages;
 /* Old biggest free memory descriptor */
 EXTERN LOADER_MEMORY_DESCRIPTOR MmOldFreeDescriptor;
 
-/* Page Map Level */
-EXTERN ULONG MmPageMapLevel;
-
 /* Processor structures data (THIS IS A TEMPORARY HACK) */
 EXTERN UCHAR MmProcessorStructuresData[MAXIMUM_PROCESSORS][KPROCESSOR_STRUCTURES_SIZE];
 
@@ -87,8 +84,8 @@ EXTERN LOADER_MEMORY_DESCRIPTOR MmpHardwareAllocationDescriptors[MM_HARDWARE_ALL
 /* Live address of kernel's hardware heap */
 EXTERN PVOID MmpHardwareHeapStart;
 
-/* Architecture-specific memory extension */
-EXTERN BOOLEAN MmpMemoryExtension;
+/* Information about the current page map */
+EXTERN MMPAGEMAP_INFO MmpPageMapInfo;
 
 /* Number of used hardware allocation descriptors */
 EXTERN ULONG MmpUsedHardwareAllocationDescriptors;
diff --git a/xtoskrnl/mm/globals.c b/xtoskrnl/mm/globals.c
index 723c6c9..8fc74b6 100644
--- a/xtoskrnl/mm/globals.c
+++ b/xtoskrnl/mm/globals.c
@@ -24,9 +24,6 @@ ULONG MmNumberOfPhysicalPages;
 /* Old biggest free memory descriptor */
 LOADER_MEMORY_DESCRIPTOR MmOldFreeDescriptor;
 
-/* Page Map Level */
-ULONG MmPageMapLevel;
-
 /* Processor structures data (THIS IS A TEMPORARY HACK) */
 UCHAR MmProcessorStructuresData[MAXIMUM_PROCESSORS][KPROCESSOR_STRUCTURES_SIZE] = {0};
 
@@ -36,8 +33,8 @@ LOADER_MEMORY_DESCRIPTOR MmpHardwareAllocationDescriptors[MM_HARDWARE_ALLOCATION
 /* Live address of kernel's hardware heap */
 PVOID MmpHardwareHeapStart = MM_HARDWARE_HEAP_START_ADDRESS;
 
-/* Architecture-specific memory extension */
-BOOLEAN MmpMemoryExtension;
+/* Information about the current page map */
+MMPAGEMAP_INFO MmpPageMapInfo;
 
 /* Number of used hardware allocation descriptors */
 ULONG MmpUsedHardwareAllocationDescriptors = 0;
diff --git a/xtoskrnl/mm/init.c b/xtoskrnl/mm/init.c
index a7d5afd..a0917b9 100644
--- a/xtoskrnl/mm/init.c
+++ b/xtoskrnl/mm/init.c
@@ -31,9 +31,6 @@ MmInitializeMemoryManager(VOID)
         KePanic(0);
     }
 
-    /* Store Page Map Level */
-    MmPageMapLevel = KeInitializationBlock->LoaderInformation.PageMapLevel;
-
     /* Proceed with architecture specific initialization */
     MmpInitializeArchitecture();
 }