diff --git a/LICENSE-3rdparty.txt b/LICENSE-3rdparty.txt
index e422b7c1b..fede61a0d 100644
--- a/LICENSE-3rdparty.txt
+++ b/LICENSE-3rdparty.txt
@@ -2,13 +2,10 @@ PACKAGE        VERSION            URL
 MegaCli        8.07.07-1 	  https://docs.broadcom.com/docs/12352792 				 https://raw.githubusercontent.com/Teradata/stacki/master/common/src/foundation/MegaCLI/LICENSE.txt
 Python         3.6.6     	  https://www.python.org                  				 PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 fbtftp         n/a       	  https://github.com/facebook/fbtftp      				 BSD
-fio            2.1.2     	  https://github.com/axboe/fio            				 GPL2
 newt           0.52.20   	  https://pagure.io/newt                  				 GPL2
 rcs            5.7       	  https://www.gnu.org/software/rcs        				 GPL2
 redis          4.0.11    	  https://redis.io                        				 BSD-ish https://raw.githubusercontent.com/antirez/redis/unstable/COPYING
-sc-im          0.4.0     	  https://github.com/andmarti1424/sc-im   				 BSD
 storcli        007.0409.0000.0000 https://docs.broadcom.com/docs/007.0409.0000.0000_Unified_StorCLI.txt	 https://www.broadcom.com/support/download-search/?pg=&pf=&pn=&pa=&po=&dk=storcli
-stream         n/a       	  https://github.com/jeffhammond/STREAM   				 https://raw.githubusercontent.com/jeffhammond/STREAM/master/LICENSE.txt
 zeromq         4.2.2              http://zeromq.org/                      				 LGPL3
 
 Django         1.11.6    https://www.djangoproject.com/                     OSI Approved :: BSD License
diff --git a/common/3rdparty.json b/common/3rdparty.json
index 9ffa30f09..859f4fd62 100644
--- a/common/3rdparty.json
+++ b/common/3rdparty.json
@@ -6,11 +6,8 @@
 			"Python-3.8.1.tgz",
 		        "newt-0.52.20.tar.gz", 
 			"fbtftp.tar.gz",
-			"fio-2.1.2.tar.gz",
 		        "rcs-5.7.tar.gz", 
-		        "sc-im-0.4.0-20161021.tgz", 
 			"storcli-007.0409.0000.0000-1.noarch.rpm",
-			"stream.tar.gz",
 			"redis-4.0.11.tar.gz",
 			"zeromq-4.3.2.tar.gz"
 		]
diff --git a/common/3rdparty.md b/common/3rdparty.md
index bda1a2d8d..a06424ff1 100644
--- a/common/3rdparty.md
+++ b/common/3rdparty.md
@@ -5,11 +5,8 @@ This repository includes the following code from other projects.
 * MegaCli-8.07.07-1.noarch.rpm [https://teradata-stacki.s3.amazonaws.com/3rdparty/MegaCli-8.07.07-1.noarch.rpm]
 * Python-3.8.1.tgz [https://teradata-stacki.s3.amazonaws.com/3rdparty/Python-3.8.1.tgz]
 * fbtftp.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/fbtftp.tar.gz]
-* fio-2.1.2.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/fio-2.1.2.tar.gz]
 * newt-0.52.20.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/newt-0.52.20.tar.gz]
 * rcs-5.7.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/rcs-5.7.tar.gz]
 * redis-4.0.11.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/redis-4.0.11.tar.gz]
-* sc-im-0.4.0-20161021.tgz [https://teradata-stacki.s3.amazonaws.com/3rdparty/sc-im-0.4.0-20161021.tgz]
 * storcli-007.0409.0000.0000-1.noarch.rpm [https://teradata-stacki.s3.amazonaws.com/3rdparty/storcli-007.0409.0000.0000-1.noarch.rpm]
-* stream.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/stream.tar.gz]
 * zeromq-4.3.2.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/zeromq-4.3.2.tar.gz]
diff --git a/common/manifest.d/common.manifest b/common/manifest.d/common.manifest
index 79b80e33f..60db86e9f 100644
--- a/common/manifest.d/common.manifest
+++ b/common/manifest.d/common.manifest
@@ -1,12 +1,8 @@
 foundation-fbtftpd
-foundation-fio
-foundation-iperf
 foundation-newt
 foundation-python
 foundation-rcs
 foundation-redis
-foundation-sc-im
-foundation-stream
 foundation-zeromq
 ludicrous-speed
 MegaCLI
diff --git a/common/manifest.d/common.sles11 b/common/manifest.d/common.sles11
index 2690c0dab..843826a6f 100644
--- a/common/manifest.d/common.sles11
+++ b/common/manifest.d/common.sles11
@@ -2,7 +2,6 @@
 -foundation-fbtftpd
 -foundation-newt
 -foundation-redis
--foundation-sc-im
 -stack-admin
 -stack-config-server
 -stack-docker
diff --git a/common/src/foundation/fio/LICENSE.txt b/common/src/foundation/fio/LICENSE.txt
deleted file mode 100644
index d7c0b1bbd..000000000
--- a/common/src/foundation/fio/LICENSE.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-As specified by the COPYING file, fio is free software published under version
-2 of the GPL license. That covers the copying part of the license. By using fio,
-you are also promising to uphold the following moral obligations:
-
-- If you publish results that are done using fio, it must be clearly stated
-  that fio was used. The specific version should also be listed.
-
-- If you develop features or bug fixes for fio, they should be sent upstream
-  for inclusion into the main repository. This isn't specific to fio, that
-  is a general rule for any open source project. It's just the Right Thing
-  to do. Plus it means that you don't have to maintain the feature or change
-  internally. In the long run, this is saving you a lot of time.
-
-I would consider the above to fall under "common courtesy", but since
-people tend to have differing opinions of that, it doesn't hurt to spell out
-my expectations clearly.
-
diff --git a/common/src/foundation/fio/Makefile b/common/src/foundation/fio/Makefile
deleted file mode 100644
index 883a6934d..000000000
--- a/common/src/foundation/fio/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# @copyright@
-# Copyright (c) 2006 - 2019 Teradata
-# All rights reserved. Stacki(r) v5.x stacki.com
-# https://github.com/Teradata/stacki/blob/master/LICENSE.txt
-# @copyright@
-
-PKGROOT		= /opt/stack
-ROLLROOT	= ../../../..
-DEPENDS.FILES	= fio-$(VERSION).tar.gz
-
-include $(STACKBUILD)/etc/CCRules.mk
-
-build:
-	gunzip -c fio-$(VERSION).tar.gz | $(TAR) -xf -
-	(				\
-		cd fio-$(VERSION);	\
-		./configure;		\
-		$(MAKE) ;		\
-	)
-install::
-	mkdir -p $(ROOT)/$(PKGROOT)
-	(				\
-		cd fio-$(VERSION);	\
-		$(MAKE) prefix=$(ROOT)/$(PKGROOT) install; \
-	)
-	mkdir -p $(ROOT)/$(PY.STACK)/salt/modules
-	$(INSTALL) -m0644 extras/fio.py $(ROOT)/$(PY.STACK)/salt/modules/fio.py
-
-clean::
-	rm -rf fio-$(VERSION)
diff --git a/common/src/foundation/fio/extras/fio.py b/common/src/foundation/fio/extras/fio.py
deleted file mode 100644
index 2c48af2d2..000000000
--- a/common/src/foundation/fio/extras/fio.py
+++ /dev/null
@@ -1,226 +0,0 @@
-# @copyright@
-# Copyright (c) 2006 - 2019 Teradata
-# All rights reserved. Stacki(r) v5.x stacki.com
-# https://github.com/Teradata/stacki/blob/master/LICENSE.txt
-# @copyright@
-
-import os
-import json
-import re
-import subprocess
-
-
-def __virtual__():
-	return 'fio'
-
-
-def _global():
-	global_vars = {
-		'numjobs' : 1,
-		'runtime' : 10,
-		'size' : '10g',
-		'blocksize' : '128m',
-		'ioengine' : 'sync',
-		'direct' : 1,
-		'buffered' : 0,
-		'end_fsync' : 1,
-	}
-	return global_vars
-
-
-def _rawdisk(filename, size='5GB'):
-	p = subprocess.Popen(['/sbin/parted', '-m', filename, '-s', 'print'],
-		stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-	o, e = p.communicate()
-	rc = p.wait()
-	if rc:
-		return {}
-	lines = o.split('\n')
-	disk_found = False
-	if lines[0] == 'BYT;':
-		disk_found = True
-	if not disk_found:
-		return {}
-	fields = lines[1].split(':')
-	realsize = _get_size(fields[1])
-	if realsize < _get_size(size):
-		size = fields[1]
-
-	return {
-		'filename': filename,
-	}
-
-
-def _get_size(size):
-	size_str = str(size).strip()
-	size_fmt = re.compile(
-		"([0-9]+(.[0-9]+)*)([kmg]?b)",
-		flags=re.IGNORECASE
-		)
-	m = size_fmt.match(size)
-	if not m:
-		return 0
-	unit = m.group(3).upper()
-	if unit == "B":
-		mul = 1
-	if unit == "KB":
-		mul = 1024
-	if unit == "MB":
-		mul = 1024 * 1024
-	if unit == "GB":
-		mul = 1024 * 1024 * 1024
-	if unit == "TB":
-		mul = 1024 * 1024 * 1024 * 1024
-	size = float(m.group(1))
-	return (size * mul)
-
-
-def _part_info(filename, size):
-	return {
-		'filename': filename,
-	}
-
-
-def _mount_info(filename, size):
-	if not os.path.exists(filename):
-		dir = os.path.dirname(filename)
-		if not os.path.exists(dir) or \
-			not os.path.isdir(dir):
-			return {}
-
-	else:
-		if os.path.isdir(filename):
-			dir = filename
-			filename = "%s/fio.img" % dir
-		elif os.path.isfile(filename):
-			dir = os.path.dirname(filename)
-		else:
-			return {}
-
-	p = subprocess.Popen(['/bin/df', '-P', dir],
-		stdout=subprocess.PIPE,
-		stderr=subprocess.PIPE)
-	o, e = p.communicate()
-	rc = p.wait()
-	if rc:
-		return {}
-
-	line = o.split('\n')[1]
-	avail = line.split()[3]
-	if _get_size(size) > _get_size("%sKB" % avail):
-		size = "%sKB" % avail
-
-	return {
-		'filename': filename,
-	}
-
-
-def run(tests):
-	g_params = _global()
-	global_params = ["[global]"]
-	for i in g_params:
-		global_params.append("%s=%s" % (i, g_params[i]))
-
-	out = {}
-
-	#
-	# do the write tests first, then the read tests
-	#
-	cmd = ['/opt/stack/bin/fio', '--output-format=json', '-']
-
-	for testname, name, disk in tests:
-		size = '10GB'
-
-		spec_test = {}
-		if testname == 'rawdisk': 
-			filename = name
-			spec_test = _rawdisk(filename, size)
-		elif testname == 'mountpoint':
-			filename = '%s/fio.img' % name
-			spec_test = _mount_info(filename, size)
-		else:
-			continue
-
-		if not spec_test:
-			continue
-
-		out[disk] = {}
-		out[disk]['test'] = testname
-		out[disk]['name'] = filename
-
-		if testname == 'mountpoint':
-			#
-			# first do the write test 
-			#
-			p = subprocess.Popen(cmd, stdin=subprocess.PIPE,
-				stdout=subprocess.PIPE,
-				stderr=subprocess.PIPE)
-
-			test_params = [ '[job]' ]
-			test_params.append('readwrite=write')
-			for i in spec_test:
-				test_params.append("%s=%s" % (i, spec_test[i]))
-
-			test_string = '\n'.join(global_params + test_params)
-			o, e = p.communicate(test_string)
-			rc = p.wait()
-
-			if o:
-				j = json.loads(o)
-				job = j['jobs'][0]
-				out[disk]['write_bw'] = job['write']['bw']
-			else:
-				out[disk]['write_bw'] = 0
-
-			#
-			# cleanup
-			#
-			os.unlink(filename)
-
-		elif testname == 'rawdisk':
-			out[disk]['write_bw'] = None
-
-	#
-	# now the read test 
-	#
-	file = open('/tmp/fio.debug', 'w+')
-	for testname, name, disk in tests:
-		size = '10GB'
-
-		#
-		# the read test will always read from the raw disk device
-		#
-		filename = '/dev/%s' % disk
-		spec_test = _rawdisk(filename, size)
-
-		file.write('filename: %s\n' % filename)
-		file.write('spec_test: %s\n' % spec_test)
-
-		if not spec_test:
-			continue
-
-		p = subprocess.Popen(cmd, stdin=subprocess.PIPE,
-			stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-		test_params = [ '[job]' ]
-		test_params.append('readwrite=read')
-		for i in spec_test:
-			test_params.append("%s=%s" % (i, spec_test[i]))
-
-		test_string = '\n'.join(global_params + test_params)
-		o, e = p.communicate(test_string)
-		rc = p.wait()
-
-		# file.write('test_params: %s\n' % test_params)
-		# file.write('o: %s\n' % o)
-
-		if o:
-			j = json.loads(o)
-			job = j['jobs'][0]
-			out[disk]['read_bw'] = job['read']['bw']
-		else:
-			out[disk]['read_bw'] = 0
-
-	file.close()
-	return out
-
diff --git a/common/src/foundation/fio/fio-2.1.2.tar.gz b/common/src/foundation/fio/fio-2.1.2.tar.gz
deleted file mode 120000
index 669fb6a9d..000000000
--- a/common/src/foundation/fio/fio-2.1.2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../../../3rdparty/fio-2.1.2.tar.gz
\ No newline at end of file
diff --git a/common/src/foundation/fio/version.mk b/common/src/foundation/fio/version.mk
deleted file mode 100644
index 4f7079584..000000000
--- a/common/src/foundation/fio/version.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-NAME	= foundation-fio
-VERSION	= 2.1.2
diff --git a/common/src/foundation/iperf/Makefile b/common/src/foundation/iperf/Makefile
deleted file mode 100644
index 3cb5e195f..000000000
--- a/common/src/foundation/iperf/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# @copyright@
-# Copyright (c) 2006 - 2019 Teradata
-# All rights reserved. Stacki(r) v5.x stacki.com
-# https://github.com/Teradata/stacki/blob/master/LICENSE.txt
-# @copyright@
-
-PKGROOT		= /opt/stack
-ROLLROOT	= ../../../..
-DEPENDS.DIRS	= files
-
-include $(STACKBUILD)/etc/CCRules.mk
-
-build:
-
-install::
-	mkdir -p $(ROOT)/$(PKGROOT)/sbin
-	$(INSTALL) -m0755 files/iperf3.py $(ROOT)/$(PKGROOT)/sbin/iperf3.py
-	mkdir -p $(ROOT)/$(INIT_SCRIPTS_DIR)
-	mkdir -p $(ROOT)/usr/lib/systemd/system
-	$(INSTALL) -m0755 files/iperf3.init $(ROOT)/$(INIT_SCRIPTS_DIR)/iperf3
-	$(INSTALL) -m0755 files/iperf3.service $(ROOT)/usr/lib/systemd/system/iperf3.service
-
diff --git a/common/src/foundation/iperf/files/iperf3.init b/common/src/foundation/iperf/files/iperf3.init
deleted file mode 100644
index aadbd3967..000000000
--- a/common/src/foundation/iperf/files/iperf3.init
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-#
-# chkconfig: - 40 15
-# description: Starts iperf3 service
-### BEGIN INIT INFO
-# Provides: iperf3
-# Required-Start: $local_fs $network
-# Short-Description: Start the iperf3 service
-# Description: Start the iperf3 service
-### END INIT INFO
-
-. /etc/rc.d/init.d/functions
-
-prog="iperf3"
-exe="/usr/bin/iperf3"
-opts="-s -D"
-piddir=/var/run/${prog}
-pidfile=${piddir}/${prog}.pid
-user=nobody
-
-if [ ! -d ${piddir} ]; then
-	mkdir -p ${piddir}
-	chown $user:$user ${piddir} 
-fi
-
-start() {
-	echo -n $"Starting $prog:"
-	daemon --user=$user --pidfile=$pidfile $exe $opts
-	RETVAL=$?
-	echo
-	return $RETVAL
-}
-stop() {
-	echo -n $"Shutting down $prog:"
-	killproc -p $pidfile $prog
-	RETVAL=$?
-	echo
-	return $RETVAL
-}
-
-usage() {
-	echo $"Usage: $0 {start|stop|status|restart}"
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart|force-reload)
-        stop ; start
-        ;;
-    status)
-	status -p $pidfile $prog
-	;;
-    *)
-	usage
-	exit 1
-	;;
-esac
-
-exit $?
diff --git a/common/src/foundation/iperf/files/iperf3.py b/common/src/foundation/iperf/files/iperf3.py
deleted file mode 100644
index d6e755d6c..000000000
--- a/common/src/foundation/iperf/files/iperf3.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/opt/stack/bin/python3
-#
-# @copyright@
-# Copyright (c) 2006 - 2019 Teradata
-# All rights reserved. Stacki(r) v5.x stacki.com
-# https://github.com/Teradata/stacki/blob/master/LICENSE.txt
-# @copyright@
-#
-
-import os
-import sys
-import subprocess
-import json
-
-def run(home, away):
-	#
-	# get my index into the 'hosts' array
-	#
-	client = away
-	s = subprocess.Popen(['iperf3',
-		'-J', '-t', '5', '-c', client],
-		stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-	o, e = s.communicate()
-
-	j = json.loads(o)
-
-	file = open('/tmp/nettest.debug', 'w')
-	file.write('j : %s\n\n' % j)
-
-	output = {}
-	output['home'] = home
-	output['away'] = client
-
-	out = j['end']['streams'][0]
-	file.write('out : %s\n\n' % out)
-
-	try:
-		output['sent'] = out['sender']['bits_per_second']
-	except:
-		output['sent'] = '0.0'
-
-	try:
-		output['recv'] = out['receiver']['bits_per_second']
-	except:
-		output['recv'] = '0.0'
-
-	file.write('%s\n' % output)
-	file.close()
-
-	return output
-
-array = sys.argv[1:]
-home = array[0]
-away = array[1]
-output = run(home,away)
-print(output)
diff --git a/common/src/foundation/iperf/files/iperf3.service b/common/src/foundation/iperf/files/iperf3.service
deleted file mode 100644
index e979c441a..000000000
--- a/common/src/foundation/iperf/files/iperf3.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=iperf3 server
-After=syslog.target network.target auditd.service
-
-[Service]
-ExecStart=/usr/bin/iperf3 -s
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/common/src/foundation/iperf/version.mk b/common/src/foundation/iperf/version.mk
deleted file mode 100644
index df128212f..000000000
--- a/common/src/foundation/iperf/version.mk
+++ /dev/null
@@ -1 +0,0 @@
-NAME = foundation-iperf
diff --git a/common/src/foundation/sc-im/LICENSE.txt b/common/src/foundation/sc-im/LICENSE.txt
deleted file mode 100644
index aae3a46f2..000000000
--- a/common/src/foundation/sc-im/LICENSE.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-=====
-sc-im
-=====
-
-Copyright (c) 2013-2015, Andrés Martinelli <andmarti@gmail.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:
-   This product includes software developed by Andrés Martinelli
-   <andmarti@gmail.com>.
-4. Neither the name of the Andrés Martinelli nor the
-   names of other contributors may be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY ANDRES MARTINELLI ''AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL ANDRES MARTINELLI BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/common/src/foundation/sc-im/Makefile b/common/src/foundation/sc-im/Makefile
deleted file mode 100644
index ec9fea296..000000000
--- a/common/src/foundation/sc-im/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# @copyright@
-# Copyright (c) 2006 - 2019 Teradata
-# All rights reserved. Stacki(r) v5.x stacki.com
-# https://github.com/Teradata/stacki/blob/master/LICENSE.txt
-# @copyright@
-#
-
-PKGROOT		= /opt/stack/$(ARCHIVENAME)
-ROLLROOT	= ../../../..
-DEPENDS.FILES	= $(ARCHIVENAME)-$(VERSION)-$(RELEASE).tgz
-
-include $(STACKBUILD)/etc/CCRules.mk
-
-bootstrap:
-ifeq ($(OS),sles)
-	echo "Name: ncursesw" > /usr/lib64/pkgconfig/ncursesw.pc
-	echo "Description: Old school GUI" >> /usr/lib64/pkgconfig/ncursesw.pc
-	echo "Version: 5.9-40"  >> /usr/lib64/pkgconfig/ncursesw.pc
-	echo "Libs: -lncursesw" >> /usr/lib64/pkgconfig/ncursesw.pc
-endif
-
-
-refresh:
-	git clone https://github.com/andmarti1424/sc-im.git
-	(cd $(ARCHIVENAME) ; git archive --format=tgz HEAD > \
-		../$(ARCHIVENAME)-$(VERSION)-`date +%Y%m%d`.tgz)
-
-build:
-	mkdir $(ARCHIVENAME)
-	(cd $(ARCHIVENAME) ; tar zvfx ../$(ARCHIVENAME)-$(VERSION)-$(RELEASE).tgz)
-	(cd $(ARCHIVENAME)/src ; $(MAKE) prefix=$(PKGROOT))
-
-install::
-	echo
-	echo
-	env
-	echo
-	echo
-	(cd $(ARCHIVENAME)/src ; $(MAKE) prefix=$(ROOT)/$(PKGROOT) install)
-
-clean::
-	rm -rf $(ARCHIVENAME)
-
diff --git a/common/src/foundation/sc-im/sc-im-0.4.0-20161021.tgz b/common/src/foundation/sc-im/sc-im-0.4.0-20161021.tgz
deleted file mode 120000
index c035e5658..000000000
--- a/common/src/foundation/sc-im/sc-im-0.4.0-20161021.tgz
+++ /dev/null
@@ -1 +0,0 @@
-../../../3rdparty/sc-im-0.4.0-20161021.tgz
\ No newline at end of file
diff --git a/common/src/foundation/sc-im/version.mk b/common/src/foundation/sc-im/version.mk
deleted file mode 100644
index 341c7d098..000000000
--- a/common/src/foundation/sc-im/version.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-NAME	= foundation-sc-im
-ARCHIVENAME	= sc-im
-VERSION	= 0.4.0
-RELEASE	= 20161021
diff --git a/common/src/foundation/stream/LICENSE.txt b/common/src/foundation/stream/LICENSE.txt
deleted file mode 100644
index cf1c8e002..000000000
--- a/common/src/foundation/stream/LICENSE.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-*=======================================================================
-*-----------------------------------------------------------------------
-* Copyright 1991-2003: John D. McCalpin
-*-----------------------------------------------------------------------
-* License:
-*  1. You are free to use this program and/or to redistribute
-*     this program.
-*  2. You are free to modify this program for your own use,
-*     including commercial use, subject to the publication
-*     restrictions in item 3.
-*  3. You are free to publish results obtained from running this
-*     program, or from works that you derive from this program,
-*     with the following limitations:
-*     3a. In order to be referred to as "STREAM benchmark results",
-*         published results must be in conformance to the STREAM
-*         Run Rules, (briefly reviewed below) published at
-*         http://www.cs.virginia.edu/stream/ref.html
-*         and incorporated herein by reference.
-*         As the copyright holder, John McCalpin retains the
-*         right to determine conformity with the Run Rules.
-*     3b. Results based on modified source code or on runs not in
-*         accordance with the STREAM Run Rules must be clearly
-*         labelled whenever they are published.  Examples of
-*         proper labelling include:
-*         "tuned STREAM benchmark results" 
-*         "based on a variant of the STREAM benchmark code"
-*         Other comparable, clear and reasonable labelling is
-*         acceptable.
-*     3c. Submission of results to the STREAM benchmark web site
-*         is encouraged, but not required.
-*  4. Use of this program or creation of derived works based on this
-*     program constitutes acceptance of these licensing restrictions.
-*  5. Absolutely no warranty is expressed or implied.
-*-----------------------------------------------------------------------
diff --git a/common/src/foundation/stream/Makefile b/common/src/foundation/stream/Makefile
deleted file mode 100644
index c404d73c8..000000000
--- a/common/src/foundation/stream/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# @copyright@
-# Copyright (c) 2006 - 2019 Teradata
-# All rights reserved. Stacki(r) v5.x stacki.com
-# https://github.com/Teradata/stacki/blob/master/LICENSE.txt
-# @copyright@
-
-PKGROOT		= /opt/stack
-ROLLROOT	= ../../../..
-DEPENDS.FILES	= stream.tar.gz
-DEPENDS.DIRS	= extras
-include $(STACKBUILD)/etc/CCRules.mk
-
-build:
-	$(TAR) xf stream.tar.gz
-	(			\
-		cd stream;	\
-		$(MAKE) $(BINARY); \
-	)
-
-install::
-	mkdir -p $(ROOT)/$(PKGROOT)/bin
-	mkdir -p $(ROOT)/$(PY.STACK)/salt/modules
-	$(INSTALL) -m0755 stream/$(BINARY) $(ROOT)/$(PKGROOT)/bin
-	$(INSTALL) -m0644 extras/stream.py $(ROOT)/$(PY.STACK)/salt/modules/stream.py
-
-clean::
-	rm -rf stream
-
diff --git a/common/src/foundation/stream/extras/stream.py b/common/src/foundation/stream/extras/stream.py
deleted file mode 100644
index 95f1b6e3f..000000000
--- a/common/src/foundation/stream/extras/stream.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# @copyright@
-# Copyright (c) 2006 - 2019 Teradata
-# All rights reserved. Stacki(r) v5.x stacki.com
-# https://github.com/Teradata/stacki/blob/master/LICENSE.txt
-# @copyright@
-
-import subprocess
-import re
-import os
-
-
-def __virtual__():
-	return "stream"
-
-
-def run():
-	cmd = ''
-
-	if os.path.exists('/opt/stack/bin/stream_c.exe'):
-		cmd = '/opt/stack/bin/stream_c.exe'
-	elif os.path.exists('/opt/stream/bin/stream'):
-		cmd = '/opt/stream/bin/stream'
-
-	p = subprocess.Popen([ cmd ], stdout=subprocess.PIPE,
-		stderr=subprocess.PIPE)
-
-	op = []
-	o, e = p.communicate()
-	whitelist = [
-		re.compile('^Copy:'),
-		re.compile('^Scale:'),
-		re.compile('^Add:'),
-		re.compile('^Triad:')
-	]
-	for i in o.split('\n'):
-		match = False
-		res = {}
-		for w in whitelist:
-			if w.match(i):
-				match = True
-				break
-		if match is False:
-			continue
-		t = i.split()
-		res['test'] = t[0].strip(':').lower()
-		res['best'] = t[1].strip()
-		res['avg'] = t[2].strip()
-		res['min'] = t[3].strip()
-		res['max'] = t[4].strip()
-		op.append(res)
-
-	return op
diff --git a/common/src/foundation/stream/stream.tar.gz b/common/src/foundation/stream/stream.tar.gz
deleted file mode 120000
index 3de77079d..000000000
--- a/common/src/foundation/stream/stream.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../../../3rdparty/stream.tar.gz
\ No newline at end of file
diff --git a/common/src/foundation/stream/version.mk b/common/src/foundation/stream/version.mk
deleted file mode 100644
index d33e8f158..000000000
--- a/common/src/foundation/stream/version.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-NAME		= foundation-stream
-VERSION		= 5.10
-BINARY		= stream_c.exe
diff --git a/common/src/order-stacki-sles11.mk b/common/src/order-stacki-sles11.mk
index 5ce59ff2d..1fa6c681a 100644
--- a/common/src/order-stacki-sles11.mk
+++ b/common/src/order-stacki-sles11.mk
@@ -6,10 +6,7 @@ SRCDIRS=stack/build  \
 	foundation/python-packages  \
 	foundation/MegaCLI  \
 	foundation/StorCLI  \
-	foundation/fio  \
-	foundation/iperf  \
 	foundation/rcs  \
-	foundation/stream  \
 	stack/ludicrous-speed  \
 	stack/mq  \
 	stack/storage-config  \
diff --git a/redhat/nodes/redhat-base.xml b/redhat/nodes/redhat-base.xml
index c0d540ece..da9032a78 100644
--- a/redhat/nodes/redhat-base.xml
+++ b/redhat/nodes/redhat-base.xml
@@ -44,9 +44,7 @@ else:
 
 <stack:package>grub2</stack:package>
 <stack:package>grub2-tools</stack:package>
-<!-- Network test from stacki-pro -->
-<stack:package>iperf3</stack:package>
-<stack:package>foundation-iperf</stack:package>
+
 <!-- Don't install the wireless or tv rpms -->
 <stack:package stack:enable="false">iwl*</stack:package>
 <stack:package stack:enable="false">ivtv*</stack:package>
diff --git a/redhat/nodes/server.xml b/redhat/nodes/server.xml
index f1080a93e..c4b0a22e0 100644
--- a/redhat/nodes/server.xml
+++ b/redhat/nodes/server.xml
@@ -77,9 +77,6 @@ for pallet in g.rolls:
 <stack:package>stack-build</stack:package>
 <stack:package>redhat-rpm-config</stack:package>
 
-<!-- text-based spreadsheet editor -->
-<stack:package>foundation-sc-im</stack:package>
-
 <!-- example spreadsheets -->
 <stack:package>stack-examples</stack:package>
 
diff --git a/sles/nodes/server.xml b/sles/nodes/server.xml
index 813a1f4c6..1bf5edb19 100644
--- a/sles/nodes/server.xml
+++ b/sles/nodes/server.xml
@@ -25,9 +25,6 @@ https://github.com/Teradata/stacki/blob/master/LICENSE.txt
 <stack:package>rpm-build</stack:package>
 <stack:package>stack-build</stack:package>
 
-<!-- text-based spreadsheet editor -->
-<stack:package>foundation-sc-im</stack:package>
-
 <!-- example spreadsheets -->
 <stack:package>stack-examples</stack:package>