Index: kernel/arch/mips32/Makefile.inc
===================================================================
--- kernel/arch/mips32/Makefile.inc	(revision c0a754549cac932770d9ee2654c851baaded067e)
+++ kernel/arch/mips32/Makefile.inc	(revision 232cd4f80cf97c780667bf57b298508cd538ea7b)
@@ -36,13 +36,4 @@
 #
 
-ifeq ($(MACHINE),lgxemul)
-	BFD_NAME = elf32-tradlittlemips
-	ENDIANESS = LE
-endif
-ifeq ($(MACHINE),bgxemul)
-	BFD_NAME = elf32-tradbigmips
-	ENDIANESS = BE
-	GCC_CFLAGS += -D__BE__
-endif
 ifeq ($(MACHINE),msim)
 	BFD_NAME = elf32-tradlittlemips
Index: kernel/arch/mips32/src/mips32.c
===================================================================
--- kernel/arch/mips32/src/mips32.c	(revision c0a754549cac932770d9ee2654c851baaded067e)
+++ kernel/arch/mips32/src/mips32.c	(revision 232cd4f80cf97c780667bf57b298508cd538ea7b)
@@ -125,20 +125,4 @@
 	interrupt_init();
 	
-#ifdef CONFIG_FB
-	/* GXemul framebuffer */
-	fb_properties_t gxemul_prop = {
-		.addr = 0x12000000,
-		.offset = 0,
-		.x = 640,
-		.y = 480,
-		.scan = 1920,
-		.visual = VISUAL_RGB_8_8_8,
-	};
-	
-	outdev_t *fbdev = fb_init(&gxemul_prop);
-	if (fbdev)
-		stdout_wire(fbdev);
-#endif
-
 #ifdef CONFIG_MIPS_PRN
 	outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
@@ -164,10 +148,4 @@
 	platform = "msim";
 #endif
-#ifdef MACHINE_bgxemul
-	platform = "gxemul";
-#endif
-#ifdef MACHINE_lgxemul
-	platform = "gxemul";
-#endif
 	sysinfo_set_item_data("platform", NULL, (void *) platform,
 	    str_size(platform));
@@ -175,6 +153,7 @@
 #ifdef CONFIG_MIPS_KBD
 	/*
-	 * Initialize the msim/GXemul keyboard port. Then initialize the serial line
-	 * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
+	 * Initialize the msim keyboard port. Then initialize the serial line
+	 * module and connect it to the msim keyboard. Enable keyboard
+	 * interrupts.
 	 */
 	dsrlnin_instance_t *dsrlnin_instance
Index: kernel/arch/mips32/src/mm/frame.c
===================================================================
--- kernel/arch/mips32/src/mm/frame.c	(revision c0a754549cac932770d9ee2654c851baaded067e)
+++ kernel/arch/mips32/src/mm/frame.c	(revision 232cd4f80cf97c780667bf57b298508cd538ea7b)
@@ -82,11 +82,4 @@
 	/* MSIM device (dkeyboard) */
 	if (frame == (KA2PA(MSIM_KBD_ADDRESS) >> ZERO_PAGE_WIDTH))
-		return false;
-#endif
-	
-#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
-	/* gxemul devices */
-	if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE,
-	    0x10000000, MiB2SIZE(256)))
 		return false;
 #endif
@@ -225,11 +218,4 @@
 					if (ZERO_PAGE_VALUE != 0xdeadbeef)
 						avail = false;
-#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)
-					else {
-						ZERO_PAGE_VALUE_KSEG1(frame) = 0xaabbccdd;
-						if (ZERO_PAGE_VALUE_KSEG1(frame) != 0xaabbccdd)
-							avail = false;
-					}
-#endif
 				}
 			}
Index: kernel/arch/mips64/src/mips64.c
===================================================================
--- kernel/arch/mips64/src/mips64.c	(revision c0a754549cac932770d9ee2654c851baaded067e)
+++ kernel/arch/mips64/src/mips64.c	(revision 232cd4f80cf97c780667bf57b298508cd538ea7b)
@@ -153,6 +153,7 @@
 #ifdef CONFIG_MIPS_KBD
 	/*
-	 * Initialize the msim/GXemul keyboard port. Then initialize the serial line
-	 * module and connect it to the msim/GXemul keyboard. Enable keyboard interrupts.
+	 * Initialize the msim keyboard port. Then initialize the serial line
+	 * module and connect it to the msim keyboard. Enable keyboard
+	 * interrupts.
 	 */
 	dsrlnin_instance_t *dsrlnin_instance