diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index c5de1900..b25de711 100644
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -20,8 +20,7 @@ hd / hd1 / hd2 / hd3                  Boot from (local) primary / secondary /...
 debug                                 Get shells during process of booting for debugging
 forensic                              Do not touch any harddisks during hardware recognition
 serial                                Activate ttyS0 and start a getty
-grub                                  Boot Grub bootloader (special all-in-one-image)
-dos                                   Boot FreeDOS
+grub                                  Boot Grub bootloader
 hdt                                   Boot Hardware Detection Tool (from syslinux project)
 
 Further documentation regarding the boot process can be found at:
diff --git a/templates/boot/grub/addons.cfg b/templates/boot/grub/addons.cfg
index 9151e93d..4c7a19f3 100644
--- a/templates/boot/grub/addons.cfg
+++ b/templates/boot/grub/addons.cfg
@@ -71,22 +71,4 @@ menuentry "Netboot.xyz" {
     fi
 }
 
-if [ "${grub_platform}" != "efi" ] ; then
-    menuentry "Netboot.xyz" {
-        insmod linux16
-        linux16 /boot/addons/netboot.xyz.lkrn
-    }
-
-    menuentry "GRUB - all in one image" {
-        insmod linux16
-        linux16  /boot/addons/memdisk
-        initrd16 /boot/addons/allinone.img
-    }
-
-    menuentry "FreeDOS" {
-        insmod linux16
-        linux16  /boot/addons/memdisk
-        initrd16 /boot/addons/balder10.imz
-    }
-fi # efi mode
 }
diff --git a/templates/boot/isolinux/addon_20_allinone.cfg b/templates/boot/isolinux/addon_20_allinone.cfg
deleted file mode 100644
index 842fa5d8..00000000
--- a/templates/boot/isolinux/addon_20_allinone.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-label allinone
-  menu label Run ^All-in-One-Image
-  kernel /boot/addons/memdisk
-  append initrd=/boot/addons/allinone.img
-
-  text help
-                                        Start All-in-One-Image, being a special
-                                        version of Grub with an easy to use
-                                        interface for booting from local disks,
-                                        booting via PXE (with gPXE support),...
-  endtext
-
diff --git a/templates/boot/isolinux/addon_25_gxpe.cfg b/templates/boot/isolinux/addon_25_ixpe.cfg
similarity index 100%
rename from templates/boot/isolinux/addon_25_gxpe.cfg
rename to templates/boot/isolinux/addon_25_ixpe.cfg
diff --git a/templates/boot/isolinux/addon_30_dos.cfg b/templates/boot/isolinux/addon_30_dos.cfg
deleted file mode 100644
index 290caf5c..00000000
--- a/templates/boot/isolinux/addon_30_dos.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-label dos
-  menu label Run ^FreeDOS
-  kernel /boot/addons/memdisk
-  append initrd=/boot/addons/balder10.imz
-
-  text help
-                                        Boot FreeDOS.
-  endtext
-
diff --git a/templates/boot/isolinux/f3 b/templates/boot/isolinux/f3
index dc51208c..c9425069 100644
--- a/templates/boot/isolinux/f3
+++ b/templates/boot/isolinux/f3
@@ -12,10 +12,10 @@
  forensic              do not touch any harddisks during hardware recognition  
  serial                                               activate serial console  
  grub                                    boot GRand Unified Bootloader (GRUB)  
- dos                                                         boot FreeDOS 1.0  
  hdt                                             boot Hardware Detection Tool  
                                                                                
                                                                                
+                                                                               
  A list with all supported boot options can be found on the CD at              
  /run/live/medium/grml/*/grml-cheatcodes.txt                                   
                                                                                
diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg
index fb64279c..91f7fa82 100644
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@@ -56,10 +56,7 @@
 #
 #   b = Back to main menu...
 #   2 = Grub2
-#   1 = Grub1
-#   a = All-in-One-Image
-#   x = GPXE
-#   f = FreeDOS
+#   x = iPXE
 #   m = Memtest86+
 #   t = Hardware Detection Tool
 #