diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index 6a6089b57..45ac52237 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -5,9 +5,6 @@
 # Contains the ConnectCore 6 module.
 include conf/machine/include/ccimx6.inc
 
-# To be removed (rng-tools) once kernel 3.14 is deprecated
-MACHINE_EXTRA_RRECOMMENDS += "rng-tools"
-
 # Firmware
 MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_BT', '1' , 'firmware-atheros-ar3k', '', d)}"
 MACHINE_FIRMWARE_append = " ${@base_conditional('HAVE_WIFI', '1' , 'firmware-atheros-ath6kl', '', d)}"
diff --git a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
index 16103d2af..50cc66f4f 100644
--- a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
+++ b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
@@ -55,7 +55,6 @@ FILES_${PN} = "/"
 
 RDEPENDS_${PN}_append_ccimx6sbc = " \
     cryptsetup \
-    rng-tools \
 "
 
 RDEPENDS_${PN}_append_ccimx6qpsbc = " cryptsetup"
diff --git a/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init b/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init
index a59cb846c..f3b74bd0e 100644
--- a/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init
+++ b/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init
@@ -394,12 +394,6 @@ mkdir -p /var/lock
 # Set kernel console loglevel.
 sysctl -q -w kernel.printk=4
 
-# Launch 'rngd' to feed random data to kernel entropy pool
-# for kernels previous to v3.17
-if [ "$(get_kernel_version)" -lt "$(((3 << 8) + 17))" ]; then
-	mkdir -p /var/run && rngd
-fi
-
 # Start psplash.
 psplash &
 
diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
index 5f9cb418c..d0317053a 100644
--- a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
+++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
@@ -27,13 +27,10 @@ RDEPENDS_${PN} = " \
     u-boot-fw-utils \
 "
 
-RDEPENDS_${PN}_append_ccimx6sbc = " \
+RDEPENDS_${PN}_append_ccimx6 = " \
     cryptsetup \
-    rng-tools \
 "
 
-RDEPENDS_${PN}_append_ccimx6qpsbc = " cryptsetup"
-
 RDEPENDS_${PN}_append_ccimx6ul = " \
     mtd-utils-ubifs \
 "
diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6/trustfence-initramfs-init b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6/trustfence-initramfs-init
index d8eb73c0b..3d763a48c 100644
--- a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6/trustfence-initramfs-init
+++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6/trustfence-initramfs-init
@@ -24,19 +24,6 @@ error() {
 	sync && poweroff -f
 }
 
-#------------------------------------------------------------------------------
-# Function - get_kernel_version
-#
-# Obtain the kernel version and return it in number format
-#
-# @return  - kernel version
-#------------------------------------------------------------------------------
-get_kernel_version() {
-	major="$(uname -r | cut -d'.' -f1)"
-	minor="$(uname -r | cut -d'.' -f2)"
-	echo $(((major << 8) + minor))
-}
-
 # Main
 #------------------------------------------------------------------------------
 # Setup the environment.
@@ -51,12 +38,6 @@ mount -t devtmpfs devtmpfs /dev
 LOGLEVEL="$(sysctl -n kernel.printk)"
 sysctl -q -w kernel.printk=4
 
-# Launch 'rngd' to feed random data to kernel entropy pool
-# for kernels previous to v3.17
-if [ "$(get_kernel_version)" -lt "$(((3 << 8) + 17))" ]; then
-	mkdir -p /var/run && rngd
-fi
-
 for arg in $(cat /proc/cmdline); do
 	case "${arg}" in
 		init=*|rescue=1|root=*) eval ${arg};;
@@ -91,13 +72,9 @@ mount ${FSTYPE:+-t ${FSTYPE}} ${root} /newroot
 #
 # Clean-up and do the switch_root to the final rootfs
 #
-# - explicit kill 'rngd' daemon so it doesn't leak to the final rootfs
 # - restore previous kernel console loglevel
 # - umount virtual filesystems
 #
-if [ "$(get_kernel_version)" -lt "$(((3 << 8) + 17))" ]; then
-    pkill -9 rngd
-fi
 [ -n "${LOGLEVEL}" ] && sysctl -q -w kernel.printk="${LOGLEVEL}"
 mount --move /dev /newroot/dev
 umount /sys /proc
diff --git a/meta-digi-dey/recipes-support/rng-tools/rng-tools/default b/meta-digi-dey/recipes-support/rng-tools/rng-tools/default
deleted file mode 100644
index ab7cd9327..000000000
--- a/meta-digi-dey/recipes-support/rng-tools/rng-tools/default
+++ /dev/null
@@ -1,2 +0,0 @@
-# Specify rng device
-RNG_DEVICE=/dev/hwrng
diff --git a/meta-digi-dey/recipes-support/rng-tools/rng-tools_%.bbappend b/meta-digi-dey/recipes-support/rng-tools/rng-tools_%.bbappend
deleted file mode 100644
index 01631c66d..000000000
--- a/meta-digi-dey/recipes-support/rng-tools/rng-tools_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright (C) 2016 Digi International.
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"