diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
deleted file mode 100644
index b70d01f9..00000000
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ /dev/null
@@ -1,145 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-ARCH="amd64"
-TYPE="experimental"
-host=$(hostname)
-
-source /etc/catalyst/release/build.env
-
-SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
-
-SETS="
-	multilib minimal_multilib
-	nomultilib minimal_nomultilib
-	x32
-	hardened_multilib minimal_hardened_multilib
-	hardened_nomultilib minimal_hardened_nomultilib
-	hardened_multilib_selinux hardened_nomultilib_selinux
-"
-
-SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
-SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
-SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
-SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
-
-SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
-
-SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
-SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
-SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
-SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec"
-
-SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
-SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
-SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
-
-EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
-
-update_symlinks() {
-	# Symlink the latest stages3 to build from
-	for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
-		pushd "${d}" >/dev/null || exit
-		for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
-			# 20yymmddThhmmssZ
-			# 20yymmddhhmmss
-			# 20yymmdd
-			# 20yy.n
-			of=$(perl -p \
-				-e 's/20\d{6}T\d{6}Z/latest/g;' \
-				-e 's/20\d{6}\d{6}/latest/g;' \
-				-e 's/20\d{6}/latest/g;' \
-				-e 's/20\d{2}\.\d{2}/latest/g;' \
-				<<<"$f")
-			ln -svf "$f" "$of"
-		done
-		popd >/dev/null || exit
-	done
-}
-
-upload() {
-	echo " ** Uploading $@"
-	rsync \
-	-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
-	-a \
-	--omit-dir-times \
-	--delay-updates \
-	"$@" \
-	"${UPLOAD_DEST}"
-}
-
-post_build() {
-	local set=$1 spec=$2
-
-	case $HOSTNAME in
-		# If you ever need to ensure it's copied somewhere local, drop a hostname in here!
-		LOCAL)
-			DEST_DEFAULT=${BUILD_DESTDIR_BASE}
-			DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
-			;;
-		*)
-			DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-			DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
-			;;
-	esac
-
-	pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
-	UPLOAD_DEST=${DEST_DEFAULT}
-	case ${spec} in
-	stage3.spec)
-		upload stage3-amd64-${TIMESTAMP}.tar.xz*
-		;;
-	installcd-stage2-minimal.spec)
-		upload install-amd64-minimal-${TIMESTAMP}.iso*
-		;;
-	stage4-minimal.spec)
-		upload stage4-amd64-minimal-${TIMESTAMP}.tar.xz*
-		;;
-	stage3-nomultilib.spec)
-		upload stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz*
-		;;
-	stage4-nomultilib-minimal.spec)
-		upload stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz*
-		;;
-	stage3-x32.spec)
-		upload stage3-x32-${TIMESTAMP}.tar.xz*
-		;;
-	esac
-	popd >/dev/null || exit
-
-	pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
-	UPLOAD_DEST=${DEST_HARDENED}
-	case ${spec} in
-	hardened/stage3.spec)
-		upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*
-		;;
-	hardened/admincd-stage2.spec)
-		upload admincd-amd64-${TIMESTAMP}.iso*
-		;;
-	hardened/stage4-minimal.spec)
-		upload stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz*
-		;;
-	hardened/stage3-nomultilib.spec)
-		upload stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz*
-		;;
-	hardened/stage4-nomultilib-minimal.spec)
-		upload stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz*
-		;;
-	hardened/stage3-selinux.spec)
-		upload stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz*
-		;;
-	hardened/admincd-stage2-selinux.spec)
-		upload admincd-amd64-${TIMESTAMP}.iso*
-		;;
-	hardened/stage3-selinux-nomultilib.spec)
-		upload stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz*
-		;;
-	esac
-	popd >/dev/null || exit
-}
-
-# vim:ft=sh:
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
deleted file mode 100644
index 10789143..00000000
--- a/tools/catalyst-auto-x86-experimental.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-ARCH="x86"
-TYPE="experimental"
-host=$(hostname)
-
-source /etc/catalyst/release/build.env
-
-SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
-
-SETS="
-	i486
-	i686
-	hardened
-"
-
-SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
-SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
-
-SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
-SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
-
-EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
-
-update_symlinks() {
-	# Symlink the latest stages3 to build from
-	for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
-		pushd "${d}" >/dev/null || exit
-		for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
-			# 20yymmddThhmmssZ
-			# 20yymmddhhmmss
-			# 20yymmdd
-			# 20yy.n
-			of=$(perl -p \
-				-e 's/20\d{6}T\d{6}Z/latest/g;' \
-				-e 's/20\d{6}\d{6}/latest/g;' \
-				-e 's/20\d{6}/latest/g;' \
-				-e 's/20\d{2}\.\d{2}/latest/g;' \
-				<<<"$f")
-			ln -svf "$f" "$of"
-		done
-		popd >/dev/null || exit
-	done
-}
-
-upload() {
-	echo " ** Uploading $@"
-	rsync \
-	-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
-	-a \
-	--omit-dir-times \
-	--delay-updates \
-	"$@" \
-	"${UPLOAD_DEST}"
-}
-
-post_build() {
-	local set=$1 spec=$2
-
-	case $HOSTNAME in
-		# If you ever need to ensure it's copied somewhere local, drop a hostname in here!
-		LOCAL)
-			DEST_DEFAULT=${BUILD_DESTDIR_BASE}
-			DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
-			;;
-		*)
-			DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
-			DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
-			;;
-	esac
-
-	pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
-	UPLOAD_DEST=${DEST_DEFAULT}
-	case ${spec} in
-	stage3.spec)
-		upload stage3-i486-${TIMESTAMP}.tar.xz*
-		;;
-	installcd-stage2-minimal.spec)
-		upload install-x86-minimal-${TIMESTAMP}.iso*
-		;;
-	i686/stage3.spec)
-		upload stage3-i686-${TIMESTAMP}.tar.xz*
-		;;
-	esac
-	popd >/dev/null || exit
-
-	pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
-	UPLOAD_DEST=${DEST_HARDENED}
-	case ${spec} in
-	hardened/stage3.spec)
-		upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*
-		;;
-	hardened/admincd-stage2.spec)
-		upload admincd-x86-${TIMESTAMP}.iso*
-		;;
-	esac
-	popd >/dev/null || exit
-}
-
-# vim:ft=sh: