Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 1f7cb3a9d87b214dbf470650b8d49d9df325db0d)
+++ HelenOS.config	(revision 74bcf5ec1b12e253f7cbddcc3937d8bb13274c4c)
@@ -286,7 +286,4 @@
 % Improved support for hyperthreading
 ! [((PLATFORM=ia32&MACHINE!=athlon-xp&MACHINE!=athlon-mp&MACHINE!=pentium3)|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_HT (y/n)
-
-% Simics BIOS AP boot fix
-! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_SIMICS_FIX (y/n)
 
 % Lazy FPU context switching
Index: kernel/arch/ia32/src/mm/frame.c
===================================================================
--- kernel/arch/ia32/src/mm/frame.c	(revision 1f7cb3a9d87b214dbf470650b8d49d9df325db0d)
+++ kernel/arch/ia32/src/mm/frame.c	(revision 74bcf5ec1b12e253f7cbddcc3937d8bb13274c4c)
@@ -119,7 +119,4 @@
 			hardcoded_unmapped_kdata_size));
 #endif
-#ifdef CONFIG_SIMICS_FIX
-		minconf = max(minconf, ADDR2PFN(0x10000));
-#endif
 		init_e820_memory(minconf);
 
@@ -132,9 +129,4 @@
 			(hardcoded_unmapped_ktext_size +
 			hardcoded_unmapped_kdata_size) >> FRAME_WIDTH);
-		
-#ifdef CONFIG_SIMICS_FIX
-		/* Don't know why, but these addresses help */
-		frame_mark_unavailable(0xd000 >> FRAME_WIDTH, 3);
-#endif
 #endif
 	}