Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ boot/arch/amd64/Makefile.inc	(revision c4e5d4062607ba296514693b66071dec8303c580)
@@ -27,47 +27,6 @@
 #
 
-RD_SRVS_ESSENTIAL += \
-	audio/hound \
-	devman
-
-RD_DRVS_ESSENTIAL += \
-	intctl/apic \
-	intctl/i8259 \
-	platform/pc \
-	block/ata_bd \
-	bus/pci/pciintel \
-	bus/isa \
-	audio/sb16 \
-	char/i8042 \
-	hid/ps2mouse \
-	hid/xtkbd
-
-RD_DRVS_NON_ESSENTIAL += \
-	audio/hdaudio \
-	char/ns8250 \
-	char/pc-lpt \
-	time/cmos-rtc \
-	bus/usb/ehci\
-	bus/usb/ohci \
-	bus/usb/uhci \
-	bus/usb/usbdiag \
-	bus/usb/usbflbk \
-	bus/usb/usbhub \
-	bus/usb/usbmid \
-	bus/usb/vhc \
-	bus/usb/xhci \
-	block/usbmast \
-	hid/usbhid
-
 RD_DRV_CFG += \
 	bus/isa
-
-RD_APPS_ESSENTIAL += \
-	edit \
-	mixerctl \
-	wavplay
-
-RD_DATA_NON_ESSENTIAL += \
-	$(USPACE_PATH)/app/wavplay/demo.wav
 
 POST_OUTPUT = $(ROOT_PATH)/image.iso
Index: boot/arch/arm32/Makefile.inc
===================================================================
--- boot/arch/arm32/Makefile.inc	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ boot/arch/arm32/Makefile.inc	(revision c4e5d4062607ba296514693b66071dec8303c580)
@@ -58,35 +58,4 @@
 EXTRA_CFLAGS = -march=$(subst _,-,$(PROCESSOR_ARCH)) -mno-unaligned-access
 
-ifeq ($(MACHINE), gta02)
-	RD_SRVS_ESSENTIAL += \
-		hid/s3c24xx_ts \
-		hw/char/s3c24xx_uart
-endif
-
-ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
-	RD_DRVS_ESSENTIAL += \
-		platform/amdm37x \
-		fb/amdm37x_dispc
-endif
-
-ifeq ($(MACHINE), integratorcp)
-	RD_DRVS_ESSENTIAL += \
-		char/pl050 \
-		hid/atkbd \
-		hid/ps2mouse \
-		intctl/icp-ic \
-		platform/icp
-endif
-
-RD_DRVS_ESSENTIAL += \
-	bus/usb/ehci \
-	bus/usb/ohci \
-	bus/usb/usbdiag \
-	bus/usb/usbflbk \
-	bus/usb/usbhub \
-	bus/usb/usbmid \
-	block/usbmast \
-	hid/usbhid
-
 SOURCES = \
 	arch/$(BARCH)/src/asm.S \
Index: boot/arch/arm64/Makefile.inc
===================================================================
--- boot/arch/arm64/Makefile.inc	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ boot/arch/arm64/Makefile.inc	(revision c4e5d4062607ba296514693b66071dec8303c580)
@@ -53,11 +53,4 @@
 EXTRA_LDFLAGS = -Wl,-shared
 
-ifeq ($(MACHINE), virt)
-	RD_DRVS_ESSENTIAL += \
-		char/pl011 \
-		intctl/gicv2 \
-		platform/arm64virt
-endif
-
 SOURCES = \
 	arch/$(BARCH)/src/asm.S \
Index: boot/arch/ia64/Makefile.inc
===================================================================
--- boot/arch/ia64/Makefile.inc	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ boot/arch/ia64/Makefile.inc	(revision c4e5d4062607ba296514693b66071dec8303c580)
@@ -34,8 +34,4 @@
 EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
 
-RD_SRVS_NON_ESSENTIAL +=
-
-RD_SRVS_ESSENTIAL +=
-
 SOURCES = \
 	arch/$(BARCH)/src/boot.S \
@@ -67,34 +63,2 @@
 	arch/$(BARCH)/src/ski.c
 endif
-
-ifeq ($(MACHINE),i460GX)
-RD_DRVS_ESSENTIAL += \
-	platform/pc \
-	bus/pci/pciintel \
-	bus/isa \
-	char/i8042 \
-	hid/xtkbd
-
-RD_DRVS_NON_ESSENTIAL += \
-	char/ns8250 \
-	time/cmos-rtc \
-	bus/usb/ehci\
-	bus/usb/ohci \
-	bus/usb/uhci \
-	bus/usb/usbdiag \
-	bus/usb/usbflbk \
-	bus/usb/usbhub \
-	bus/usb/usbmid \
-	bus/usb/vhc \
-	block/usbmast \
-	hid/usbhid
-
-RD_DRV_CFG += \
-	bus/isa
-endif
-
-ifeq ($(MACHINE),ski)
-RD_DRVS_ESSENTIAL += \
-	char/ski-con \
-	platform/ski
-endif
Index: boot/arch/mips32/Makefile.inc
===================================================================
--- boot/arch/mips32/Makefile.inc	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ boot/arch/mips32/Makefile.inc	(revision c4e5d4062607ba296514693b66071dec8303c580)
@@ -50,27 +50,4 @@
 endif
 
-ifeq ($(MACHINE), $(filter $(MACHINE),bmalta lmalta))
-	RD_DRVS_ESSENTIAL += \
-		platform/malta \
-		intctl/i8259 \
-		block/ata_bd \
-		bus/pci/pciintel \
-		bus/isa \
-		char/i8042 \
-		char/ns8250 \
-		hid/ps2mouse \
-		hid/xtkbd
-
-	RD_DRV_CFG += \
-		bus/isa
-endif
-
-ifeq ($(MACHINE),msim)
-	RD_DRVS_ESSENTIAL += \
-		platform/msim \
-		block/ddisk \
-		char/msim-con
-endif
-
 SOURCES = \
 	arch/$(BARCH)/src/asm.S \
Index: boot/arch/ppc32/Makefile.inc
===================================================================
--- boot/arch/ppc32/Makefile.inc	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ boot/arch/ppc32/Makefile.inc	(revision c4e5d4062607ba296514693b66071dec8303c580)
@@ -38,19 +38,4 @@
 EXTRA_CFLAGS = -mcpu=powerpc -msoft-float -m32
 
-RD_DRVS_ESSENTIAL += \
-	platform/mac \
-	bus/adb/cuda_adb \
-	bus/pci/pciintel \
-	bus/usb/ohci \
-	bus/usb/usbdiag \
-	bus/usb/usbflbk \
-	bus/usb/usbhub \
-	bus/usb/usbmid \
-	bus/usb/vhc \
-	block/usbmast \
-	hid/adb-kbd \
-	hid/adb-mouse \
-	hid/usbhid
-
 SOURCES = \
 	arch/$(BARCH)/src/asm.S \
Index: boot/arch/sparc64/Makefile.inc
===================================================================
--- boot/arch/sparc64/Makefile.inc	(revision 98c4c168f21bd704c0707125768f528e37cc8187)
+++ boot/arch/sparc64/Makefile.inc	(revision c4e5d4062607ba296514693b66071dec8303c580)
@@ -49,7 +49,4 @@
 	intctl/obio \
 	char/ns8250
-
-RD_DRV_CFG += \
-	bus/isa
 endif