Nucleus

diff --git a/memory/paging.c b/memory/paging.c
index bf90d0e..10d20d5 100644
--- a/memory/paging.c
+++ b/memory/paging.c
@@ -130,10 +130,6 @@ init_paging(void)
 	register_exception(14, early_page_fault_handler);
 	cpu_load_paging();
 
-	/* Identity page the APIC registers */
-	set_page(lapicPtr, lapicPtr | PTE_PRESENT | PTE_WRITE | PTE_GLOBAL);
-	set_page(ioapicPtr, ioapicPtr | PTE_PRESENT | PTE_WRITE | PTE_GLOBAL);
-
 	/* Allocate a kernel stack */
 	uintptr_t stk;
 	for (stk = 0xF0400000; stk < 0xF0800000; stk += PAGE_SIZE)
@@ -144,8 +140,6 @@ init_paging(void)
 void
 cpu_load_paging(void)
 {
-	static cpu_t c = 0;
-	while (c != CPUID);
 	switch_dir(kernelDir);
 	asm volatile (
 		"movl %%cr0, %%eax;"
@@ -153,5 +147,4 @@ cpu_load_paging(void)
 		"movl %%eax, %%cr0"
 		::: "%eax"
 	);
-	c++;
 }