diff --git a/CHANGES.txt b/CHANGES.txt
index ff3e7d0..03c5fd6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,9 @@ Changelog
 - Documentation and howtos updated.
   [timo]
 
+- Remove development buildout files and directories.
+  [timo]
+
 
 2.1.7 (2012-06-29)
 ------------------
diff --git a/bootstrap.py b/bootstrap.py
deleted file mode 100644
index b964024..0000000
--- a/bootstrap.py
+++ /dev/null
@@ -1,121 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Bootstrap a buildout-based project
-
-Simply run this script in a directory containing a buildout.cfg.
-The script accepts buildout command-line options, so you can
-use the -c option to specify an alternate configuration file.
-
-$Id$
-"""
-
-import os, shutil, sys, tempfile, urllib2
-from optparse import OptionParser
-
-tmpeggs = tempfile.mkdtemp()
-
-is_jython = sys.platform.startswith('java')
-
-# parsing arguments
-parser = OptionParser()
-parser.add_option("-v", "--version", dest="version",
-                          help="use a specific zc.buildout version")
-parser.add_option("-d", "--distribute",
-                   action="store_true", dest="distribute", default=False,
-                   help="Use Disribute rather than Setuptools.")
-
-parser.add_option("-c", None, action="store", dest="config_file",
-                   help=("Specify the path to the buildout configuration "
-                         "file to be used."))
-
-options, args = parser.parse_args()
-
-# if -c was provided, we push it back into args for buildout' main function
-if options.config_file is not None:
-    args += ['-c', options.config_file]
-
-if options.version is not None:
-    VERSION = '==%s' % options.version
-else:
-    VERSION = ''
-
-USE_DISTRIBUTE = options.distribute
-args = args + ['bootstrap']
-
-to_reload = False
-try:
-    import pkg_resources
-    if not hasattr(pkg_resources, '_distribute'):
-        to_reload = True
-        raise ImportError
-except ImportError:
-    ez = {}
-    if USE_DISTRIBUTE:
-        exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
-                         ).read() in ez
-        ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
-    else:
-        exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
-                             ).read() in ez
-        ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
-
-    if to_reload:
-        reload(pkg_resources)
-    else:
-        import pkg_resources
-
-if sys.platform == 'win32':
-    def quote(c):
-        if ' ' in c:
-            return '"%s"' % c # work around spawn lamosity on windows
-        else:
-            return c
-else:
-    def quote (c):
-        return c
-
-cmd = 'from setuptools.command.easy_install import main; main()'
-ws  = pkg_resources.working_set
-
-if USE_DISTRIBUTE:
-    requirement = 'distribute'
-else:
-    requirement = 'setuptools'
-
-if is_jython:
-    import subprocess
-
-    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
-           quote(tmpeggs), 'zc.buildout' + VERSION],
-           env=dict(os.environ,
-               PYTHONPATH=
-               ws.find(pkg_resources.Requirement.parse(requirement)).location
-               ),
-           ).wait() == 0
-
-else:
-    assert os.spawnle(
-        os.P_WAIT, sys.executable, quote (sys.executable),
-        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
-        dict(os.environ,
-            PYTHONPATH=
-            ws.find(pkg_resources.Requirement.parse(requirement)).location
-            ),
-        ) == 0
-
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout' + VERSION)
-import zc.buildout.buildout
-zc.buildout.buildout.main(args)
-shutil.rmtree(tmpeggs)
diff --git a/buildout.cfg b/buildout.cfg
deleted file mode 100644
index d1941fc..0000000
--- a/buildout.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-[buildout]
-extends =
-    http://svn.plone.org/svn/collective/buildout/plonetest/plone-4.1.x.cfg
-index = http://d.pypi.python.org/simple
-package-name = plone.app.discussion
-package-directory = plone/app/discussion
-parts += instance
-
-versions = versions
-
-[instance]
-eggs += plone.app.discussion [test]
-
-[versions]
-plone.app.discussion = 2.1.7.dev0
diff --git a/dev.cfg b/dev.cfg
deleted file mode 100644
index c90b587..0000000
--- a/dev.cfg
+++ /dev/null
@@ -1,68 +0,0 @@
-[buildout]
-extends =
-    buildout.cfg
-extensions = buildout.eggtractor mr.developer
-tractor-src-directory =
-    .
-    src
-auto-checkout =
-    collective.autoresizetextarea
-    collective.akismet
-    collective.z3cform.norobots
-    plone.formwidget.captcha
-    plone.formwidget.recaptcha
-
-parts +=
-    omelette
-    releaser
-    pocompile
-    zopepy
-    sphinxbuilder
-    sphinxupload
-
-[instance]
-eggs +=
-    Products.PdbDebugMode
-    Products.PrintingMailHost
-    roman
-    Sphinx
-    Sphinx-PyPI-upload
-    repoze.sphinx.autointerface
-
-[omelette]
-recipe = collective.recipe.omelette
-eggs = ${instance:eggs}
-packages = ${instance:location}/lib/python ./
-
-[releaser]
-recipe = zc.recipe.egg
-eggs = jarn.mkrelease
-
-[pocompile]
-recipe = zc.recipe.egg
-eggs = zest.pocompile
-
-[zopepy]
-recipe = zc.recipe.egg
-eggs = ${instance:eggs}
-interpreter = zopepy
-scripts = zopepy
-
-[sphinxbuilder]
-recipe = collective.recipe.sphinxbuilder
-interpreter = ${buildout:directory}/bin/zopepy
-
-[sphinxupload]
-recipe = collective.recipe.template
-input = inline:
-    #!/bin/sh
-    bin/zopepy setup.py upload_sphinx
-output = ${buildout:directory}/bin/sphinxupload
-mode = 755
-
-[sources]
-collective.akismet = svn https://svn.plone.org/svn/collective/collective.akismet/trunk
-collective.autoresizetextarea = svn https://svn.plone.org/svn/collective/collective.autoresizetextarea/trunk
-collective.z3cform.norobots = svn https://svn.plone.org/svn/collective/collective.z3cform.norobots/trunk
-plone.formwidget.captcha = svn https://svn.plone.org/svn/plone/plone.formwidget.captcha/trunk/
-plone.formwidget.recaptcha = svn https://svn.plone.org/svn/plone/plone.formwidget.recaptcha/trunk/
diff --git a/jenkins.cfg b/jenkins.cfg
deleted file mode 100644
index 9dafe0b..0000000
--- a/jenkins.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-[buildout]
-extends =
-    buildout.cfg
-    https://raw.github.com/plone/buildout.jenkins/master/jenkins.cfg
-    https://raw.github.com/plone/buildout.jenkins/master/jenkins-code-analysis.cfg
-jenkins-test-eggs = plone.app.discussion [test]
-jenkins-test-directories = plone/app/discussion
-
diff --git a/src/README.txt b/src/README.txt
deleted file mode 100644
index ad5da8f..0000000
--- a/src/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Source directory for plone.app.discussion add-ons and related products.