diff --git a/master.cfg b/master.cfg
index bd70f3c..e26659a 100644
--- a/master.cfg
+++ b/master.cfg
@@ -25,25 +25,6 @@ gdb_web_base = os.path.expanduser(os.path.join(basedir, 'public_html',
                                                'results'))
 set_web_base (gdb_web_base)
 
-#all_gdb_builders = [
-#    make_gdb_builder ('f20', 'x86_64'),
-#    make_gdb_builder ('f14', 'x86_64', 'dwarf4'),
-#    make_gdb_builder ('f14', 'x86_64', 'index'),
-#    make_gdb_builder ('f20', 'x86_64', 'm32'),
-#    make_gdb_builder ('f20', 'x86_64', 'gdbserver'),
-#    ]
-
-#all_gdb_builder_names = []
-#c['slaves'] = []
-
-#from buildbot.buildslave import BuildSlave
-#for builder in all_gdb_builders:
-#	name = builder['name']
-#	all_gdb_builder_names.append(name)
-#	c['slaves'].append(BuildSlave(name, name + '-password', max_builds = 1))
-#    c['slaves'] = [BuildSlave("gdb-slave", "pwdgdb")]
-
-
 # 'protocols' contains information about protocols which master will use for
 # communicating with slaves.
 # You must define at least 'port' option that slaves could connect to your master
@@ -51,7 +32,6 @@ set_web_base (gdb_web_base)
 # 'port' must match the value configured into the buildslaves (with their
 # --master option)
 c['protocols'] = {'pb': {'port': 9989}}
-#c['protocols'] = {"pb": {"port": "tcp:10000:interface=127.0.0.1"}}
 
 ####### CHANGESOURCES
 
@@ -61,14 +41,10 @@ c['protocols'] = {'pb': {'port': 9989}}
 from buildbot.changes.gitpoller import GitPoller
 c['change_source'] = []
 c['change_source'].append(GitPoller(
-#	repourl = 'git://sourceware.org/git/binutils-gdb.git',
-	repourl = 'file:///home/buildbot/binutils-gdb',
-	workdir='/home/buildbot/my-binutils-gdb',
+	repourl = 'git://sourceware.org/git/binutils-gdb.git',
+	workdir = '/home/buildbot/buildbot-master-binutils-gdb',
 	branches= [ 'master' ],
 	pollinterval=30))
-#        'git://github.com/buildbot/pyflakes.git',
-#        workdir='gitpoller-workdir', branch='master',
-#        pollinterval=300))
 
 ####### SCHEDULERS
 
@@ -79,25 +55,6 @@ from buildbot.schedulers.basic import SingleBranchScheduler, AnyBranchScheduler
 from buildbot.schedulers.forcesched import ForceScheduler
 from buildbot.changes import filter
 
-#c['schedulers'] = []
-
-#branch_filter = filter.ChangeFilter(branch = ['master'])
-#c['schedulers'].append(AnyBranchScheduler(name="all",
-#                                          change_filter = branch_filter,
-#                                          treeStableTimer = None,
-#                                          builderNames = all_gdb_builder_names,
-#                                          properties = { 'isTryBuilder' : 'no' }))
-
-#c['schedulers'] = []
-#c['schedulers'].append(SingleBranchScheduler(
-#                            name="all",
-#                            change_filter=filter.ChangeFilter(branch='master'),
-#                            treeStableTimer=None,
-#                            builderNames=["runtests"]))
-#c['schedulers'].append(ForceScheduler(
-#                            name="force",
-#                            builderNames=["runtests"]))
-
 ####### BUILDERS
 
 # The 'builders' list defines the Builders, which tell Buildbot how to perform a build:
@@ -145,7 +102,7 @@ authz_cfg=authz.Authz(
 #    auth=auth.BasicAuth([("t","t")]),
     gracefulShutdown = False,
     forceBuild = True, # use this to test your slave once it is set up
-#    forceAllBuilds = 'auth',  # ..or this
+    forceAllBuilds = True,  # ..or this
     pingBuilder = False,
     stopBuild = True,
     stopAllBuilds = True,