diff --git a/install/1system/grub/grub.conf b/install/1system/grub/grub.conf
index 85f2b1a..6c0d856 100644
--- a/install/1system/grub/grub.conf
+++ b/install/1system/grub/grub.conf
@@ -34,36 +34,6 @@ kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesaf
 #os_install_linux_shortname#
 initrd /boot/initrd-#-cl_install_kernel_uid-#
 
-#?os_install_linux_system==desktop&&os_install_linux_subname!=#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# #-os_install_linux_subname-# Safemode
-#os_install_linux_system#
-#?os_install_linux_system==desktop&&os_install_linux_subname==#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# Safemode
-#os_install_linux_system#
-#?os_install_linux_system==server#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# Safemode
-#os_install_linux_system#
-root (hd#-disk(/boot,grub)-#)
-#?os_install_linux_system==desktop&&pkg(sys-apps/calculate-install)>=2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-#
-#os_install_linux_system#
-#?os_install_linux_system==desktop&&pkg(sys-apps/calculate-install)<2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_system==server&&os_install_linux_shortname!=CSS&&pkg(sys-apps/calculate-install)>=2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-#
-#os_install_linux_system#
-#?os_install_linux_system==server&&os_install_linux_shortname!=CSS&&pkg(sys-apps/calculate-install)<2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_shortname==CSS&&pkg(sys-apps/calculate-install)>=2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-#
-#os_install_linux_shortname#
-#?os_install_linux_shortname==CSS&&pkg(sys-apps/calculate-install)<2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_shortname#
-initrd /boot/initrd-#-cl_install_kernel_uid-#-install
-
 #-os_grub_conf-#
 
 # Uncomment if you have Windows on hard disk
diff --git a/install/1system/grub/grub.conf.oldkernel b/install/1system/grub/grub.conf.oldkernel
index 7e5f933..c347deb 100644
--- a/install/1system/grub/grub.conf.oldkernel
+++ b/install/1system/grub/grub.conf.oldkernel
@@ -25,27 +25,6 @@ kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesaf
 #os_install_linux_shortname#
 initrd /boot/initrd-#-cl_install_kernel_uid-#
 
-#?os_install_linux_system==desktop&&os_install_linux_subname!=#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# #-os_install_linux_subname-# Safemode
-#os_install_linux_system#
-#?os_install_linux_system==desktop&&os_install_linux_subname==#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# Safemode
-#os_install_linux_system#
-#?os_install_linux_system==server#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# Safemode
-#os_install_linux_system#
-root (hd#-disk(/boot,grub)-#)
-#?os_install_linux_system==desktop#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_system==server&&os_install_linux_shortname!=CSS#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_shortname==CSS#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_shortname#
-initrd /boot/initrd-#-cl_install_kernel_uid-#-install
-
 #-os_grub_conf-#
 
 # Uncomment if you have Windows on hard disk
diff --git a/install/1system/grub/grub.conf.scratch b/install/1system/grub/grub.conf.scratch
index db2b6aa..30591f9 100644
--- a/install/1system/grub/grub.conf.scratch
+++ b/install/1system/grub/grub.conf.scratch
@@ -34,36 +34,6 @@ kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesaf
 #os_install_linux_shortname#
 initrd /boot/initrd-#-cl_install_kernel_uid-#
 
-#?os_install_linux_system==desktop&&os_install_linux_subname!=#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# #-os_install_linux_subname-# Builder Safemode
-#os_install_linux_system#
-#?os_install_linux_system==desktop&&os_install_linux_subname==#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# Builder Safemode
-#os_install_linux_system#
-#?os_install_linux_system==server#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# Builder Safemode
-#os_install_linux_system#
-root (hd#-disk(/boot,grub)-#)
-#?os_install_linux_system==desktop&&pkg(sys-apps/calculate-install)>=2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-#
-#os_install_linux_system#
-#?os_install_linux_system==desktop&&pkg(sys-apps/calculate-install)<2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_system==server&&os_install_linux_shortname!=CSS&&pkg(sys-apps/calculate-install)>=2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-#
-#os_install_linux_system#
-#?os_install_linux_system==server&&os_install_linux_shortname!=CSS&&pkg(sys-apps/calculate-install)<2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 console=tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_shortname==CSS&&pkg(sys-apps/calculate-install)>=2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-#
-#os_install_linux_shortname#
-#?os_install_linux_shortname==CSS&&pkg(sys-apps/calculate-install)<2.2.14#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_shortname#
-initrd /boot/initrd-#-cl_install_kernel_uid-#-install
-
 #-os_grub_conf-#
 
 # Uncomment if you have Windows on hard disk
diff --git a/install/1system/grub/grub.conf.scratch.oldkernel b/install/1system/grub/grub.conf.scratch.oldkernel
index 8d26034..4f0fb34 100644
--- a/install/1system/grub/grub.conf.scratch.oldkernel
+++ b/install/1system/grub/grub.conf.scratch.oldkernel
@@ -25,27 +25,6 @@ kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesaf
 #os_install_linux_shortname#
 initrd /boot/initrd-#-cl_install_kernel_uid-#
 
-#?os_install_linux_system==desktop&&os_install_linux_subname!=#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# #-os_install_linux_subname-# Builder Safemode
-#os_install_linux_system#
-#?os_install_linux_system==desktop&&os_install_linux_subname==#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# Builder Safemode
-#os_install_linux_system#
-#?os_install_linux_system==server#
-title #-os_install_linux_name-# #-os_install_arch_machine-# #-os_install_linux_ver-# Builder Safemode
-#os_install_linux_system#
-root (hd#-disk(/boot,grub)-#)
-#?os_install_linux_system==desktop#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_system==server&&os_install_linux_shortname!=CSS#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3,splash=silent,theme:tty1 CONSOLE=/dev/tty1 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_system#
-#?os_install_linux_shortname==CSS#
-kernel /boot/vmlinuz-#-cl_install_kernel_uid-# root=#-disk(/,use)-# video=uvesafb:ywrap,#-os_install_fb_resolution-#,mtrr:3 udev quiet #-os_install_kernel_resume-# elevator=#-os_install_kernel_scheduler-# doscsi#-os_install_kernel_attr-#
-#os_install_linux_shortname#
-initrd /boot/initrd-#-cl_install_kernel_uid-#-install
-
 #-os_grub_conf-#
 
 # Uncomment if you have Windows on hard disk