diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 3728529dfa..ab12dee30b 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -70,7 +70,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -368,7 +368,6 @@ CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
-# CONFIG_KEXEC_JUMP is not set
 CONFIG_PHYSICAL_START=0x400000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x400000
@@ -388,30 +387,6 @@ CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION_NVS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_TOI_CORE=y
-
-#
-# Image Storage (you need at least one allocator)
-#
-CONFIG_TOI_FILE=y
-# CONFIG_TOI_SWAP is not set
-
-#
-# General Options
-#
-CONFIG_TOI_CRYPTO=y
-CONFIG_TOI_USERUI=y
-CONFIG_TOI_USERUI_DEFAULT_PATH="/usr/sbin/tuxoniceui_text"
-CONFIG_TOI_KEEP_IMAGE=y
-CONFIG_TOI_REPLACE_SWSUSP=y
-# CONFIG_TOI_IGNORE_LATE_INITCALL is not set
-CONFIG_TOI_DEFAULT_WAIT=25
-CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=2000
-# CONFIG_TOI_CHECKSUM is not set
-CONFIG_TOI=y
 CONFIG_PM_RUNTIME=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
@@ -2260,7 +2235,6 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DEFLATE is not set
 CONFIG_CRYPTO_ZLIB=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_LZF=y
 
 #
 # Random Number Generation
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index 2206eeb4e6..f80bab3937 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -71,7 +71,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -355,7 +355,6 @@ CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
-# CONFIG_KEXEC_JUMP is not set
 CONFIG_PHYSICAL_START=0x400000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x1000000
@@ -368,37 +367,12 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-CONFIG_ARCH_HIBERNATION_HEADER=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION_NVS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_TOI_CORE=y
-
-#
-# Image Storage (you need at least one allocator)
-#
-CONFIG_TOI_FILE=y
-# CONFIG_TOI_SWAP is not set
-
-#
-# General Options
-#
-CONFIG_TOI_CRYPTO=y
-CONFIG_TOI_USERUI=y
-CONFIG_TOI_USERUI_DEFAULT_PATH="/usr/sbin/tuxoniceui_text"
-CONFIG_TOI_KEEP_IMAGE=y
-CONFIG_TOI_REPLACE_SWSUSP=y
-# CONFIG_TOI_IGNORE_LATE_INITCALL is not set
-CONFIG_TOI_DEFAULT_WAIT=25
-CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=2000
-# CONFIG_TOI_CHECKSUM is not set
-CONFIG_TOI=y
 CONFIG_PM_RUNTIME=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
diff --git a/projects/generic/linux/linux.i386.conf b/projects/generic/linux/linux.i386.conf
index 07ba1f50ca..700f9125a2 100644
--- a/projects/generic/linux/linux.i386.conf
+++ b/projects/generic/linux/linux.i386.conf
@@ -70,7 +70,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -369,7 +369,6 @@ CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
-# CONFIG_KEXEC_JUMP is not set
 CONFIG_PHYSICAL_START=0x400000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x400000
@@ -389,30 +388,6 @@ CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION_NVS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_TOI_CORE=y
-
-#
-# Image Storage (you need at least one allocator)
-#
-CONFIG_TOI_FILE=y
-# CONFIG_TOI_SWAP is not set
-
-#
-# General Options
-#
-CONFIG_TOI_CRYPTO=y
-CONFIG_TOI_USERUI=y
-CONFIG_TOI_USERUI_DEFAULT_PATH="/usr/sbin/tuxoniceui_text"
-CONFIG_TOI_KEEP_IMAGE=y
-CONFIG_TOI_REPLACE_SWSUSP=y
-# CONFIG_TOI_IGNORE_LATE_INITCALL is not set
-CONFIG_TOI_DEFAULT_WAIT=25
-CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=2000
-# CONFIG_TOI_CHECKSUM is not set
-CONFIG_TOI=y
 CONFIG_PM_RUNTIME=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
@@ -2081,7 +2056,6 @@ CONFIG_RT2870=m
 #
 # CONFIG_RAR_REGISTER is not set
 # CONFIG_IIO is not set
-# CONFIG_RAMZSWAP is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_SAMSUNG_LAPTOP is not set
 # CONFIG_STRIP is not set
@@ -2500,7 +2474,6 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DEFLATE is not set
 CONFIG_CRYPTO_ZLIB=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_LZF=y
 
 #
 # Random Number Generation
diff --git a/projects/intel/linux/linux.i386.conf b/projects/intel/linux/linux.i386.conf
index f4361806cf..cfb468d977 100644
--- a/projects/intel/linux/linux.i386.conf
+++ b/projects/intel/linux/linux.i386.conf
@@ -70,7 +70,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -369,7 +369,6 @@ CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
-# CONFIG_KEXEC_JUMP is not set
 CONFIG_PHYSICAL_START=0x400000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x400000
@@ -389,30 +388,6 @@ CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION_NVS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_TOI_CORE=y
-
-#
-# Image Storage (you need at least one allocator)
-#
-CONFIG_TOI_FILE=y
-# CONFIG_TOI_SWAP is not set
-
-#
-# General Options
-#
-CONFIG_TOI_CRYPTO=y
-CONFIG_TOI_USERUI=y
-CONFIG_TOI_USERUI_DEFAULT_PATH="/usr/sbin/tuxoniceui_text"
-CONFIG_TOI_KEEP_IMAGE=y
-CONFIG_TOI_REPLACE_SWSUSP=y
-# CONFIG_TOI_IGNORE_LATE_INITCALL is not set
-CONFIG_TOI_DEFAULT_WAIT=25
-CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=2000
-# CONFIG_TOI_CHECKSUM is not set
-CONFIG_TOI=y
 CONFIG_PM_RUNTIME=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
@@ -2024,7 +1999,6 @@ CONFIG_STAGING=y
 #
 # CONFIG_RAR_REGISTER is not set
 # CONFIG_IIO is not set
-# CONFIG_RAMZSWAP is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_SAMSUNG_LAPTOP is not set
 # CONFIG_STRIP is not set
@@ -2443,7 +2417,6 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_DEFLATE is not set
 CONFIG_CRYPTO_ZLIB=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_LZF=y
 
 #
 # Random Number Generation
diff --git a/projects/intel/linux/linux.x86_64.conf b/projects/intel/linux/linux.x86_64.conf
index 03a7a8614e..da6ec3e2cf 100644
--- a/projects/intel/linux/linux.x86_64.conf
+++ b/projects/intel/linux/linux.x86_64.conf
@@ -71,7 +71,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_LZMA=y
 # CONFIG_KERNEL_LZO is not set
-CONFIG_SWAP=y
+# CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -357,7 +357,6 @@ CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
-# CONFIG_KEXEC_JUMP is not set
 CONFIG_PHYSICAL_START=0x400000
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x1000000
@@ -370,37 +369,12 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-CONFIG_ARCH_HIBERNATION_HEADER=y
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION_NVS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_TOI_CORE=y
-
-#
-# Image Storage (you need at least one allocator)
-#
-CONFIG_TOI_FILE=y
-# CONFIG_TOI_SWAP is not set
-
-#
-# General Options
-#
-CONFIG_TOI_CRYPTO=y
-CONFIG_TOI_USERUI=y
-CONFIG_TOI_USERUI_DEFAULT_PATH="/usr/local/sbin/tuxoniceui_text"
-CONFIG_TOI_KEEP_IMAGE=y
-CONFIG_TOI_REPLACE_SWSUSP=y
-# CONFIG_TOI_IGNORE_LATE_INITCALL is not set
-CONFIG_TOI_DEFAULT_WAIT=25
-CONFIG_TOI_DEFAULT_EXTRA_PAGES_ALLOWANCE=2000
-# CONFIG_TOI_CHECKSUM is not set
-CONFIG_TOI=y
 CONFIG_PM_RUNTIME=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
@@ -1983,7 +1957,6 @@ CONFIG_STAGING=y
 #
 # CONFIG_RAR_REGISTER is not set
 # CONFIG_IIO is not set
-# CONFIG_RAMZSWAP is not set
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_SAMSUNG_LAPTOP is not set
 # CONFIG_STRIP is not set