diff --git a/tools/boot/jessie/boot-x86 b/tools/boot/jessie/boot-x86
index 16e2ebf1..7fb999a1 100644
--- a/tools/boot/jessie/boot-x86
+++ b/tools/boot/jessie/boot-x86
@@ -82,11 +82,6 @@ else
 fi
 
 BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
-# Only include disk images on full CDs, not on smaller images.
-#if [ "$ARCH" = i386 ] && [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ] && [ "$INSTALLER_CD" != C ]; then
-	#DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
-	#EXTRA_DISK_IMAGES="cdrom/boot.img"
-#fi
 
 # Download boot images.
 for image in $BOOT_IMAGES; do
@@ -417,7 +412,7 @@ EOF
 EOF
 fi
 
-rm -rf cdrom floppy
+rm -rf cdrom
 
 # Common mkisofs options when creating CDs
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"