diff --git a/zorg/buildbot/builders/PollyBuilder.py b/zorg/buildbot/builders/PollyBuilder.py
--- a/zorg/buildbot/builders/PollyBuilder.py
+++ b/zorg/buildbot/builders/PollyBuilder.py
@@ -1,8 +1,3 @@
-import os
-
-import buildbot
-import buildbot.process.factory
-from buildbot.steps.source import SVN, Git
 from buildbot.steps.shell import Configure, ShellCommand
 from buildbot.process.properties import WithProperties
 
@@ -132,99 +127,3 @@
                                env=merged_env))
 
     return f
-
-# DEPRECATED: PollyBuilder.AddExternalPollyBuildFactory has been deprecated and will be removed soon.
-def AddExternalPollyBuildFactory(f, llvm_installdir, build_type = "Release"):
-    polly_srcdir = 'polly.src'
-    polly_objdir = 'polly.obj'
-    polly_installdir = 'polly.install'
-
-    # Determine the build directory.
-    f.addStep(buildbot.steps.shell.SetProperty(name="get_builddir",
-                                               command=["pwd"],
-                                               property="builddir",
-                                               description="set build dir",
-                                               workdir="."))
-    f.addStep(SVN(name='svn-polly',
-                  mode='update',
-                  baseURL='http://llvm.org/svn/llvm-project/polly/',
-                  defaultBranch='trunk',
-                  workdir=polly_srcdir))
-
-    # Create configuration files with cmake
-    f.addStep(ShellCommand(name="create-build-dir",
-                               command=["mkdir", "-p", polly_objdir],
-                               haltOnFailure=False,
-                               description=["create build dir"],
-                               workdir="."))
-    cmakeCommand = ["cmake", "../%s" % polly_srcdir]
-
-    cmakeCommand.append('-DCMAKE_PREFIX_PATH=../%s/lib/cmake/llvm' % llvm_installdir)
-    cmakeCommand.append('-DCMAKE_BUILD_TYPE=' + build_type)
-    cmakeCommand.append('-DCMAKE_INSTALL_PREFIX=../' + polly_installdir)
-    cmakeCommand.append('-DCMAKE_COLOR_MAKEFILE=OFF')
-
-    f.addStep(ShellCommand(name="cmake-configure",
-                               command=cmakeCommand,
-                               haltOnFailure=False,
-                               description=["cmake configure"],
-                               workdir=polly_objdir))
-    # Build Polly
-    f.addStep(ShellCommand(name="build-polly",
-                               command=["make"],
-                               haltOnFailure=True,
-                               description=["build polly"],
-                               workdir=polly_objdir))
-    f.addStep(ShellCommand(name="remove-polly-install",
-                           command=["rm", "-rf", polly_installdir],
-                           haltOnFailure=True,
-                           description=["remove polly install"],
-                           workdir="."))
-    f.addStep(ShellCommand(name="install-polly",
-                           command=["make", "install"],
-                           haltOnFailure=True,
-                           description=["install polly"],
-                           workdir=polly_objdir))
-
-# DEPRECATED: PollyBuilder.getPollyLNTFactory has been deprecated and will be removed soon.
-def getPollyLNTFactory(triple, nt_flags, xfails=[], clean=False, test=False,
-                       build_type="Release", extra_cmake_args=[], **kwargs):
-    lnt_args = {}
-    lnt_arg_names = ['submitURL', 'package_cache', 'testerName', 'reportBuildslave']
-
-    for argname in lnt_arg_names:
-        if argname in kwargs:
-            lnt_args[argname] = kwargs.pop(argname)
-
-    llvm_install_dir = 'stage1.install'
-
-    f = ClangBuilder.getClangCMakeBuildFactory(
-        test=False,
-        useTwoStage=False,
-        clean=clean,
-        checkout_clang_tools_extra=False,
-        checkout_compiler_rt=False,
-        extra_cmake_args=extra_cmake_args,
-        stage1_config=build_type)
-
-    f.addStep(ShellCommand(name="install-llvm-and-clang",
-                           command=["ninja", "install"],
-                           haltOnFailure=True,
-                           description=["install llvm and clang"],
-                           workdir="stage1"))
-
-    AddExternalPollyBuildFactory(f, llvm_install_dir, build_type)
-
-    nt_flags.append('--cflag=' + '-Xclang')
-    nt_flags.append('--cflag=' + '-load')
-    nt_flags.append('--cflag=' + '-Xclang')
-    nt_flags.append(WithProperties("--cflag=%s/polly.install/lib/LLVMPolly.so",
-                                   'builddir'))
-
-    # Add an LNT test runner.
-    LNTBuilder.AddLNTTestsToFactory(f, nt_flags,
-                                    cc_path=(llvm_install_dir+'/bin/clang'),
-                                    cxx_path=(llvm_install_dir+'/bin/clang++'),
-                                    **lnt_args);
-
-    return f