diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 912fc25e9b..2e8a52434f 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -4,7 +4,6 @@ AddDirectoryToHaikuImage home Desktop ;
 AddDirectoryToHaikuImage var log ;
 AddDirectoryToHaikuImage var tmp ;
 
-# TODO: Remove the variables we don't need.
 BEOS_BIN = addattr arp basename beep cat catattr chgrp chmod chown clockconfig cmp
 	comm cp csplit cut date dd df diff dirname dstcheck du eject env error factor
 	false find finddir fortune gawk gdb grep groups head id ifconfig iroster isvolume
@@ -52,25 +51,17 @@ BEOS_ADD_ONS_MEDIA_PLUGINS = aiff_reader mp3_decoder musepack
 	speex vorbis
 	# ac3_decoder avcodec theora matroska
 ;
-BEOS_ADD_ONS_INPUT = <input>keyboard <input>mouse canna screen_saver ;
 BEOS_ADD_ONS_SCREENSAVERS = Haiku ;
 BEOS_ADD_ONS_DRIVERS_AUDIO = ich_ac97 auvia emuxki ;
 BEOS_ADD_ONS_DRIVERS_GRAPHICS = radeon.driver nv.driver nm.driver mga.driver
 	vesa
 ;
-BEOS_ADD_ONS_DRIVERS_MISC = keyboard scsi_dsk scsi_cd dprintf null zero random
-	ps2_hid <driver>tty console <driver>config
-;
 BEOS_ADD_ONS_DRIVERS_NET = ipro1000 rtl8139 rtl8169 sis900
 	via-rhine wb840 net_stack_driver
 	# bcm440x bcm570x (only available with GPLd add-ons)
 ;
 BEOS_ADD_ONS_BUS_MANAGERS = pci isa ide scsi config_manager ;
-BEOS_ADD_ONS_KERNEL_MISC = ide_isa generic_ide_pci block_io fast_log
-	ide_adapter locked_pool scsi_periph intel keyboard vga_text
-;
 BEOS_ADD_ONS_FILESYSTEMS = bfs ;
-BEOS_DATA_FILES = timezone_files keymap_files ;
 
 
 # modules
@@ -145,14 +136,6 @@ AddFilesToHaikuImage beos etc KanBe dic canna : $(kanbeDicCanna) ;
 AddDirectoryToHaikuImage beos etc KanBe dic group ;
 AddDirectoryToHaikuImage beos etc KanBe dic user ;
 
-# TODO: We must get rid of this earlier or later.
-# 
-# if [ -e /boot/beos/etc/fonts/ttfonts/Swiss721.ttf ]; then
-# 	$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Courier10Pitch.ttf $targetDir/beos/etc/fonts/ttfonts/
-# 	$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Swiss721_Bold.ttf $targetDir/beos/etc/fonts/ttfonts/
-# 	$cp ${sPrefix}/boot/beos/etc/fonts/ttfonts/Swiss721.ttf $targetDir/beos/etc/fonts/ttfonts/
-# fi
-
 local libnetFiles = networks protocols resolv.conf services ;
 libnetFiles = $(libnetFiles:G=libnet-files) ;
 SEARCH on $(libnetFiles)
@@ -174,11 +157,6 @@ SEARCH on $(driverSettingsFiles)
 	= [ FDirName $(HAIKU_TOP) data settings kernel drivers ] ;
 AddFilesToHaikuImage home config settings kernel drivers
 	: $(driverSettingsFiles) ;
-# TODO: This looks like it belongs to someones UserBuildConfig.
-# if [ -e data/settings/kernel/drivers/vesa ]; then
-# 	$cp ${sPrefix}data/settings/kernel/drivers/vesa \
-# 		$targetDir/home/config/settings/kernel/drivers/
-# fi
 
 AddSymlinkToHaikuImage home config settings
 	: /boot/beos/etc/timezones/Europe/Paris : timezone ;