diff --git a/src/script_opt/CPP/bare-embedded-build b/src/script_opt/CPP/bare-embedded-build
deleted file mode 100755
index af0cf37a9a..0000000000
--- a/src/script_opt/CPP/bare-embedded-build
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-build=../../../build
-
-cd $build
-export -n ZEEK_USE_CPP ZEEK_ADD_CPP
-export ZEEK_HASH_DIR=.
-echo | src/zeek -b -O gen-C++
-ninja || echo Bare embedded build failed
diff --git a/src/script_opt/CPP/eval-test-suite b/src/script_opt/CPP/eval-test-suite
deleted file mode 100755
index b1856f1156..0000000000
--- a/src/script_opt/CPP/eval-test-suite
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-base=../../..
-test=$base/testing/btest
-so=$base/src/script_opt/CPP
-build=$base/build
-gen=CPP-gen-addl.h
-
-export -n ZEEK_ADD_CPP
-cd $test
-rm -rf .tmp
-../../auxil/btest/btest -j -a cpp -f cpp-test.diag $1
diff --git a/src/script_opt/CPP/full-embedded-build b/src/script_opt/CPP/full-embedded-build
deleted file mode 100755
index de4ac500cb..0000000000
--- a/src/script_opt/CPP/full-embedded-build
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-build=../../../build
-
-cd $build
-export -n ZEEK_USE_CPP ZEEK_ADD_CPP
-export ZEEK_HASH_DIR=.
-echo | src/zeek -O gen-C++
-ninja || echo Full embedded build failed
diff --git a/src/script_opt/CPP/non-embedded-build b/src/script_opt/CPP/non-embedded-build
deleted file mode 100755
index ec925184e4..0000000000
--- a/src/script_opt/CPP/non-embedded-build
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-cd ../../../build
-echo >CPP-gen.cc
-ninja || echo Non-embedded build failed
diff --git a/src/script_opt/CPP/single-full-test.sh b/src/script_opt/CPP/single-full-test.sh
deleted file mode 100755
index 71fc927b27..0000000000
--- a/src/script_opt/CPP/single-full-test.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-echo $1
-
-base=../../..
-test=$base/testing/btest
-build=$base/build
-gen=CPP-gen.cc
-
-./non-embedded-build >$build/errs 2>&1 || echo non-embedded build failed
-
-export -n ZEEK_USE_CPP
-export ZEEK_HASH_DIR=$test ZEEK_GEN_CPP=
-cd $test
-../../auxil/btest/btest $1 >jbuild-$1.out 2>&1
-grep -c '^namespace' $gen
-mv $gen $build/
-cd $build
-ninja >&errs || echo build for $1 failed
-
-export -n ZEEK_GEN_CPP
-cd $test
-rm -rf .tmp
-../../auxil/btest/btest -a cpp -f cpp-test.$1.diag $1
diff --git a/src/script_opt/CPP/single-test.sh b/src/script_opt/CPP/single-test.sh
deleted file mode 100755
index afc552ce03..0000000000
--- a/src/script_opt/CPP/single-test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-
-echo $1
-
-base=../../..
-test=$base/testing/btest
-build=$base/build
-gen=CPP-gen.cc
-
-export -n ZEEK_USE_CPP
-export ZEEK_HASH_DIR=$test ZEEK_ADD_CPP=
-cd $test
-cp $build/CPP-hashes.dat .
-../../auxil/btest/btest $1 >cpp-build-$1.out 2>&1
-grep -c '^namespace' $gen
-mv $gen $build
-cd $build
-ninja >&errs || echo build for $1 failed
-
-export -n ZEEK_ADD_CPP
-cd $test
-rm -rf .tmp
-../../auxil/btest/btest -j -a cpp -f cpp-test.$1.diag $1
diff --git a/src/script_opt/CPP/test-suite-build b/src/script_opt/CPP/test-suite-build
deleted file mode 100755
index 0e06a7ba71..0000000000
--- a/src/script_opt/CPP/test-suite-build
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh
-
-base=../../..
-test=$base/testing/btest
-so=$base/src/script_opt/CPP
-build=$base/build
-gen=CPP-gen-addl.h
-
-export -n ZEEK_USE_CPP
-export ZEEK_HASH_DIR=$test ZEEK_ADD_CPP=
-cd $test
-cp $build/CPP-hashes.dat .
-echo >$gen
-../../auxil/btest/btest $1 >test-suite-build.out 2>&1
-grep -c '^namespace' $gen
-mv $gen $so
-cd $build
-ninja >&errs || echo test suite build failed
diff --git a/src/script_opt/CPP/update-single-test.sh b/src/script_opt/CPP/update-single-test.sh
deleted file mode 100755
index 35fb2a2d77..0000000000
--- a/src/script_opt/CPP/update-single-test.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-base=../../..
-test=$base/testing/btest
-build=$base/build
-gen=CPP-gen.cc
-
-export -n ZEEK_USE_CPP
-export ZEEK_HASH_DIR=$test ZEEK_ADD_CPP=
-cd $test
-cp $build/CPP-hashes.dat .
-../../auxil/btest/btest $1 >jbuild-$1.out 2>&1
-grep -c '^namespace' $gen
-mv $gen $build/
-cd $build
-ninja >&errs || echo build for $1 failed
-
-export -n ZEEK_ADD_CPP
-cd $test
-rm -rf .tmp
-../../auxil/btest/btest -U -a cpp -f cpp-test.$1.diag.update $1