Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1034,14 +1034,6 @@
          'factory': ClangLTOBuilder.getClangWithLTOBuildFactory(jobs=72, lto='thin'),
          'category'   : 'lld'},
 
-        {'name': "clang-with-thin-lto-windows",
-         'slavenames' :["windows-lld-thinlto-1"],
-         'builddir': "clang-with-thin-lto-windows",
-         'factory': AnnotatedBuilder.getAnnotatedBuildFactory(
-             script="clang-with-thin-lto-windows.py",
-             depends_on_projects=['llvm', 'clang', 'lld']),
-         'category'   : 'lld'},
-
         {'name' : "clang-lld-x86_64-2stage",
          'slavenames' : ["am1i-slv1", "am1i-slv3", "am1i-slv4"],
          'builddir' : "clang-lld-x86_64-2stage",
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -196,8 +196,6 @@
         create_slave("windows-gcebot1", properties={'jobs': 8}, max_builds=1),
         # Windows Server 2012 x86_64 32-core GCE instance
         create_slave("windows-gcebot2", properties={'jobs': 32}, max_builds=1),
-        # Windows Server 2016 x86_64 16-core GCE instance
-        create_slave("windows-lld-thinlto-1", max_builds=1),
 
         # Ubuntu x86-64, 51GiB System memory Intel(R) Xeon(R) CPU @ 2.60GHz
         create_slave("lldb-build1-ubuntu-1404", properties={'jobs': 32, 'loadaverage':32}, max_builds=1),
Index: zorg/buildbot/builders/annotated/clang-with-thin-lto-windows.py
===================================================================
--- zorg/buildbot/builders/annotated/clang-with-thin-lto-windows.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-import annotated_builder
-
-
-def main(argv):
-    ap = annotated_builder.get_argument_parser()
-    args = ap.parse_args(argv[1:])
-
-    stages = 2
-    stage1_extra_cmake_args = [
-        '-DCMAKE_BUILD_TYPE=Release',
-        '-DLLVM_TARGETS_TO_BUILD=X86',
-    ]
-    extra_cmake_args = stage1_extra_cmake_args + [
-        '-DLLVM_ENABLE_LTO=thin',
-        '-DLLVM_USE_LINKER=lld',
-    ]
-    check_targets = ['check-llvm', 'check-clang', 'check-lld']
-    check_stages = [True] * stages
-    check_stages[0] = False
-    if os.name == 'nt':
-        compiler = 'clang-cl'
-        linker = 'lld-link'
-    else:
-        compiler = 'clang'
-        linker = 'ld.lld'
-
-    builder = annotated_builder.AnnotatedBuilder()
-    builder.run_steps(stages=stages,
-                      extra_cmake_args=extra_cmake_args,
-                      stage1_extra_cmake_args=stage1_extra_cmake_args,
-                      check_targets=check_targets,
-                      check_stages=check_stages,
-                      compiler=compiler,
-                      linker=linker,
-                      jobs=args.jobs)
-
-
-if __name__ == '__main__':
-    sys.path.append(os.path.dirname(__file__))
-    sys.exit(main(sys.argv))