diff --git a/master/buildbot/test/__init__.py b/master/buildbot/test/__init__.py
index 4ffeac61e9c..7cf9e64e453 100644
--- a/master/buildbot/test/__init__.py
+++ b/master/buildbot/test/__init__.py
@@ -20,11 +20,6 @@
 from buildbot import monkeypatches
 monkeypatches.patch_all(for_tests=True)
 
-# we set pedantic mode for the unit tests
-# which will ensure that it is always json-able
-from buildbot.util import namespace
-namespace.pedantic = True
-
 # import mock so we bail out early if it's not installed
 try:
     import mock
diff --git a/master/buildbot/test/unit/test_util_namespace.py b/master/buildbot/test/unit/test_util_namespace.py
deleted file mode 100644
index a7300bc39d2..00000000000
--- a/master/buildbot/test/unit/test_util_namespace.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# This file is part of Buildbot.  Buildbot is free software: you can
-# redistribute it and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation, version 2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright Buildbot Team Members
-
-from twisted.trial import unittest
-from buildbot.util import namespace
-import pickle
-from buildbot.util import json
-
-class Namespace(unittest.TestCase):
-
-    def test_basic(self):
-        n = namespace.Namespace({'a':{'b':{'c':1}}})
-
-        self.assertEqual(n.a.b.c, 1)
-        self.assertEqual(n['a']['b']['c'], 1)
-        self.assertEqual(n['a'].b['c'], 1)
-        self.assertEqual(n['a']['b'].c, 1)
-        self.assertEqual(n['a'].b.c, 1)
-        self.assertEqual(list(n.keys()),['a'])
-        self.assertEqual(list(n.a.b.values()),[1])
-        self.assertEqual(list(n.a.b.items()),[('c',1)])
-        n.a.b.c = 2
-        self.assertEqual(n.has_key('a'),True)
-        self.assertEqual(n.has_key('b'),False)
-
-        self.assertEqual(n['a']['b']['c'], 2)
-        n.a.b = {'d':3}
-        self.assertEqual(n.a.b.d, 3)
-        n.a.b = namespace.Namespace({'e':4})
-        self.assertEqual(n.a.b.e, 4)
-        self.assertRaises(KeyError, lambda : n.a.b.d == 3)
-        self.assertEqual(namespace.Namespace(1),1)
-        self.assertEqual(namespace.Namespace([1]),[1])
-        self.assertEqual(namespace.Namespace("1"),"1")
-        self.assertEqual(namespace.Namespace(["1"]),["1"])
-
-        self.assertRaises(KeyError, lambda : n["__getitem__"])
-        n.a['b'] = {'f':5}
-        self.assertEqual(n.a.b.f, 5)
-
-    def test_nonzero(self):
-        n = namespace.Namespace({'a':{'b':{'c':1}}})
-        self.failUnless(n)
-        n = namespace.Namespace({})
-        self.failIf(n)
-
-    def test_list(self):
-        n = namespace.Namespace([{'a':{'b':{'c':1}}},{'a':{'b':{'c':2}}}])
-        self.assertEqual(n[0].a.b.c, 1)
-        self.assertEqual(n[1].a.b.c, 2)
-        for i in n:
-            self.assertEqual(i.a.b.c, i.a.b.c)
-
-    def test_jsondump(self):
-        s = '[{"a": {"b": {"c": 1}}}, {"a": {"b": {"c": 2}}}]'
-        n = namespace.Namespace(json.loads(s))
-        self.assertEqual(json.dumps(n),s)
-
-    def test_prettyprint(self):
-        n = namespace.Namespace({'a':[{'b':{'c':1}}]})
-        expected = """\
-{
-    "a": [
-        {
-            "b": {
-                "c": 1
-            }
-        }
-    ]
-}"""
-        self.assertEqual(repr(n), expected)
-        expected = """\
-a -> list
-a[i] -> dict
-a[i].b -> dict
-a[i].b.c -> int
-"""
-        self.assertEqual(namespace.documentNamespace(n), expected)
-
-    def test_pickle(self):
-        n = namespace.Namespace([{'a':{'b':{'c':1}}},{'a':{'b':{'c':2}}}])
-        s = pickle.dumps(n)
-        n = pickle.loads(s)
-        self.assertEqual(n[0].a.b.c, 1)
-        self.assertEqual(n[1].a.b.c, 2)
-        for i in n:
-            self.assertEqual(i.a.b.c, i.a.b.c)
-
-    def test_pedantic(self):
-        self.assertRaises(TypeError, lambda:namespace.Namespace({'a': set([1,2,3])}))
-        self.patch(namespace,"pedantic", False)
-        # should not crash if pendentic disabled
-        n = namespace.Namespace({'a': set([1,2,3])})
-        self.assertRaises(TypeError,lambda:repr(n))
-
diff --git a/master/buildbot/util/namespace.py b/master/buildbot/util/namespace.py
deleted file mode 100644
index 7f86034b905..00000000000
--- a/master/buildbot/util/namespace.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# This file is part of Buildbot.  Buildbot is free software: you can
-# redistribute it and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation, version 2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright Buildbot Team Members
-
-from buildbot.util import json
-
-pedantic = False
-class Namespace(dict):
-    """
-    A convenience class that makes a json like dict of (dicts,lists,strings,integers)
-    looks like a python object allowing syntax sugar like mydict.key1.key2.key4 = 5
-    this object also looks like a dict so that you can walk items(), keys() or values()
-
-    input should always be json-able but this is checked only in pedentic mode, for
-    obvious performance reason
-    """
-    __slots__=[]
-    def __init__(self,d):
-        dict.__init__(self,d)
-        for k, v in d.items():
-            # if already a Namespace, this will not match
-            if type(v) in (dict,list):
-                dict.__setitem__(self, k, Namespace(v))
-
-    def __new__(cls, v):
-        if pedantic: # we raise exception if v is not json able
-            json.dumps(v)
-        if type(v) == dict:
-            return dict.__new__(cls, v)
-        elif type(v) == list:
-            return [Namespace(i) for i in v]
-        else:
-            return v
-# pretty printing
-    def __repr__(self):
-        """ pretty printed __repr__, for debugging"""
-        return json.dumps(self, sort_keys=True, indent=4)
-
-# on the fly conversion
-    def __setitem__(self, k, v):
-        dict.__setitem__(self, k, Namespace(v))
-
-# object like accessors
-    __getattr__ = dict.__getitem__
-    __setattr__ = __setitem__
-
-
-    def __getstate__(self):
-        return self
-    def __setstate__(self,_dict):
-        self.__init__(_dict)
-
-def documentNamespace(n,parent=None):
-    """This prints the available keys and subkeys of the data, and their types,
-    meant for quick auto-documentation of big json data
-    """
-    s = ""
-    for k,v in n.items():
-        if parent:
-            me = parent+"."+k
-        else:
-            me = k
-        def do_item(me, v):
-            t = type(v).__name__
-            if t == "Namespace":
-                t = "dict"
-            s = me + " -> "+t+"\n"
-            if isinstance(v,dict):
-                v = Namespace(v)
-                s += documentNamespace(v, me)
-            elif type(v) == list:
-                if len(v)>0:
-                    v = v[0]
-                    s += do_item(me+"[i]",v)
-            return s
-        s += do_item(me,v)
-    return s
-