diff --git a/meta-digi-dey/classes/sares-image.bbclass b/meta-digi-dey/classes/sares-image.bbclass
deleted file mode 100644
index 82c40e22f..000000000
--- a/meta-digi-dey/classes/sares-image.bbclass
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Helper class for automated testing in SARES
-#
-# Copyright (C) 2015 Digi International.
-#
-# To enable, use INHERIT in local.conf:
-#
-#     INHERIT += "sares-image"
-#
-
-IMAGE_FEATURES += "dey-debug dey-examples"
-
-sares() {
-	##################################################################
-	## WARNING: enable passwordless 'root' autologin in serial console
-	## and telnetd for testing purposes
-	##################################################################
-	if [ -f "${IMAGE_ROOTFS}/etc/inittab" ]; then
-		cat >${IMAGE_ROOTFS}/sbin/rootlogin <<-_EOF_
-			#!/bin/sh
-			exec /bin/login -f root
-		_EOF_
-		chmod u+x ${IMAGE_ROOTFS}/sbin/rootlogin
-
-		# The 'echo' trick is needed because the SERIAL_CONSOLES variable
-		# is expanded by bitbake and contains a semicolon ';'
-		for i in $(echo "${SERIAL_CONSOLES}"); do
-			label="$(echo $i | sed -e 's,.*tty\(.*\),\1,g')"
-			sed -i -e "
-				/^$label:.*getty/{
-					i\## WARNING: passwordless 'root' autologin enabled
-					s,getty,getty -n -l /sbin/rootlogin,g
-				}" ${IMAGE_ROOTFS}/etc/inittab
-		done
-
-		# Install a telnetd daemon if there isn't one
-		if ! grep -qs telnetd ${IMAGE_ROOTFS}/etc/inittab; then
-			cat >>${IMAGE_ROOTFS}/etc/inittab <<-_EOF_
-				## WARNING: passwordless 'root' telnet daemon
-				~~::sysinit:/usr/sbin/telnetd -l /sbin/rootlogin
-			_EOF_
-		fi
-	fi
-}
-
-IMAGE_PREPROCESS_COMMAND += "sares;"
diff --git a/sdk/build.sh b/sdk/build.sh
index cb8dfd8aa..b49959ab5 100755
--- a/sdk/build.sh
+++ b/sdk/build.sh
@@ -20,7 +20,6 @@
 #     DY_PLATFORMS:      Platforms to build
 #     DY_REVISION:       Revision of the manifest repository (for 'repo init')
 #     DY_RM_WORK:        Remove the package working folders to save disk space.
-#     DY_SARES:          Build SARES test image
 #     DY_TARGET:         Target image (the default is 'dey-image-minimal')
 #     DY_USE_MIRROR:     Use internal Digi mirror to download packages
 #
@@ -52,10 +51,6 @@ INHERIT += \"rm_work\"
 RM_WORK_EXCLUDE += \"dey-image-graphical dey-image-minimal linux-dey u-boot-dey\"
 "
 
-SARES_CFG="
-INHERIT += \"sares-image\"
-"
-
 X11_REMOVAL_CFG="
 DISTRO_FEATURES_remove = \"x11\"
 "
@@ -234,9 +229,6 @@ for platform in ${DY_PLATFORMS}; do
 					if [ "${DY_RM_WORK}" = "true" ]; then
 						printf "${RM_WORK_CFG}" >> conf/local.conf
 					fi
-					if [ "${DY_SARES}" = "true" ]; then
-						printf "${SARES_CFG}" >> conf/local.conf
-					fi
 					# Remove 'x11' distro feature if building minimal images
 					if echo "${DY_TARGET}" | grep -qs "dey-image-minimal"; then
 						printf "${X11_REMOVAL_CFG}" >> conf/local.conf