diff --git a/configs/cms1_defconfig b/configs/cms1_defconfig
index 1128c43..73e1000 100644
--- a/configs/cms1_defconfig
+++ b/configs/cms1_defconfig
@@ -10,7 +10,6 @@ CONFIG_CMS_IGNORE_EXPIRED_CERTIFICATE=y
 CONFIG_CMS_IGNORE_CERTIFICATE_PURPOSE=y
 CONFIG_ENCRYPTED_IMAGES=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 CONFIG_LUAEXTERNAL=y
 CONFIG_RAW=y
diff --git a/configs/cms_defconfig b/configs/cms_defconfig
index ce3af1e..23b0b53 100644
--- a/configs/cms_defconfig
+++ b/configs/cms_defconfig
@@ -8,7 +8,6 @@ CONFIG_SIGNED_IMAGES=y
 CONFIG_SIGALG_CMS=y
 CONFIG_ENCRYPTED_IMAGES=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 CONFIG_LUAEXTERNAL=y
 CONFIG_RAW=y
diff --git a/configs/hawkbit_defconfig b/configs/hawkbit_defconfig
index ba9f945..f90485b 100644
--- a/configs/hawkbit_defconfig
+++ b/configs/hawkbit_defconfig
@@ -1,97 +1,15 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Swupdate Configuration
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Swupdate Settings
-#
-
-#
-# General Configuration
-#
-CONFIG_SCRIPTS=y
 CONFIG_HW_COMPATIBILITY=y
-CONFIG_HW_COMPATIBILITY_FILE="/etc/hwrevision"
-CONFIG_SW_VERSIONS_FILE="/etc/sw-versions"
 # CONFIG_MTD is not set
-CONFIG_LUA=y
 CONFIG_LUAPKG="lua5.2"
-# CONFIG_FEATURE_SYSLOG is not set
-
-#
-# Build Options
-#
-CONFIG_CROSS_COMPILE=""
-CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS="-g"
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_WERROR is not set
-# CONFIG_NOCLEANUP is not set
-# CONFIG_BOOTLOADER is not set
-# CONFIG_UBOOT is not set
 CONFIG_BOOTLOADER_NONE=y
 CONFIG_DOWNLOAD=y
 CONFIG_HASH_VERIFY=y
-# CONFIG_SIGNED_IMAGES is not set
 CONFIG_ENCRYPTED_IMAGES=y
 CONFIG_SURICATTA=y
-
-#
-# Suricatta
-#
-
-#
-# Features
-#
-# CONFIG_SURICATTA_SSL is not set
-CONFIG_SURICATTA_STATE_CHOICE_NONE=y
-# CONFIG_SURICATTA_STATE_CHOICE_BOOTLOADER is not set
-
-#
-# Server
-#
-CONFIG_SURICATTA_HAWKBIT=y
-# CONFIG_SURICATTA_SERVER_NONE is not set
 CONFIG_WEBSERVER=y
-
-#
-# Webserver Features
-#
-CONFIG_MONGOOSE=y
-
-#
-# Mongoose Feature
-#
-CONFIG_MONGOOSELUA=y
-CONFIG_MONGOOSEIPV6=y
 CONFIG_MONGOOSESSL=y
-
-#
-# Archival Features
-#
-CONFIG_GUNZIP=y
-
-#
-# Parser Features
-#
-CONFIG_LIBCONFIG=y
-CONFIG_PARSERROOT=""
-CONFIG_JSON=y
 CONFIG_LUAEXTERNAL=y
-# CONFIG_SETEXTPARSERNAME is not set
-# CONFIG_SETSWDESCRIPTION is not set
-
-#
-# Image Handlers
-#
 CONFIG_RAW=y
 CONFIG_LUASCRIPTHANDLER=y
 CONFIG_SHELLSCRIPTHANDLER=y
diff --git a/configs/nodwl_defconfig b/configs/nodwl_defconfig
index a1a9360..eaac56d 100644
--- a/configs/nodwl_defconfig
+++ b/configs/nodwl_defconfig
@@ -5,9 +5,7 @@ CONFIG_EXTRA_CFLAGS="-g"
 CONFIG_BOOTLOADER_NONE=y
 CONFIG_HASH_VERIFY=y
 CONFIG_ENCRYPTED_IMAGES=y
-CONFIG_SURICATTA_STATE_CHOICE_BOOTLOADER=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 CONFIG_LUAEXTERNAL=y
 CONFIG_RAW=y
diff --git a/configs/raspi_defconfig b/configs/raspi_defconfig
index bbb3db1..55ebf83 100644
--- a/configs/raspi_defconfig
+++ b/configs/raspi_defconfig
@@ -5,7 +5,6 @@ CONFIG_DOWNLOAD=y
 CONFIG_HASH_VERIFY=y
 CONFIG_ENCRYPTED_IMAGES=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 CONFIG_RAW=y
 CONFIG_LUASCRIPTHANDLER=y
diff --git a/configs/sha256_defconfig b/configs/sha256_defconfig
index 711823c..4ad346d 100644
--- a/configs/sha256_defconfig
+++ b/configs/sha256_defconfig
@@ -7,7 +7,6 @@ CONFIG_DOWNLOAD=y
 CONFIG_HASH_VERIFY=y
 CONFIG_ENCRYPTED_IMAGES=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 CONFIG_LUAEXTERNAL=y
 CONFIG_RAW=y
diff --git a/configs/swuforwarder_defconfig b/configs/swuforwarder_defconfig
index 8ef9212..f6dc631 100644
--- a/configs/swuforwarder_defconfig
+++ b/configs/swuforwarder_defconfig
@@ -1,106 +1,20 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Swupdate Configuration
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Swupdate Settings
-#
-
-#
-# General Configuration
-#
-CONFIG_CURL=y
-# CONFIG_SYSTEMD is not set
-CONFIG_SCRIPTS=y
 CONFIG_HW_COMPATIBILITY=y
-CONFIG_HW_COMPATIBILITY_FILE="/etc/hwrevision"
-CONFIG_SW_VERSIONS_FILE="/etc/sw-versions"
-
-#
-# Socket Paths
-#
-CONFIG_SOCKET_CTRL_PATH="/tmp/sockinstctrl"
-CONFIG_SOCKET_PROGRESS_PATH="/tmp/swupdateprog"
-CONFIG_SOCKET_REMOTE_HANDLER_DIRECTORY="/tmp/"
 # CONFIG_MTD is not set
-CONFIG_LUA=y
 CONFIG_LUAPKG="lua5.2"
-# CONFIG_FEATURE_SYSLOG is not set
-
-#
-# Build Options
-#
-CONFIG_CROSS_COMPILE=""
-CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS="-g"
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_WERROR is not set
-# CONFIG_NOCLEANUP is not set
-# CONFIG_UBOOT is not set
 CONFIG_BOOTLOADER_NONE=y
-# CONFIG_BOOTLOADER_GRUB is not set
 CONFIG_DOWNLOAD=y
 CONFIG_HASH_VERIFY=y
-# CONFIG_SIGNED_IMAGES is not set
 CONFIG_ENCRYPTED_IMAGES=y
 CONFIG_SURICATTA=y
-
-#
-# Features
-#
 CONFIG_SURICATTA_SSL=y
-CONFIG_SURICATTA_STATE_CHOICE_NONE=y
-# CONFIG_SURICATTA_STATE_CHOICE_BOOTLOADER is not set
-
-#
-# Server
-#
-CONFIG_SURICATTA_HAWKBIT=y
 CONFIG_WEBSERVER=y
-
-#
-# Webserver Features
-#
-CONFIG_MONGOOSE=y
-
-#
-# Mongoose Feature
-#
-CONFIG_MONGOOSELUA=y
-CONFIG_MONGOOSEIPV6=y
 CONFIG_MONGOOSESSL=y
-
-#
-# Archival Features
-#
-CONFIG_GUNZIP=y
-
-#
-# Parser Features
-#
-CONFIG_LIBCONFIG=y
-CONFIG_PARSERROOT=""
-CONFIG_JSON=y
 CONFIG_LUAEXTERNAL=y
-# CONFIG_SETEXTPARSERNAME is not set
-# CONFIG_SETSWDESCRIPTION is not set
-
-#
-# Image Handlers
-#
 CONFIG_RAW=y
 CONFIG_LUASCRIPTHANDLER=y
 CONFIG_SHELLSCRIPTHANDLER=y
 CONFIG_HANDLER_IN_LUA=y
-# CONFIG_EMBEDDED_LUA_HANDLER is not set
 CONFIG_ARCHIVE=y
 CONFIG_REMOTE_HANDLER=y
 CONFIG_SWUFORWARDER_HANDLER=y
diff --git a/configs/test_defconfig b/configs/test_defconfig
index 962a1b5..473ffa7 100644
--- a/configs/test_defconfig
+++ b/configs/test_defconfig
@@ -6,9 +6,7 @@ CONFIG_BOOTLOADER_NONE=y
 CONFIG_DOWNLOAD=y
 CONFIG_SIGNED_IMAGES=y
 CONFIG_ENCRYPTED_IMAGES=y
-CONFIG_SURICATTA_STATE_CHOICE_BOOTLOADER=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 CONFIG_LUAEXTERNAL=y
 CONFIG_RAW=y
diff --git a/configs/with_ebg_defconfig b/configs/with_ebg_defconfig
index ed3c3e4..2019f5e 100644
--- a/configs/with_ebg_defconfig
+++ b/configs/with_ebg_defconfig
@@ -6,9 +6,7 @@ CONFIG_BOOTLOADER_EBG=y
 CONFIG_DOWNLOAD=y
 CONFIG_SIGNED_IMAGES=y
 CONFIG_ENCRYPTED_IMAGES=y
-CONFIG_SURICATTA_STATE_CHOICE_BOOTLOADER=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 CONFIG_LUAEXTERNAL=y
 CONFIG_RAW=y
diff --git a/configs/with_lua_handlers_defconfig b/configs/with_lua_handlers_defconfig
index 7faa01f..7064787 100644
--- a/configs/with_lua_handlers_defconfig
+++ b/configs/with_lua_handlers_defconfig
@@ -6,7 +6,6 @@ CONFIG_DOWNLOAD=y
 CONFIG_SIGNED_IMAGES=y
 CONFIG_ENCRYPTED_IMAGES=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 CONFIG_CFI=y
 CONFIG_RAW=y
diff --git a/configs/with_lua_nohandlers_defconfig b/configs/with_lua_nohandlers_defconfig
index a816a65..ceef10f 100644
--- a/configs/with_lua_nohandlers_defconfig
+++ b/configs/with_lua_nohandlers_defconfig
@@ -6,7 +6,6 @@ CONFIG_DOWNLOAD=y
 CONFIG_SIGNED_IMAGES=y
 CONFIG_ENCRYPTED_IMAGES=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 # CONFIG_LIBCONFIG is not set
 CONFIG_RAW=y
diff --git a/configs/with_systemd_defconfig b/configs/with_systemd_defconfig
index 36b86d7..ae690c6 100644
--- a/configs/with_systemd_defconfig
+++ b/configs/with_systemd_defconfig
@@ -1,3 +1,4 @@
+CONFIG_SYSTEMD=y
 CONFIG_HW_COMPATIBILITY=y
 # CONFIG_MTD is not set
 CONFIG_LUAPKG="lua5.2"
@@ -6,10 +7,7 @@ CONFIG_BOOTLOADER_NONE=y
 CONFIG_DOWNLOAD=y
 CONFIG_SIGNED_IMAGES=y
 CONFIG_ENCRYPTED_IMAGES=y
-CONFIG_SURICATTA_STATE_CHOICE_BOOTLOADER=y
-CONFIG_SYSTEMD=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 CONFIG_LUAEXTERNAL=y
 CONFIG_RAW=y
diff --git a/configs/without_libconfig_defconfig b/configs/without_libconfig_defconfig
index 4e56653..e750a38 100644
--- a/configs/without_libconfig_defconfig
+++ b/configs/without_libconfig_defconfig
@@ -6,7 +6,6 @@ CONFIG_DOWNLOAD=y
 CONFIG_SIGNED_IMAGES=y
 CONFIG_ENCRYPTED_IMAGES=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 # CONFIG_LIBCONFIG is not set
 CONFIG_RAW=y
diff --git a/configs/without_lua_defconfig b/configs/without_lua_defconfig
index ca5cc00..ed5ca7b 100644
--- a/configs/without_lua_defconfig
+++ b/configs/without_lua_defconfig
@@ -6,7 +6,6 @@ CONFIG_DOWNLOAD=y
 CONFIG_SIGNED_IMAGES=y
 CONFIG_ENCRYPTED_IMAGES=y
 CONFIG_WEBSERVER=y
-CONFIG_MONGOOSE=y
 CONFIG_MONGOOSESSL=y
 # CONFIG_LIBCONFIG is not set
 CONFIG_RAW=y
