diff --git a/configs/bb.org-debian-buster-iot-v4.9.conf b/configs/bb.org-debian-buster-iot-v4.9.conf
deleted file mode 100644
index c99a9b8f5a48dd3671d7d7c2986839cc3af1ac5c..0000000000000000000000000000000000000000
--- a/configs/bb.org-debian-buster-iot-v4.9.conf
+++ /dev/null
@@ -1,189 +0,0 @@
-##
-release="buster"
-image_type="iot"
-##
-##Debootstrap: https://wiki.debian.org/Debootstrap
-##
-##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
-##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
-##
-deb_distribution="debian"
-deb_codename="buster"
-deb_arch="armhf"
-#
-deb_include="	\
-	alsa-utils	\
-	at	\
-	automake	\
-	avahi-utils	\
-	bash-completion	\
-	bc	\
-	bluetooth	\
-	build-essential	\
-	ca-certificates	\
-	can-utils	\
-	connman	\
-	cpufrequtils	\
-	curl	\
-	device-tree-compiler	\
-	dnsmasq	\
-	dosfstools	\
-	fake-hwclock	\
-	firmware-atheros	\
-	firmware-brcm80211	\
-	firmware-iwlwifi	\
-	firmware-libertas	\
-	firmware-misc-nonfree	\
-	firmware-realtek	\
-	firmware-ti-connectivity	\
-	firmware-zd1211	\
-	git	\
-	gnupg	\
-	haveged	\
-	hdparm	\
-	hexedit	\
-	hostapd	\
-	htop	\
-	i2c-tools	\
-	initramfs-tools	\
-	iperf	\
-	iw	\
-	less	\
-	libiio-utils	\
-	libncurses5-dev	\
-	libnss-mdns	\
-	libtool	\
-	libdbus-1-dev	\
-	libusb-1.0-0-dev	\
-	linux-base	\
-	linux-cpupower	\
-	locales	\
-	lshw	\
-	lsof	\
-	lzma	\
-	lzop	\
-	memtester	\
-	nano	\
-	nethogs	\
-	net-tools	\
-	nginx	\
-	openssh-server	\
-	pastebinit	\
-	pkg-config	\
-	pps-tools	\
-	python-dev	\
-	python-smbus	\
-	python3	\
-	python3-dev	\
-	python3-flask	\
-	python3-numpy	\
-	python3-opencv	\
-	python3-pip	\
-	python3-scipy	\
-	python3-setuptools	\
-	python3-smbus	\
-	rfkill	\
-	rsync	\
-	screen	\
-	ssl-cert	\
-	sudo	\
-	systemd	\
-	tio	\
-	tmux	\
-	u-boot-tools	\
-	udhcpd	\
-	usb-modeswitch	\
-	usbutils	\
-	v4l-utils	\
-	vim	\
-	wget	\
-	wireless-tools	\
-	wpasupplicant	\
-"
-
-#
-deb_exclude=""
-#
-deb_components="main contrib non-free"
-deb_mirror=""
-##
-##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
-##
-deb_additional_pkgs="	\
-	btrfs-progs	\
-	grub-efi-arm	\
-	ifupdown	\
-	libnss-systemd	\
-	libpam-systemd	\
-	ostree	\
-"
-
-##
-rfs_username="debian"
-rfs_fullname="Demo User"
-rfs_password="temppwd"
-rfs_hostname="beaglebone"
-rfs_startup_scripts="enable"
-rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
-rfs_default_desktop=""
-rfs_desktop_background=""
-rfs_default_locale="en_US.UTF-8"
-rfs_etc_dogtag="BeagleBoard.org Debian Image"
-rfs_console_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_console_user_pass="enable"
-rfs_ssh_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_ssh_user_pass="enable"
-##
-##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
-repo_rcnee="enable"
-repo_rcnee_pkg_list="	\
-	ardupilot-copter-3.6-bbbmini	\
-	ardupilot-copter-3.6-blue	\
-	ardupilot-copter-3.6-pocket	\
-	ardupilot-rover-3.3-bbbmini	\
-	ardupilot-rover-3.3-blue	\
-	ardupilot-rover-3.3-pocket	\
-	ardupilot-rover-3.4-bbbmini	\
-	ardupilot-rover-3.4-blue	\
-	ardupilot-rover-3.4-pocket	\
-	bb-cape-overlays	\
-	bb-customizations	\
-	bb-node-red-installer	\
-	bb-wl18xx-firmware	\
-	bone101	\
-	bonescript	\
-	c9-core-installer	\
-	doc-beaglebone-getting-started	\
-	gpiod	\
-	ipumm-dra7xx-installer	\
-	linux-image-4.9.105-ti-r113	\
-	mjpg-streamer	\
-	nodejs	\
-	npm	\
-	pru-software-support-package	\
-	rcn-ee-archive-keyring	\
-	roboticscape	\
-	ti-pru-cgt-installer	\
-	tiomapconf	\
-	vpdma-dra7xx-installer	\
-	wireguard-tools	\
-"
-
-##
-##nodejs: https://github.com/nodesource/distributions
-##
-#repo_nodesource="node_0.12"
-#repo_nodesource="node_4.x"
-#repo_nodesource="node_6.x"
-#repo_nodesource="node_8.x"
-#repo_nodesource_dist="stretch"
-##
-repo_rcnee_pkg_version="4.9.105-ti-r113"
-include_firmware="enable"
-#
-chroot_COPY_SETUP_SDCARD="enable"
-chroot_before_hook=""
-chroot_after_hook=""
-chroot_script="beagleboard.org-buster.sh"
-chroot_post_uenv_txt=""
-chroot_tarball="enable"
diff --git a/configs/bb.org-debian-jessie-iot-v4.9.conf b/configs/bb.org-debian-jessie-iot-v4.9.conf
deleted file mode 100644
index 8605619dbfa71a3b0b5810abc8d9fd3262471a2c..0000000000000000000000000000000000000000
--- a/configs/bb.org-debian-jessie-iot-v4.9.conf
+++ /dev/null
@@ -1,184 +0,0 @@
-##
-release="8.11"
-image_type="iot"
-##
-##Debootstrap: https://wiki.debian.org/Debootstrap
-##
-##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
-##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
-##
-deb_distribution="debian"
-deb_codename="jessie"
-deb_arch="armhf"
-#
-deb_include="	\
-	alsa-utils	\
-	at	\
-	apache2	\
-	apt-transport-https	\
-	autoconf	\
-	automake	\
-	avahi-utils	\
-	bash-completion	\
-	bc	\
-	bison	\
-	bluetooth	\
-	build-essential	\
-	ca-certificates	\
-	can-utils	\
-	connman	\
-	cpufrequtils	\
-	curl	\
-	debhelper	\
-	dosfstools	\
-	dnsmasq	\
-	fakeroot	\
-	file	\
-	firmware-atheros	\
-	firmware-iwlwifi	\
-	firmware-ralink	\
-	firmware-realtek	\
-	firmware-zd1211	\
-	flex	\
-	gdb	\
-	git-core	\
-	hdparm	\
-	hexedit	\
-	hostapd	\
-	htop	\
-	i2c-tools	\
-	info	\
-	initramfs-tools	\
-	iperf	\
-	iw	\
-	libdbus-1-dev	\
-	libncurses5-dev	\
-	libnss-mdns	\
-	libtool	\
-	libusb-1.0-0-dev	\
-	linux-base	\
-	locales	\
-	lshw	\
-	lsof	\
-	lzma	\
-	lzop	\
-	memtester	\
-	openssh-server	\
-	pkg-config	\
-	ppp	\
-	rfkill	\
-	rsync	\
-	screen	\
-	ssl-cert	\
-	sudo	\
-	systemd	\
-	tmux	\
-	u-boot-tools	\
-	udhcpd	\
-	usb-modeswitch	\
-	usbutils	\
-	v4l-utils	\
-	vim	\
-	wget	\
-	wireless-tools	\
-	wpasupplicant	\
-	wvdial	\
-	xz-utils	\
-"
-
-#
-deb_exclude=""
-#
-deb_components="main contrib non-free"
-deb_mirror=""
-##
-##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
-##
-#python-2.7: due to: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769106
-#
-deb_additional_pkgs="	\
-	libpam-systemd	\
-	libpython2.7-dev	\
-	lsb-release	\
-	nodejs	\
-	pastebinit	\
-	pylint	\
-	python-dbus	\
-	python-dev	\
-	python-flask	\
-	python-minimal	\
-	python-pip	\
-	python3-pip	\
-	python3-setuptools	\
-"
-
-##
-rfs_username="debian"
-rfs_fullname="Demo User"
-rfs_password="temppwd"
-rfs_hostname="beaglebone"
-rfs_startup_scripts="enable"
-rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
-rfs_default_desktop=""
-rfs_desktop_background=""
-rfs_default_locale="en_US.UTF-8"
-rfs_etc_dogtag="BeagleBoard.org Debian Image"
-rfs_console_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_console_user_pass="enable"
-rfs_ssh_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_ssh_user_pass="enable"
-##
-##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
-repo_rcnee="enable"
-repo_rcnee_pkg_list="	\
-	am335x-pru-package	\
-	ardupilot-copter-blue	\
-	ardupilot-copter-bbbmini	\
-	ardupilot-plane-blue	\
-	ardupilot-plane-bbbmini	\
-	ardupilot-rover-3.3-bbbmini	\
-	ardupilot-rover-3.3-blue	\
-	ardupilot-rover-3.3-pocket	\
-	bb-cape-overlays	\
-	bb-customizations	\
-	bb-node-red-installer	\
-	bb-wl18xx-firmware	\
-	bone101	\
-	bonescript	\
-	c9-core-installer	\
-	device-tree-compiler	\
-	doc-beaglebone-getting-started	\
-	doc-beaglebonegreen-getting-started	\
-	doc-seeed-bbgw-getting-started	\
-	haveged	\
-	libiio-utils	\
-	libsoc-dev	\
-	libsoc2	\
-	linux-image-4.9.105-ti-r113	\
-	mjpg-streamer	\
-	pru-software-support-package	\
-	rcn-ee-archive-keyring	\
-	roboticscape	\
-	ti-pru-cgt-installer	\
-	ti-wlconf	\
-	tiomapconf	\
-	upm	\
-"
-
-##
-##nodejs: https://github.com/nodesource/distributions
-#repo_nodesource="node_0.12"
-repo_nodesource="node_4.x"
-#repo_nodesource="node_6.x"
-#repo_nodesource="node_8.x"
-repo_nodesource_dist="jessie"
-##
-repo_rcnee_pkg_version="4.9.105-ti-r113"
-include_firmware="enable"
-#
-chroot_COPY_SETUP_SDCARD="enable"
-chroot_before_hook=""
-chroot_after_hook=""
-chroot_script="beagleboard.org-jessie.sh"
-chroot_post_uenv_txt=""
-chroot_tarball="enable"
diff --git a/configs/bb.org-debian-stretch-console-v4.9.conf b/configs/bb.org-debian-stretch-console-v4.9.conf
deleted file mode 100644
index 4ce89d0fcd5d597dd962063779b345030c44c11d..0000000000000000000000000000000000000000
--- a/configs/bb.org-debian-stretch-console-v4.9.conf
+++ /dev/null
@@ -1,114 +0,0 @@
-##
-release="9.4"
-image_type="console"
-##
-##Debootstrap: https://wiki.debian.org/Debootstrap
-##
-##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
-##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
-##
-deb_distribution="debian"
-deb_codename="stretch"
-deb_arch="armhf"
-#
-deb_include="	\
-	bc	\
-	bsdmainutils	\
-	ca-certificates	\
-	connman	\
-	dbus	\
-	dosfstools	\
-	dnsmasq	\
-	firmware-realtek	\
-	firmware-ti-connectivity	\
-	hostapd	\
-	initramfs-tools	\
-	iw	\
-	linux-base	\
-	memtester	\
-	nano	\
-	net-tools	\
-	openssh-server	\
-	patch	\
-	rfkill	\
-	rsync	\
-	sudo	\
-	systemd	\
-	udhcpd	\
-	wget	\
-	wireless-tools	\
-	wpasupplicant	\
-	xz-utils	\
-"
-
-#
-deb_exclude="	\
-	aptitude	\
-	aptitude-common	\
-	groff-base	\
-	info	\
-	install-info	\
-	man-db	\
-	manpages	\
-	tasksel	\
-	tasksel-data	\
-"
-
-#
-deb_components="main contrib non-free"
-deb_mirror=""
-##
-##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
-##
-deb_additional_pkgs="	\
-	btrfs-progs	\
-	libpam-systemd	\
-"
-
-##
-rfs_username="debian"
-rfs_fullname="Demo User"
-rfs_password="temppwd"
-rfs_hostname="beaglebone"
-rfs_startup_scripts="enable"
-#rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
-#rfs_default_desktop=""
-#rfs_desktop_background=""
-rfs_default_locale="en_US.UTF-8"
-rfs_etc_dogtag="BeagleBoard.org Debian Image"
-rfs_console_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_console_user_pass="enable"
-rfs_ssh_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_ssh_user_pass="enable"
-##
-##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
-repo_rcnee="enable"
-repo_rcnee_pkg_list="	\
-	bb-cape-overlays	\
-	bb-customizations	\
-	bb-wl18xx-firmware	\
-	gpiod	\
-	linux-image-4.9.105-ti-r113	\
-	rcn-ee-archive-keyring	\
-	tiomapconf	\
-	wireguard-tools	\
-"
-
-##
-##nodejs: https://github.com/nodesource/distributions
-## make sure to add: apt-transport-https
-#repo_nodesource="node_0.12"
-#repo_nodesource="node_4.x"
-#repo_nodesource="node_6.x"
-#repo_nodesource="node_8.x"
-#repo_nodesource_dist="stretch"
-##
-repo_rcnee_pkg_version="4.9.105-ti-r113"
-#include_firmware="enable"
-#
-chroot_COPY_SETUP_SDCARD="enable"
-chroot_before_hook=""
-chroot_after_hook=""
-chroot_script="beagleboard.org-stretch.sh"
-chroot_post_uenv_txt=""
-chroot_tarball="enable"
diff --git a/configs/bb.org-debian-stretch-iot-v4.9.conf b/configs/bb.org-debian-stretch-iot-v4.9.conf
deleted file mode 100644
index bad149dac644605b4b9aea0b9046e0a136226a98..0000000000000000000000000000000000000000
--- a/configs/bb.org-debian-stretch-iot-v4.9.conf
+++ /dev/null
@@ -1,183 +0,0 @@
-##
-release="9.4"
-image_type="iot"
-##
-##Debootstrap: https://wiki.debian.org/Debootstrap
-##
-##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
-##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
-##
-deb_distribution="debian"
-deb_codename="stretch"
-deb_arch="armhf"
-#
-deb_include="	\
-	alsa-utils	\
-	at	\
-	apache2	\
-	automake	\
-	avahi-utils	\
-	bash-completion	\
-	bc	\
-	bluetooth	\
-	build-essential	\
-	ca-certificates	\
-	can-utils	\
-	connman	\
-	cpufrequtils	\
-	curl	\
-	device-tree-compiler	\
-	dnsmasq	\
-	dosfstools	\
-	firmware-atheros	\
-	firmware-brcm80211	\
-	firmware-iwlwifi	\
-	firmware-libertas	\
-	firmware-misc-nonfree	\
-	firmware-realtek	\
-	firmware-ti-connectivity	\
-	firmware-zd1211	\
-	git-core	\
-	haveged	\
-	hdparm	\
-	hexedit	\
-	hostapd	\
-	htop	\
-	i2c-tools	\
-	initramfs-tools	\
-	iperf	\
-	iw	\
-	less	\
-	libiio-utils	\
-	libncurses5-dev	\
-	libnss-mdns	\
-	libtool	\
-	libdbus-1-dev	\
-	libusb-1.0-0-dev	\
-	linux-base	\
-	linux-cpupower	\
-	locales	\
-	lshw	\
-	lsof	\
-	lzma	\
-	lzop	\
-	memtester	\
-	nano	\
-	nethogs	\
-	net-tools	\
-	openssh-server	\
-	pastebinit	\
-	pkg-config	\
-	ppp	\
-	pps-tools	\
-	python-dev	\
-	python3	\
-	python3-dev	\
-	python3-numpy	\
-	python3-pip	\
-	python3-setuptools	\
-	rfkill	\
-	rsync	\
-	screen	\
-	ssl-cert	\
-	sudo	\
-	systemd	\
-	tio	\
-	tmux	\
-	u-boot-tools	\
-	udhcpd	\
-	unzip	\
-	usb-modeswitch	\
-	usbutils	\
-	v4l-utils	\
-	vim	\
-	wget	\
-	wireless-tools	\
-	wpasupplicant	\
-	xz-utils	\
-"
-
-#
-deb_exclude=""
-#
-deb_components="main contrib non-free"
-deb_mirror=""
-##
-##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
-##
-deb_additional_pkgs="	\
-	btrfs-progs	\
-	libpam-systemd	\
-"
-
-##
-rfs_username="debian"
-rfs_fullname="Demo User"
-rfs_password="temppwd"
-rfs_hostname="beaglebone"
-rfs_startup_scripts="enable"
-rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
-rfs_default_desktop=""
-rfs_desktop_background=""
-rfs_default_locale="en_US.UTF-8"
-rfs_etc_dogtag="BeagleBoard.org Debian Image"
-rfs_console_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_console_user_pass="enable"
-rfs_ssh_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_ssh_user_pass="enable"
-##
-##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
-repo_rcnee="enable"
-repo_rcnee_pkg_list="	\
-	ardupilot-copter-3.6-bbbmini	\
-	ardupilot-copter-3.6-blue	\
-	ardupilot-copter-3.6-pocket	\
-	ardupilot-rover-3.3-bbbmini	\
-	ardupilot-rover-3.3-blue	\
-	ardupilot-rover-3.3-pocket	\
-	ardupilot-rover-3.4-bbbmini	\
-	ardupilot-rover-3.4-blue	\
-	ardupilot-rover-3.4-pocket	\
-	bb-cape-overlays	\
-	bb-customizations	\
-	bb-node-red-installer	\
-	bb-wl18xx-firmware	\
-	bone101	\
-	bonescript	\
-	c9-core-installer	\
-	doc-beaglebone-getting-started	\
-	doc-beaglebonegreen-getting-started	\
-	doc-seeed-bbgw-getting-started	\
-	firmware-am57xx-opencl-monitor	\
-	gpiod	\
-	ipumm-dra7xx-installer	\
-	linux-image-4.9.105-ti-r113	\
-	mjpg-streamer	\
-	nodejs	\
-	pru-software-support-package	\
-	rcn-ee-archive-keyring	\
-	roboticscape	\
-	ti-pru-cgt-installer	\
-	tiomapconf	\
-	vpdma-dra7xx-installer	\
-	wireguard-tools	\
-"
-
-##
-##nodejs: https://github.com/nodesource/distributions
-## make sure to add: apt-transport-https
-#repo_nodesource="node_0.12"
-#repo_nodesource="node_4.x"
-#repo_nodesource="node_6.x"
-#repo_nodesource="node_8.x"
-#repo_nodesource_dist="stretch"
-##
-repo_rcnee_pkg_version="4.9.105-ti-r113"
-include_firmware="enable"
-#
-chroot_COPY_SETUP_SDCARD="enable"
-chroot_before_hook=""
-chroot_after_hook=""
-chroot_script="beagleboard.org-stretch.sh"
-chroot_post_uenv_txt=""
-chroot_tarball="enable"
diff --git a/configs/bb.org-debian-stretch-lxqt-2gb-v4.9.conf b/configs/bb.org-debian-stretch-lxqt-2gb-v4.9.conf
deleted file mode 100644
index 5a78ea2f84ad40b754d30b85eed8672d940d8cd8..0000000000000000000000000000000000000000
--- a/configs/bb.org-debian-stretch-lxqt-2gb-v4.9.conf
+++ /dev/null
@@ -1,129 +0,0 @@
-##
-release="9.4"
-image_type="lxqt-2gb"
-##
-##Debootstrap: https://wiki.debian.org/Debootstrap
-##
-##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
-##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
-##
-deb_distribution="debian"
-deb_codename="stretch"
-deb_arch="armhf"
-#
-deb_include="	\
-	avahi-utils	\
-	bc	\
-	ca-certificates	\
-	connman	\
-	cpufrequtils	\
-	curl	\
-	device-tree-compiler	\
-	dosfstools	\
-	dnsmasq	\
-	git-core	\
-	haveged	\
-	hostapd	\
-	i2c-tools	\
-	initramfs-tools	\
-	libnss-mdns	\
-	linux-base	\
-	linux-cpupower	\
-	locales	\
-	lsof	\
-	lzma	\
-	lzop	\
-	net-tools	\
-	openssh-server	\
-	pastebinit	\
-	rsync	\
-	ssl-cert	\
-	sudo	\
-	systemd	\
-	tmux	\
-	u-boot-tools	\
-	udhcpd	\
-	usb-modeswitch	\
-	vim	\
-	wget	\
-	xz-utils	\
-"
-
-#
-deb_exclude=""
-#
-deb_components="main contrib non-free"
-deb_mirror=""
-##
-##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
-##
-deb_additional_pkgs="	\
-	libpam-systemd	\
-	lightdm	\
-	lxqt-about	\
-	lxqt-admin	\
-	lxqt-common	\
-	lxqt-config	\
-	lxqt-panel	\
-	lxqt-qtplugin	\
-	lxqt-session	\
-	lxqt-sudo	\
-	lxqt-runner	\
-	mesa-utils-extra	\
-	pcmanfm-qt	\
-	qterminal	\
-	xinput	\
-	xserver-xorg-video-fbdev	\
-"
-
-##
-rfs_username="debian"
-rfs_fullname="Demo User"
-rfs_password="temppwd"
-rfs_hostname="beaglebone"
-rfs_startup_scripts="enable"
-rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
-rfs_default_desktop="lxqt"
-rfs_desktop_background="/opt/scripts/images/beaglebg.jpg"
-rfs_default_locale="en_US.UTF-8"
-rfs_etc_dogtag="BeagleBoard.org Debian Image"
-rfs_console_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_console_user_pass="enable"
-rfs_ssh_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_ssh_user_pass="enable"
-##
-##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
-repo_rcnee="enable"
-repo_rcnee_pkg_list="	\
-	bb-cape-overlays	\
-	bb-customizations	\
-	bone101	\
-	bonescript	\
-	c9-core-installer	\
-	gpiod	\
-	linux-image-4.9.105-ti-r113	\
-	nodejs	\
-	rcn-ee-archive-keyring	\
-"
-
-##
-chroot_manual_deborphan_list="xscreensaver"
-
-##
-##nodejs: https://github.com/nodesource/distributions
-## make sure to add: apt-transport-https
-#repo_nodesource="node_0.12"
-#repo_nodesource="node_4.x"
-#repo_nodesource="node_6.x"
-#repo_nodesource="node_8.x"
-#repo_nodesource_dist="stretch"
-##
-repo_rcnee_pkg_version="4.9.105-ti-r113"
-include_firmware="enable"
-#
-chroot_COPY_SETUP_SDCARD="enable"
-chroot_before_hook=""
-chroot_after_hook=""
-chroot_script="beagleboard.org-stretch-2gb.sh"
-chroot_post_uenv_txt=""
-chroot_tarball="enable"
diff --git a/configs/bb.org-debian-stretch-lxqt-v4.9.conf b/configs/bb.org-debian-stretch-lxqt-v4.9.conf
deleted file mode 100644
index 180c13d8efc66f5ed2f6eba6a7e473cece67e51e..0000000000000000000000000000000000000000
--- a/configs/bb.org-debian-stretch-lxqt-v4.9.conf
+++ /dev/null
@@ -1,209 +0,0 @@
-##
-release="9.4"
-image_type="lxqt"
-##
-##Debootstrap: https://wiki.debian.org/Debootstrap
-##
-##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
-##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
-##
-deb_distribution="debian"
-deb_codename="stretch"
-deb_arch="armhf"
-#
-deb_include="	\
-	alsa-utils	\
-	at	\
-	apache2	\
-	automake	\
-	avahi-utils	\
-	bash-completion	\
-	bc	\
-	bluetooth	\
-	build-essential	\
-	ca-certificates	\
-	can-utils	\
-	connman	\
-	cpufrequtils	\
-	curl	\
-	device-tree-compiler	\
-	dnsmasq	\
-	dosfstools	\
-	evtest	\
-	fbset	\
-	firmware-atheros	\
-	firmware-brcm80211	\
-	firmware-iwlwifi	\
-	firmware-libertas	\
-	firmware-misc-nonfree	\
-	firmware-realtek	\
-	firmware-ti-connectivity	\
-	firmware-zd1211	\
-	git-core	\
-	haveged	\
-	hdparm	\
-	hexedit	\
-	hostapd	\
-	htop	\
-	i2c-tools	\
-	initramfs-tools	\
-	iperf	\
-	iw	\
-	less	\
-	libiio-utils	\
-	libncurses5-dev	\
-	libnss-mdns	\
-	libtool	\
-	libdbus-1-dev	\
-	libusb-1.0-0-dev	\
-	libudev-dev	\
-	linux-base	\
-	linux-cpupower	\
-	locales	\
-	lshw	\
-	lsof	\
-	lzma	\
-	lzop	\
-	memtester	\
-	nano	\
-	nethogs	\
-	net-tools	\
-	openssh-server	\
-	pastebinit	\
-	pkg-config	\
-	ppp	\
-	pps-tools	\
-	python-dev	\
-	python3	\
-	python3-dev	\
-	python3-numpy	\
-	python3-pip	\
-	python3-setuptools	\
-	rfkill	\
-	rsync	\
-	screen	\
-	ssl-cert	\
-	sudo	\
-	systemd	\
-	tio	\
-	tmux	\
-	u-boot-tools	\
-	udhcpd	\
-	unzip	\
-	usb-modeswitch	\
-	usbutils	\
-	v4l-utils	\
-	vim	\
-	wget	\
-	wireless-tools	\
-	wpasupplicant	\
-	xz-utils	\
-"
-
-#
-deb_exclude=""
-#
-deb_components="main contrib non-free"
-deb_mirror=""
-##
-##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
-##
-deb_additional_pkgs="	\
-	btrfs-progs	\
-	chromium	\
-	libpam-systemd	\
-	lightdm	\
-	lxqt-about	\
-	lxqt-admin	\
-	lxqt-common	\
-	lxqt-config	\
-	lxqt-panel	\
-	lxqt-qtplugin	\
-	lxqt-session	\
-	lxqt-sudo	\
-	lxqt-runner	\
-	mesa-utils-extra	\
-	pcmanfm-qt	\
-	qterminal	\
-	tightvncserver	\
-	xinput	\
-	xserver-xorg-video-fbdev	\
-	xserver-xorg-video-omap	\
-"
-
-##
-rfs_username="debian"
-rfs_fullname="Demo User"
-rfs_password="temppwd"
-rfs_hostname="beaglebone"
-rfs_startup_scripts="enable"
-rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
-rfs_default_desktop="lxqt"
-rfs_desktop_background="/opt/scripts/images/beaglebg.jpg"
-rfs_default_locale="en_US.UTF-8"
-rfs_etc_dogtag="BeagleBoard.org Debian Image"
-rfs_console_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_console_user_pass="enable"
-rfs_ssh_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_ssh_user_pass="enable"
-##
-##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
-repo_rcnee="enable"
-repo_rcnee_pkg_list="	\
-	ardupilot-copter-3.6-bbbmini	\
-	ardupilot-copter-3.6-blue	\
-	ardupilot-copter-3.6-pocket	\
-	ardupilot-rover-3.3-bbbmini	\
-	ardupilot-rover-3.3-blue	\
-	ardupilot-rover-3.3-pocket	\
-	ardupilot-rover-3.4-bbbmini	\
-	ardupilot-rover-3.4-blue	\
-	ardupilot-rover-3.4-pocket	\
-	bb-cape-overlays	\
-	bb-customizations	\
-	bb-node-red-installer	\
-	bb-wl18xx-firmware	\
-	bone101	\
-	bonescript	\
-	c9-core-installer	\
-	doc-beaglebone-getting-started	\
-	doc-beaglebonegreen-getting-started	\
-	doc-seeed-bbgw-getting-started	\
-	firmware-am57xx-opencl-monitor	\
-	gpiod	\
-	ipumm-dra7xx-installer	\
-	linux-image-4.9.105-ti-r113	\
-	mjpg-streamer	\
-	nodejs	\
-	pru-software-support-package	\
-	rcn-ee-archive-keyring	\
-	roboticscape	\
-	ti-opencl	\
-	ti-pru-cgt-installer	\
-	tiomapconf	\
-	vpdma-dra7xx-installer	\
-	wireguard-tools	\
-	xserver-xorg-video-armada-etnaviv	\
-"
-
-##
-chroot_manual_deborphan_list="xscreensaver"
-
-##
-##nodejs: https://github.com/nodesource/distributions
-## make sure to add: apt-transport-https
-#repo_nodesource="node_0.12"
-#repo_nodesource="node_4.x"
-#repo_nodesource="node_6.x"
-#repo_nodesource="node_8.x"
-#repo_nodesource_dist="stretch"
-##
-repo_rcnee_pkg_version="4.9.105-ti-r113"
-include_firmware="enable"
-#
-chroot_COPY_SETUP_SDCARD="enable"
-chroot_before_hook=""
-chroot_after_hook=""
-chroot_script="beagleboard.org-stretch.sh"
-chroot_post_uenv_txt=""
-chroot_tarball="enable"
diff --git a/configs/bb.org-debian-stretch-oemflasher-v4.9.conf b/configs/bb.org-debian-stretch-oemflasher-v4.9.conf
deleted file mode 100644
index e1474523754f02abeebe412c3aa9b44610288d07..0000000000000000000000000000000000000000
--- a/configs/bb.org-debian-stretch-oemflasher-v4.9.conf
+++ /dev/null
@@ -1,102 +0,0 @@
-##
-release="9.4"
-image_type="oemflasher"
-##
-##Debootstrap: https://wiki.debian.org/Debootstrap
-##
-##debootstrap --arch=${deb_arch} --include=${deb_include} --exclude=${deb_exclude} \
-##--components=${deb_components} --foreign ${deb_codename} /tmp/tmp.dir/ http://${deb_mirror}
-##
-deb_distribution="debian"
-deb_codename="stretch"
-deb_arch="armhf"
-#
-deb_include="	\
-	bsdmainutils	\
-	ca-certificates	\
-	dbus	\
-	dos2unix	\
-	dosfstools	\
-	dnsmasq	\
-	git-core	\
-	initramfs-tools	\
-	linux-base	\
-	memtester	\
-	net-tools	\
-	openssh-server	\
-	patch	\
-	rsync	\
-	sudo	\
-	systemd	\
-	wget	\
-	xz-utils	\
-"
-
-#
-deb_exclude="	\
-	aptitude	\
-	aptitude-common	\
-	groff-base	\
-	info	\
-	install-info	\
-	man-db	\
-	manpages	\
-	tasksel	\
-	tasksel-data	\
-"
-
-#
-deb_components="main contrib non-free"
-deb_mirror=""
-##
-##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
-##
-#
-deb_additional_pkgs="	\
-	bmap-tools	\
-	libpam-systemd	\
-"
-
-##
-rfs_username="debian"
-rfs_fullname="Demo User"
-rfs_password="temppwd"
-rfs_hostname="beaglebone"
-rfs_startup_scripts="enable"
-#rfs_opt_scripts="https://github.com/RobertCNelson/boot-scripts"
-#rfs_default_desktop=""
-#rfs_desktop_background=""
-rfs_default_locale="en_US.UTF-8"
-rfs_etc_dogtag="BeagleBoard.org Debian Image"
-rfs_console_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_console_user_pass="enable"
-rfs_ssh_banner="Support/FAQ: http://elinux.org/Beagleboard:BeagleBoneBlack_Debian"
-rfs_ssh_user_pass="enable"
-##
-##enable kernel repo: http://repos.rcn-ee.com/(debian|ubuntu)
-repo_rcnee="enable"
-repo_rcnee_pkg_list="	\
-	bb-cape-overlays	\
-	bb-customizations	\
-	linux-image-4.9.105-ti-r113	\
-	rcn-ee-archive-keyring	\
-"
-
-##
-##nodejs: https://github.com/nodesource/distributions
-## make sure to add: apt-transport-https
-#repo_nodesource="node_0.12"
-#repo_nodesource="node_4.x"
-#repo_nodesource="node_6.x"
-#repo_nodesource="node_8.x"
-#repo_nodesource_dist="stretch"
-##
-repo_rcnee_pkg_version="4.9.105-ti-r113"
-#include_firmware="enable"
-#
-chroot_COPY_SETUP_SDCARD="enable"
-chroot_before_hook=""
-chroot_after_hook=""
-chroot_script="beagleboard.org-stretch.sh"
-chroot_post_uenv_txt=""
-chroot_tarball="enable"
diff --git a/configs/kernel.data b/configs/kernel.data
index 511710d7b1d820a31985b3298640caf12b8751c2..3401d3c6de387000f15a0fce9b24fba4ddfa44e5 100644
--- a/configs/kernel.data
+++ b/configs/kernel.data
@@ -4,6 +4,5 @@ armv7 TESTING 4.17.3-armv7-x4
 bone-rt LTS414 4.14.51-bone-rt-r16
 ti LTS44 4.4.113-ti-r149
 ti LTS49 4.9.105-ti-r113
-ti-rt LTS49 4.9.105-ti-rt-r113
 ti LTS414 4.14.52-ti-r60
 ti-rt LTS414 4.14.52-ti-rt-r60
diff --git a/scripts/kernel_update.sh b/scripts/kernel_update.sh
index e8c9b5d9b0d4d085bf7633367cb20af4e45aa86e..6cb268a58e71d83631364ab5643559a093602838 100755
--- a/scripts/kernel_update.sh
+++ b/scripts/kernel_update.sh
@@ -59,9 +59,6 @@ if [ -f configs/kernel.data ] ; then
 	filter2="rt"
 	var="ti"         ; ver="LTS49"  ; current_kernel
 
-	git_msg="4.9.x-ti-rt"
-	var="ti-rt"      ; ver="LTS49"  ; current_kernel
-
 	git_msg="4.14.x-ti"
 	filter1="rt"
 	filter2="rt"
diff --git a/target/chroot/beagleboard.org-bionic.sh b/target/chroot/beagleboard.org-bionic.sh
index 487f4326eeecd0b063efbba8777c0e467d1760b1..88107013db259f8b53efc31365639331b2fe3a9e 100755
--- a/target/chroot/beagleboard.org-bionic.sh
+++ b/target/chroot/beagleboard.org-bionic.sh
@@ -229,11 +229,6 @@ install_git_repos () {
 		fi
 	fi
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/target/chroot/beagleboard.org-buster.sh b/target/chroot/beagleboard.org-buster.sh
index a51a26096c8639931e00c57e6140612898583b82..0264f61f4585049393a7953afe2a1b99399af300 100755
--- a/target/chroot/beagleboard.org-buster.sh
+++ b/target/chroot/beagleboard.org-buster.sh
@@ -229,11 +229,6 @@ install_git_repos () {
 		fi
 	fi
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/target/chroot/beagleboard.org-console-jessie.sh b/target/chroot/beagleboard.org-console-jessie.sh
index 6281a8c0c0151bce867393d201475d533940da8a..31a86ee7c81f74fbc8165b1386cc6d48937d3319 100755
--- a/target/chroot/beagleboard.org-console-jessie.sh
+++ b/target/chroot/beagleboard.org-console-jessie.sh
@@ -259,11 +259,6 @@ install_git_repos () {
 	git_branch="4.4-ti"
 	git_clone_branch
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/target/chroot/beagleboard.org-jessie-2gb.sh b/target/chroot/beagleboard.org-jessie-2gb.sh
index cca1be2fabe25b296deb763f9f8fc323b419503e..dba5e196fc1972173bb79b72d165035a118ee594 100755
--- a/target/chroot/beagleboard.org-jessie-2gb.sh
+++ b/target/chroot/beagleboard.org-jessie-2gb.sh
@@ -259,11 +259,6 @@ install_git_repos () {
 	git_branch="4.4-ti"
 #	git_clone_branch
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-#	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/target/chroot/beagleboard.org-jessie.sh b/target/chroot/beagleboard.org-jessie.sh
index 250c78fb3292ff3f04849603486984493f72cbd7..7e3546ecaeea206761cfd3e3019165fa9b5637a2 100755
--- a/target/chroot/beagleboard.org-jessie.sh
+++ b/target/chroot/beagleboard.org-jessie.sh
@@ -259,11 +259,6 @@ install_git_repos () {
 	git_branch="4.4-ti"
 	git_clone_branch
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/target/chroot/beagleboard.org-stretch-2gb.sh b/target/chroot/beagleboard.org-stretch-2gb.sh
index fa4bd7eb64e1338e6d0f43a473a5831f469a0dbf..e9c24c43ee5156fb1cf2ae2abb1af476a1720b94 100755
--- a/target/chroot/beagleboard.org-stretch-2gb.sh
+++ b/target/chroot/beagleboard.org-stretch-2gb.sh
@@ -272,11 +272,6 @@ install_git_repos () {
 	git_branch="4.4-ti"
 #	git_clone_branch
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-#	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/target/chroot/beagleboard.org-stretch.sh b/target/chroot/beagleboard.org-stretch.sh
index cea4dca76eacbf682b13a89421b50fbaa519a148..df76dc9b679a494613086378a4b71e8e22c0f0c5 100755
--- a/target/chroot/beagleboard.org-stretch.sh
+++ b/target/chroot/beagleboard.org-stretch.sh
@@ -272,11 +272,6 @@ install_git_repos () {
 	git_branch="4.4-ti"
 	git_clone_branch
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/target/chroot/elinux.sh b/target/chroot/elinux.sh
index 5fb85d9b9fb3a0521373e7c6aa3ee5e819558adb..029a6054836a265f24c98a2d08097949e82ce1c9 100755
--- a/target/chroot/elinux.sh
+++ b/target/chroot/elinux.sh
@@ -106,11 +106,6 @@ install_git_repos () {
 	git_target_dir="/opt/source/BBIOConfig"
 	git_clone
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/target/chroot/machinekit-jessie.sh b/target/chroot/machinekit-jessie.sh
index 3e30449e1c917165dae3db31827c7f48ccdfc1f5..3fc5235ee824454c6bea21cb5a179f175f92fd1f 100755
--- a/target/chroot/machinekit-jessie.sh
+++ b/target/chroot/machinekit-jessie.sh
@@ -281,11 +281,6 @@ install_git_repos () {
 	git_branch="4.4-ti"
 	git_clone_branch
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/target/chroot/machinekit-stretch.sh b/target/chroot/machinekit-stretch.sh
index 2e490956d34c6f034297a589e4f64644c597a40f..d204c44eaeb06a8c4ba0492a227e590b258a0ef1 100755
--- a/target/chroot/machinekit-stretch.sh
+++ b/target/chroot/machinekit-stretch.sh
@@ -292,11 +292,6 @@ install_git_repos () {
 	git_branch="4.4-ti"
 	git_clone_branch
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/target/chroot/seeed-jessie.sh b/target/chroot/seeed-jessie.sh
index 60a4b26526398045f3c7939dbca3fad4145e4d64..eb6336f830da2a1b37aa3ce401878a3db27f38e8 100755
--- a/target/chroot/seeed-jessie.sh
+++ b/target/chroot/seeed-jessie.sh
@@ -338,11 +338,6 @@ install_git_repos () {
 	git_branch="4.4-ti"
 	git_clone_branch
 
-	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
-	git_target_dir="/opt/source/dtb-4.9-ti"
-	git_branch="4.9-ti"
-	git_clone_branch
-
 	git_repo="https://github.com/RobertCNelson/dtb-rebuilder.git"
 	git_target_dir="/opt/source/dtb-4.14-ti"
 	git_branch="4.14-ti"
diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index fa8ce86870257e9a05e766ea06fbdb718f2f54e9..e0ac3bc8c14c79d8971daffc71e1003907cc911c 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -1279,44 +1279,27 @@ populate_rootfs () {
 			if [ "x${uboot_pru_rproc_44ti}" = "xenable" ] ; then
 				echo "###pru_rproc (4.4.x-ti kernel)" >> ${wfile}
 				echo "uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-4-TI-00A0.dtbo" >> ${wfile}
-				echo "###pru_rproc (4.9.x-ti kernel)" >> ${wfile}
-				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-9-TI-00A0.dtbo" >> ${wfile}
 				echo "###pru_rproc (4.14.x-ti kernel)" >> ${wfile}
 				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-14-TI-00A0.dtbo" >> ${wfile}
-				echo "###pru_uio (4.4.x-ti, 4.9.x-ti, 4.14.x-ti & mainline/bone kernel)" >> ${wfile}
-				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-UIO-00A0.dtbo" >> ${wfile}
-				use_pru_uio="blocked"
-			fi
-			if [ "x${uboot_pru_rproc_49ti}" = "xenable" ] ; then
-				echo "###pru_rproc (4.4.x-ti kernel)" >> ${wfile}
-				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-4-TI-00A0.dtbo" >> ${wfile}
-				echo "###pru_rproc (4.9.x-ti kernel)" >> ${wfile}
-				echo "uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-9-TI-00A0.dtbo" >> ${wfile}
-				echo "###pru_rproc (4.14.x-ti kernel)" >> ${wfile}
-				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-14-TI-00A0.dtbo" >> ${wfile}
-				echo "###pru_uio (4.4.x-ti, 4.9.x-ti, 4.14.x-ti & mainline/bone kernel)" >> ${wfile}
+				echo "###pru_uio (4.4.x-ti, 4.14.x-ti & mainline/bone kernel)" >> ${wfile}
 				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-UIO-00A0.dtbo" >> ${wfile}
 				use_pru_uio="blocked"
 			fi
 			if [ "x${uboot_pru_rproc_414ti}" = "xenable" ] ; then
 				echo "###pru_rproc (4.4.x-ti kernel)" >> ${wfile}
 				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-4-TI-00A0.dtbo" >> ${wfile}
-				echo "###pru_rproc (4.9.x-ti kernel)" >> ${wfile}
-				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-9-TI-00A0.dtbo" >> ${wfile}
 				echo "###pru_rproc (4.14.x-ti kernel)" >> ${wfile}
 				echo "uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-14-TI-00A0.dtbo" >> ${wfile}
-				echo "###pru_uio (4.4.x-ti, 4.9.x-ti, 4.14.x-ti & mainline/bone kernel)" >> ${wfile}
+				echo "###pru_uio (4.4.x-ti, 4.14.x-ti & mainline/bone kernel)" >> ${wfile}
 				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-UIO-00A0.dtbo" >> ${wfile}
 				use_pru_uio="blocked"
 			fi
 			if [ "x${use_pru_uio}" = "x" ] ; then
 				echo "###pru_rproc (4.4.x-ti kernel)" >> ${wfile}
 				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-4-TI-00A0.dtbo" >> ${wfile}
-				echo "###pru_rproc (4.9.x-ti kernel)" >> ${wfile}
-				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-9-TI-00A0.dtbo" >> ${wfile}
 				echo "###pru_rproc (4.14.x-ti kernel)" >> ${wfile}
 				echo "#uboot_overlay_pru=/lib/firmware/AM335X-PRU-RPROC-4-14-TI-00A0.dtbo" >> ${wfile}
-				echo "###pru_uio (4.4.x-ti, 4.9.x-ti, 4.14.x-ti & mainline/bone kernel)" >> ${wfile}
+				echo "###pru_uio (4.4.x-ti, 4.14.x-ti & mainline/bone kernel)" >> ${wfile}
 				echo "uboot_overlay_pru=/lib/firmware/AM335X-PRU-UIO-00A0.dtbo" >> ${wfile}
 			fi
 			echo "###" >> ${wfile}
@@ -2027,7 +2010,8 @@ while [ ! -z "$1" ] ; do
 		uboot_pru_rproc_44ti="enable"
 		;;
 	--enable-uboot-pru-rproc-49ti)
-		uboot_pru_rproc_49ti="enable"
+		echo "[--enable-uboot-pru-rproc-49ti] is obsolete, use [--enable-uboot-pru-rproc-414ti]"
+		exit 2
 		;;
 	--enable-uboot-pru-rproc-414ti)
 		uboot_pru_rproc_414ti="enable"