diff --git a/devel/tinderbox/buildbot/master/master.cfg b/devel/tinderbox/buildbot/master/master.cfg
index be103fb64..b931e317f 100644
--- a/devel/tinderbox/buildbot/master/master.cfg
+++ b/devel/tinderbox/buildbot/master/master.cfg
@@ -596,22 +596,16 @@ slave_ubuntu = ["nori"]
 slave_osx = ["kokoro"]
 slave_osx_ppc = ["mokona"]
 
-#Ubuntux8632    = { 'name': "Ubuntu-x86_32",  'slavenames': slave_ubuntu,  'builddir': "full_Ubuntu-x86_32",   'factory': flinux }
-
 Windowsx8632   = { 'name': "Windows-x86_32", 'slavenames': slave_win,     'builddir': "full_Windows-x86_32",  'factory': fwin }
 Windowsx8664   = { 'name': "Windows-x86_64", 'slavenames': slave_win,     'builddir': "full_Windows-x86_64", 'factory': fwin64 }
 DarwinPPC      = { 'name': "Darwin-PPC",     'slavenames': slave_osx_ppc, 'builddir': "full_Darwin-PPC",      'factory': fosx_ppc }
 Darwinx8664    = { 'name': "Darwin-x86_64",  'slavenames': slave_osx,     'builddir': "full_Darwin-x86_64",   'factory': fosx }
-#FreeBSDx8632   = { 'name': "FreeBSD-x86_32", 'slavenames': slave_freebsd, 'builddir': "full_FreeBSD-x86_32",  'factory': ffbsd }
 FreeBSDx8664   = { 'name': "FreeBSD-x86_64", 'slavenames': slave_freebsd, 'builddir': "full_FreeBSD-x86_64",  'factory': ffbsd }
 Ubuntux8664    = { 'name': "Ubuntu-x86_64",  'slavenames': slave_ubuntu,  'builddir': "full_Ubuntu-x86_64",   'factory': flinux }
 Debianx8632    = { 'name': "Debian-x86_32",  'slavenames': slave_debian,  'builddir': "full_Debian-x86_32",   'factory': flinux }
-#Debianx8664    = { 'name': "Debian-x86_64",  'slavenames': slave_debian,  'builddir': "full_Debian-x86_64",   'factory': flinux }
 
 UNIXDist    = { 'name': "UNIX Dist",  'slavenames': slave_debian + slave_ubuntu + slave_freebsd,  'builddir': "UNIX_Dist",   'factory': funix_dist }
 
-#Ubuntux8632,
-
 c['builders'] = [
 Windowsx8632,
 Windowsx8664,
@@ -623,12 +617,6 @@ Debianx8632,
 UNIXDist
 ]
 
-#FreeBSDx8632,
-#Debianx8664
-
-#"Ubuntu-x86_32",
-
-
 builder_name_windows = [
 "Windows-x86_32",
 "Windows-x86_64"
@@ -645,9 +633,6 @@ builder_name_darwin = [
 "Darwin-x86_64"
 ]
 
-#"FreeBSD-x86_32",
-#"Debian-x86_64"
-
 
 ############
 # SCHEDULERS