Index: zorg/buildbot/builders/UnifiedTreeBuilder.py
===================================================================
--- zorg/buildbot/builders/UnifiedTreeBuilder.py
+++ zorg/buildbot/builders/UnifiedTreeBuilder.py
@@ -163,84 +163,6 @@
                            **kwargs # Pass through all the extra arguments.
                            ))
 
-def getCmakeBuildFactory(
-           depends_on_projects = None,
-           llvm_srcdir = None,
-           obj_dir = None,
-           install_dir = None,
-           clean = False,
-           extra_configure_args = None,
-           env = None,
-           **kwargs):
-
-    # Prepare environmental variables. Set here all env we want everywhere.
-    merged_env = {
-        'TERM' : 'dumb' # Be cautious and disable color output from all tools.
-    }
-    if env is not None:
-        # Overwrite pre-set items with the given ones, so user can set anything.
-        merged_env.update(env)
-
-    cleanBuildRequested = lambda step: step.build.getProperty("clean") or clean
-
-    f = getLLVMBuildFactoryAndSVNSteps(
-            depends_on_projects=depends_on_projects,
-            llvm_srcdir=llvm_srcdir,
-            obj_dir=obj_dir,
-            install_dir=install_dir,
-            cleanBuildRequested=cleanBuildRequested,
-            **kwargs) # Pass through all the extra arguments.
-
-    addCmakeSteps(
-        f,
-        cleanBuildRequested=cleanBuildRequested,
-        obj_dir=f.obj_dir,
-        install_dir=f.install_dir,
-        extra_configure_args=extra_configure_args,
-        env=env,
-        **kwargs)
-
-    return f
-
-def getCmakeWithNinjaBuildFactory(
-           depends_on_projects = None,
-           llvm_srcdir = None,
-           obj_dir = None,
-           install_dir = None,
-           clean = False,
-           extra_configure_args = None,
-           env = None,
-           **kwargs):
-
-    # Make a local copy of the configure args, as we are going to modify that.
-    if extra_configure_args:
-        cmake_args = extra_configure_args[:]
-    else:
-        cmake_args = list()
-
-    # Some options are required for this build no matter what.
-    CmakeCommand.applyRequiredOptions(cmake_args, [
-        ('-G',                      'Ninja'),
-        ])
-
-    f = getCmakeBuildFactory(
-            depends_on_projects=depends_on_projects,
-            llvm_srcdir=llvm_srcdir,
-            obj_dir=obj_dir,
-            install_dir=install_dir,
-            clean=clean,
-            extra_configure_args=cmake_args,
-            env=env,
-            **kwargs) # Pass through all the extra arguments.
-
-    addNinjaSteps(
-           f,
-           obj_dir=obj_dir,
-           env=env,
-           **kwargs)
-
-    return f
-
 def getCmakeWithNinjaMultistageBuildFactory(
            depends_on_projects = None,
            llvm_srcdir = None,