diff --git a/molecules/hardenedserver.common b/molecules/hardenedserver.common
deleted file mode 100644
index ee59cf6..0000000
--- a/molecules/hardenedserver.common
+++ /dev/null
@@ -1,73 +0,0 @@
-# Define an alternative execution strategy, in this case, the value must be
-# "iso_remaster"
-execution_strategy: iso_remaster
-
-# ISO Image title
-iso_title: Sabayon Hardened Server
-
-# Release string
-release_string: Sabayon Linux
-
-# File to write release string
-release_file: /etc/sabayon-edition
-
-# Enable XZ compression in mksquashfs
-extra_mksquashfs_parameters: -comp xz -Xbcj x86
-
-# Outer chroot script command, to be executed outside destination chroot before
-# before entering it (and before inner_chroot_script)
-%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh
-
-# Execute repositories update here, in a more fault-tolerant flavor
-%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh
-
-# Inner chroot script command, to be executed inside destination chroot after
-# packages installation and removal
-%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh xfce
-
-# Outer chroot script command, to be executed outside destination chroot before
-# before entering it (and AFTER inner_chroot_script)
-%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh
-
-# Used to umount /proc and unbind packages dir
-%env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh
-
-# Extra mkisofs parameters, perhaps something to include/use your bootloader
-extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform efi -eltorito-boot boot/grub/efi.img
-
-# Pre-ISO building script. Hook to be able to copy kernel images in place, for example
-%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh HardenedServer
-
-# Post-ISO building script, called after ISO image generation.
-%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
-
-# Destination directory for the ISO image path (MANDATORY)
-%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
-
-# Import the Graphic Environment module.
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common
-
-packages_to_add:
-	@xfce,
-	app-admin/rigo,
-	app-misc/sabayon-skel,
-	app-text/pastebunz,
-	lxde-base/lxdm,
-	media-gfx/feh,
-	net-dialup/ppp,
-	net-dialup/rp-pppoe,
-	net-misc/tightvnc,
-	sys-block/parted,
-	sys-power/cpufrequtils,
-	x11-themes/gnome-themes-standard,
-	x11-terms/xfce4-terminal,
-	sys-kernel/linux-hardened,
-	sys-apps/paxctl,
-	www-client/midori
-
-packages_to_remove:
-	sys-kernel/linux-sabayon
-
-# Determine whether repositories update should be run (if packages_to_add is set)
-# (default is: no), values are: yes, no.
-execute_repositories_update: no
diff --git a/molecules/sabayon-amd64-hardenedserver.spec b/molecules/sabayon-amd64-hardenedserver.spec
deleted file mode 100644
index f255aa7..0000000
--- a/molecules/sabayon-amd64-hardenedserver.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-# Use abs path, otherwise daily iso build won't work
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/hardenedserver.common
-
-%env release_version: ${SABAYON_RELEASE:-11}
-release_desc: amd64 Hardened Server
-
-# Path to source ISO file (MANDATORY)
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-DAILY}_amd64_SpinBase.iso
-
-# Destination ISO image name, call whatever you want.iso, not mandatory
-%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_HardenedServer.iso
diff --git a/molecules/sabayon-x86-hardenedserver.spec b/molecules/sabayon-x86-hardenedserver.spec
deleted file mode 100644
index c900eb4..0000000
--- a/molecules/sabayon-x86-hardenedserver.spec
+++ /dev/null
@@ -1,15 +0,0 @@
-# use abs path, otherwise daily iso build automagic won't work
-%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/hardenedserver.common
-
-%env release_version: ${SABAYON_RELEASE:-11}
-release_desc: x86 Hardened Server
-
-# pre chroot command, example, for 32bit chroots on 64bit system, you always
-# have to append "linux32" this is useful for inner_chroot_script
-prechroot: linux32
-
-# Path to source ISO file (MANDATORY)
-%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-DAILY}_x86_SpinBase.iso
-
-# Destination ISO image name, call whatever you want.iso, not mandatory
-%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_HardenedServer.iso
diff --git a/remaster/hardenedserver_grub.cfg b/remaster/hardenedserver_grub.cfg
deleted file mode 100644
index 7b1388b..0000000
--- a/remaster/hardenedserver_grub.cfg
+++ /dev/null
@@ -1,133 +0,0 @@
-set timeout=5
-set default=0
-set fallback=2
-set pager=1
-
-function load_video {
-  if [ x$feature_all_video_module = xy ]; then
-    insmod all_video
-  else
-    insmod efi_gop
-    insmod efi_uga
-    insmod ieee1275_fb
-    insmod vbe
-    insmod vga
-    insmod video_bochs
-    insmod video_cirrus
-  fi
-}
-
-if loadfont /boot/grub/unicode.pf2 ; then
-   set gfxmode=auto
-   load_video
-   insmod gfxterm
-   terminal_output gfxterm
-   insmod gettext
-fi
-
-if [ -f /boot/grub/default-splash.png ]; then
-   insmod png
-   background_image -m stretch /boot/grub/default-splash.png
-fi
-
-if [ x$bootlang = x ]; then
-   bootlang=en_US
-   export bootlang
-fi
-if [ x$bootkeymap = x ]; then
-   bootkeymap=us
-   export bootkeymap
-fi
-
-if [ x$acpi_opt = x ]; then
-   acpi_opt=''
-   export acpi_opt
-fi
-if [ x$modeset_opt = x ]; then
-   modeset_opt=''
-   export modeset_opt
-fi
-if [ x$noefi_opt = x ]; then
-   noefi_opt=''
-   export noefi_opt
-fi
-
-insmod part_gpt
-
-menuentry "Start Sabayon __VERSION__ HardenedServer" {
-   set gfxpayload=keep
-   echo "Language: ${bootlang}"
-   echo "Keyboard: ${bootkeymap}"
-   echo "Please wait..."
-   linux /boot/sabayon cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /boot/sabayon.igz
-}
-
-menuentry "Installation" {
-   set gfxpayload=keep
-   echo "Language: ${bootlang}"
-   echo "Keyboard: ${bootkeymap}"
-   echo "Please wait..."
-   linux /boot/sabayon cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} installer-gui locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-   initrd /boot/sabayon.igz
-}
-
-
-submenu "Advanced Options" {
-
-   menuentry "Console mode" {
-      set gfxpayload=keep
-      echo "Language: ${bootlang}"
-      echo "Keyboard: ${bootkeymap}"
-      echo "Please wait..."
-      linux /boot/sabayon cdroot ${init_opt} quiet vconsole.keymap=${bootkeymap} gentoo=nox locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /boot/sabayon.igz
-   }
-
-   menuentry "Check disc for defects" {
-      set gfxpayload=keep
-      echo "Language: ${bootlang}"
-      echo "Keyboard: ${bootkeymap}"
-      echo "Please wait..."
-      linux /boot/sabayon cdroot ${init_opt} splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} -- 
-      initrd /boot/sabayon.igz
-   }
-
-   menuentry "Disable systemd" {
-      echo "Disabling Systemd..."
-      set init_opt="real_init=/sbin/init.d/sysvinit/init"
-      export init_opt
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Disable Kernel Mode Settings (for AMD Radeon GPUs with fglrx)" {
-      echo "Disabling Kernel Mode Setting..."
-      set modeset_opt="nomodeset"
-      export modeset_opt
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Disable ACPI" {
-      echo "Disabling ACPI..."
-      set acpi_opt="noacpi acpi=off"
-      export acpi_opt
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Disable EFI" {
-      echo "Disabling EFI..."
-      set noefi_opt="noefi"
-      export noefi_opt
-      configfile /boot/grub/grub.cfg
-   }
-
-   menuentry "Debug mode" {
-      set gfxpayload=keep
-      echo "Language: ${bootlang}"
-      echo "Keyboard: ${bootkeymap}"
-      echo "Please wait..."
-      linux /boot/sabayon cdroot ${init_opt} debug vconsole.keymap=${bootkeymap} locale=${bootlang} ${modeset_opt} ${acpi_opt} --
-      initrd /boot/sabayon.igz
-   }
-
-}
diff --git a/remaster/hardenedserver_isolinux.cfg b/remaster/hardenedserver_isolinux.cfg
deleted file mode 100644
index 7ccc8de..0000000
--- a/remaster/hardenedserver_isolinux.cfg
+++ /dev/null
@@ -1,46 +0,0 @@
-default console
-
-label sabayon
-  menu label Start Sabayon __VERSION__ HardenedServer
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz cdroot splash vga=791 quiet -- 
-
-label install
-  menu label ^Installation
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz cdroot splash vga=791 quiet installer-gui --
-
-label genuine
-  menu label Start in Safe ^Mode
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz cdroot noproprietary pci=routeirq irqpoll quiet nokvm -- 
-
-label console
-  menu label ^Console mode
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz cdroot splash vga=791 gentoo=nox quiet -- 
-
-label console-safe
-  menu label ^Console mode (no splash)
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz cdroot gentoo=nox quiet -- 
-
-label debug
-  menu label Deb^ug mode
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz cdroot vga=791 debug --
-
-label checkdisk
-  menu label ^Check disc for defects
-  kernel /boot/sabayon
-  append initrd=/boot/sabayon.igz cdroot splash quiet checkdisc -- 
-
-label memtest
-  menu label Memory ^test
-  kernel /boot/memtest
-  append -
-
-label hd
-  menu label ^Boot from first hard disk
-  localboot 0x80
-  append -
diff --git a/scripts/generic_pre_iso_script.sh b/scripts/generic_pre_iso_script.sh
index dbe689d..776d483 100755
--- a/scripts/generic_pre_iso_script.sh
+++ b/scripts/generic_pre_iso_script.sh
@@ -23,10 +23,6 @@ fi
 if [ "${remaster_type}" = "KDE" ] || [ "${remaster_type}" = "GNOME" ]; then
 	isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/standard_isolinux.cfg"
 	grub_source="${SABAYON_MOLECULE_HOME}/remaster/standard_grub.cfg"
-elif [ "${remaster_type}" = "HardenedServer" ]; then
-	echo "HardenedServer trigger, copying server kernel over"
-	isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/hardenedserver_isolinux.cfg"
-	grub_source="${SABAYON_MOLECULE_HOME}/remaster/hardenedserver_grub.cfg"
 fi
 cp "${isolinux_source}" "${isolinux_destination}" || exit 1
 cp "${grub_source}" "${grub_destination}" || exit 1