diff --git a/tools/clang-format/clang-format-all.sh b/tools/clang-format/clang-format-all.sh
deleted file mode 100755
index 62228b0b015..00000000000
--- a/tools/clang-format/clang-format-all.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-source $(dirname $0)/config.sh
-cd $(dirname $0)/../..
-for dir in src test include
-do
-  find $dir -name '*.c' -or -name '*.cc' -or -name '*.h' | xargs $CLANG_FORMAT -i
-done
-
diff --git a/tools/clang-format/config.sh b/tools/clang-format/config.sh
deleted file mode 100644
index 3adf2678e7a..00000000000
--- a/tools/clang-format/config.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-CLANG_FORMAT=clang-format-3.5
-
-set -ex
-
-if not hash $CLANG_FORMAT 2>/dev/null; then
-  echo "$CLANG_FORMAT is needed but not installed"
-  echo "perhaps try:"
-  echo "  sudo apt-get install $CLANG_FORMAT"
-  exit 1
-fi
-
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 4f2f10f15c8..b7248e524b4 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -204,7 +204,7 @@ class TestCache(object):
 
 def _build_and_run(check_cancelled, newline_on_success, cache):
   """Do one pass of building & running tests."""
-  # build latest, sharing cpu between the various makes
+  # build latest sequentially
   if not jobset.run(build_steps, maxjobs=1):
     return 1