diff --git a/setup.py b/setup.py
index 894c7f7c11e..4a686ebfe15 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ import glob
 
 from pprint import pprint as pp
 
-from setuptools import setup as official_setup, find_packages
+from setuptools import setup, find_packages
 from setuptools.command.install import install
 from distutils.sysconfig import get_python_lib
 
@@ -169,21 +169,18 @@ options = {
         "optimize": 2,
         "dist_dir": 'dist',
         "packages": [
-                 "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
-                 "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath",
-                 "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing",
-                 "pydot", "asyncore","asynchat", "reportlab", "vobject",
-                 "HTMLParser", "select", "mako", "poplib",
-                 "imaplib", "smtplib", "email", "yaml", "DAV",
-                 ],
+            "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
+            "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath",
+            "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing",
+            "pydot", "asyncore","asynchat", "reportlab", "vobject",
+            "HTMLParser", "select", "mako", "poplib",
+            "imaplib", "smtplib", "email", "yaml", "DAV",
+            "uuid",
+        ],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
     }
 }
 
-def setup(**kwargs):
-    #pp(kwargs)
-    return official_setup(**kwargs)
-
 setup(name             = name,
       version          = version,
       description      = description,
@@ -225,13 +222,8 @@ setup(name             = name,
           'reportlab',
           'caldav',
           'pyyaml',
-          #'django',
           'pywebdav'
-          #'cx_Oracle',
-          #'mysqldb',
           'feedparser',
-          #'bsddb3',
-          'egenix-mx-base'
       ],
       extras_require={
           'SSL' : ['pyopenssl'],