diff --git a/xtoskrnl/includes/ke/affinity.hh b/xtoskrnl/includes/ke/affinity.hh
index 99e4529..f4c2594 100644
--- a/xtoskrnl/includes/ke/affinity.hh
+++ b/xtoskrnl/includes/ke/affinity.hh
@@ -33,6 +33,7 @@ namespace KE
                                                IN PKAFFINITY_MAP Source);
             STATIC XTAPI XTSTATUS CreateAffinityMap(IN ULONG CpuCount,
                                                     OUT PKAFFINITY_MAP* AffinityMap);
+            STATIC XTAPI VOID DestroyAffinityMap(IN PKAFFINITY_MAP AffinityMap);
             STATIC XTAPI ULONG FindNextLeftSetProcessor(IN ULONG ThreadSeed,
                                                         IN PKAFFINITY_MAP AffinityMap);
             STATIC XTAPI ULONG FindNextRightSetProcessor(IN ULONG ThreadSeed,
diff --git a/xtoskrnl/includes/ke/kprocess.hh b/xtoskrnl/includes/ke/kprocess.hh
index 2ef4373..4bff84f 100644
--- a/xtoskrnl/includes/ke/kprocess.hh
+++ b/xtoskrnl/includes/ke/kprocess.hh
@@ -23,7 +23,7 @@ namespace KE
         public:
             STATIC XTAPI PKPROCESS GetIdleProcess(VOID);
             STATIC XTAPI PEPROCESS GetInitialProcess(VOID);
-            STATIC XTAPI XTSTATUS InitializeIdleProcess(IN OUT PKPROCESS Process,
+            STATIC XTAPI XTSTATUS InitializeIdleProcess(IN OUT PKPROCESS IdleProcess,
                                                         IN PULONG_PTR DirectoryTable);
             STATIC XTAPI VOID InitializeProcess(IN OUT PKPROCESS Process,
                                                 IN KPRIORITY Priority,
diff --git a/xtoskrnl/ke/affinity.cc b/xtoskrnl/ke/affinity.cc
index 6939ebc..acc7e8f 100644
--- a/xtoskrnl/ke/affinity.cc
+++ b/xtoskrnl/ke/affinity.cc
@@ -238,6 +238,28 @@ KE::Affinity::CreateAffinityMap(IN ULONG CpuCount,
     return STATUS_SUCCESS;
 }
 
+/**
+ * Frees a previously allocated affinity map and returns its memory to the pool.
+ *
+ * @param AffinityMap
+ *        Supplies a pointer to the affinity map to be freed and destroyed.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTAPI
+VOID
+KE::Affinity::DestroyAffinityMap(IN PKAFFINITY_MAP AffinityMap)
+{
+    /* Ensure the map pointer is valid */
+    if(AffinityMap != NULLPTR)
+    {
+        /* Free the memory block back to the kernel pool */
+        MM::Allocator::FreePool((PVOID)AffinityMap);
+    }
+}
+
 /**
  * Locates the next available logical processor to the left (higher topological index) of a specified seed.
  *
diff --git a/xtoskrnl/ke/kprocess.cc b/xtoskrnl/ke/kprocess.cc
index 131aaac..c559052 100644
--- a/xtoskrnl/ke/kprocess.cc
+++ b/xtoskrnl/ke/kprocess.cc
@@ -53,17 +53,17 @@ KE::KProcess::GetInitialProcess(VOID)
  */
 XTAPI
 XTSTATUS
-KE::KProcess::InitializeIdleProcess(IN OUT PKPROCESS Process,
+KE::KProcess::InitializeIdleProcess(IN OUT PKPROCESS IdleProcess,
                                     IN PULONG_PTR DirectoryTable)
 {
-    ULONG Cpus, Index;
     XTSTATUS Status;
+    ULONG Cpus;
 
     /* Get the number of natively installed CPUs */
     Cpus = KE::Processor::GetInstalledCpus();
 
     /* Allocate and initialize the baseline affinity map for the process */
-    Status = KE::Affinity::CreateAffinityMap(Cpus, &Process->Affinity);
+    Status = KE::Affinity::CreateAffinityMap(Cpus, &IdleProcess->Affinity);
     if(Status != STATUS_SUCCESS)
     {
         /* Affinity map allocation failed, return status code */
@@ -71,26 +71,20 @@ KE::KProcess::InitializeIdleProcess(IN OUT PKPROCESS Process,
     }
 
     /* Allocate and initialize the dynamic map used to track actively running CPUs */
-    Status = KE::Affinity::CreateAffinityMap(Cpus, &Process->ActiveProcessors);
+    Status = KE::Affinity::CreateAffinityMap(Cpus, &IdleProcess->ActiveProcessors);
     if(Status != STATUS_SUCCESS)
     {
-        /* Affinity map allocation failed, return status code */
+        /* Affinity map allocation failed, free affinity map and return status code */
+        KE::Affinity::DestroyAffinityMap(IdleProcess->Affinity);
         return Status;
     }
 
     /* Set Idle Process affinity */
-    KE::Affinity::SetAllProcessorsAffinity(Process->Affinity);
+    KE::Affinity::SetAllProcessorsAffinity(IdleProcess->Affinity);
 
     /* Initialize Idle process */
-    KE::KProcess::InitializeProcess(Process, 0, NULLPTR, DirectoryTable, FALSE);
-    Process->Quantum = MAXCHAR;
-
-    /* Populate the global Idle Process affinity */
-    for(Index = 0; Index < Cpus; Index++)
-    {
-        /* Include every installed hardware thread in the base affinity map */
-        KE::Affinity::SetProcessorAffinity(Process->Affinity, Index);
-    }
+    KE::KProcess::InitializeProcess(IdleProcess, 0, NULLPTR, DirectoryTable, FALSE);
+    IdleProcess->Quantum = MAXCHAR;
 
     /* Return success */
     return STATUS_SUCCESS;
diff --git a/xtoskrnl/ke/kthread.cc b/xtoskrnl/ke/kthread.cc
index 51955ee..c1697e1 100644
--- a/xtoskrnl/ke/kthread.cc
+++ b/xtoskrnl/ke/kthread.cc
@@ -63,11 +63,12 @@ KE::KThread::InitializeIdleThread(IN PKPROCESS IdleProcess,
         return Status;
     }
 
-    /* Allocate and initialize the primary affinity map for the thread */
+    /* Allocate and initialize the user-mode affinity map for the thread */
     Status = KE::Affinity::CreateAffinityMap(Cpus, &IdleThread->UserAffinity);
     if(Status != STATUS_SUCCESS)
     {
-        /* Affinity map allocation failed, return status code */
+        /* Affinity map allocation failed, free affinity map and return status code */
+        KE::Affinity::DestroyAffinityMap(IdleThread->Affinity);
         return Status;
     }