diff --git a/Tools/buildbot/build-amd64.bat b/Tools/buildbot/build-amd64.bat
deleted file mode 100644
index f77407bcf70..00000000000
--- a/Tools/buildbot/build-amd64.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@rem Formerly used by the buildbot "compile" step.
-@echo This script is no longer used and may be removed in the future.
-@echo To get the same effect as this script, use
-@echo     PCbuild\build.bat -d -e -k -p x64
-call "%~dp0build.bat" -p x64 %*
diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
deleted file mode 100644
index b53c7c1038d..00000000000
--- a/Tools/buildbot/clean-amd64.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@rem Formerly used by the buildbot "clean" step.
-@echo This script is no longer used and may be removed in the future.
-@echo To get the same effect as this script, use `clean.bat` from this
-@echo directory and pass `-p x64` as two arguments.
-call "%~dp0clean.bat" -p x64 %*
diff --git a/Tools/buildbot/external-amd64.bat b/Tools/buildbot/external-amd64.bat
deleted file mode 100644
index bfaef055f54..00000000000
--- a/Tools/buildbot/external-amd64.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo This script is no longer used and may be removed in the future.
-@echo Please use PCbuild\get_externals.bat instead.
-@"%~dp0..\..\PCbuild\get_externals.bat" %*
diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat
deleted file mode 100644
index e48329c0b30..00000000000
--- a/Tools/buildbot/test-amd64.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@rem Formerly used by the buildbot "test" step.
-@echo This script is no longer used and may be removed in the future.
-@echo To get the same effect as this script, use
-@echo     PCbuild\rt.bat -q -d -x64 -uall -rwW
-@echo or use `test.bat` in this directory and pass `-x64` as an argument.
-call "%~dp0test.bat" -x64 %*