diff --git a/dev-plone3.cfg b/dev-plone3.cfg
deleted file mode 100644
index b36eaf3..0000000
--- a/dev-plone3.cfg
+++ /dev/null
@@ -1,85 +0,0 @@
-[buildout]
-extensions = mr.developer buildout.dumppickedversions
-unzip = true
-parts = 
-    instance
-    omelette
-    zopepy
-    test
-    roadrunner
-
-dump-picked-versions-file = versions.plone3.cfg
-overwrite-picked-versions-file = True
-
-extends =
-    http://dist.plone.org/release/3.3.5/versions.cfg
-    http://good-py.appspot.com/release/plone.app.discussion/1.0b4
-versions = versions
-sources = sources
-
-develop =
-    .
-
-auto-checkout =
-    plone.formwidget.captcha
-    plone.formwidget.recaptcha
-    collective.akismet
-    collective.autoresizetextarea
-
-[zope2]
-recipe = plone.recipe.zope2install
-fake-zope-eggs = true
-additional-fake-eggs = ZODB3
-url = ${versions:zope2-url}
-
-[instance]
-recipe = plone.recipe.zope2instance
-zope2-location = ${zope2:location}
-user = admin:admin
-http-address = 8080
-debug-mode = on
-verbose-security = on
-eggs =
-    Plone
-    plone.reload
-    Products.PdbDebugMode
-    plone.app.discussion
-    plone.formwidget.captcha
-    plone.formwidget.recaptcha
-    collective.autoresizetextarea
-    collective.akismet
-
-zcml =
-    plone.reload
-
-[omelette]
-recipe = collective.recipe.omelette
-eggs = ${instance:eggs}
-packages = ${zope2:location}/lib/python ./
-
-[zopepy]
-recipe = zc.recipe.egg
-eggs = ${instance:eggs}
-interpreter = zopepy
-extra-paths = ${zope2:location}/lib/python
-scripts = zopepy
-
-[test]
-recipe = collective.xmltestreport
-eggs = 
-    plone.app.discussion
-    collective.akismet
-# other eggs in this list not shown
-extra-paths = ${zope2:location}/lib/python
-defaults = ['--exit-with-status', '--auto-color', '--auto-progress']
-
-[roadrunner]
-recipe = roadrunner:plone
-zope2-instance = instance
-packages-under-test = plone.app.discussion
-
-[sources]
-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
-collective.akismet = svn https://svn.plone.org/svn/collective/collective.akismet/trunk
-collective.autoresizetextarea = svn https://svn.plone.org/svn/collective/collective.autoresizetextarea/trunk
diff --git a/dev-plone4.cfg b/dev-plone4.cfg
deleted file mode 100644
index e6a5fc5..0000000
--- a/dev-plone4.cfg
+++ /dev/null
@@ -1,130 +0,0 @@
-[buildout]
-extends = test-plone-4.0.x.cfg
-
-extensions = mr.developer buildout.dumppickedversions buildout.eggtractor
-unzip = true
-parts =
-    instance
-    zopepy
-    omelette
-    ipzope
-    releaser
-    sphinxbuilder
-
-dump-picked-versions-file = versions.plone4.cfg
-overwrite-picked-versions-file = True
-
-tractor-src-directory = src
-
-# Add additional eggs here
-eggs +=
-    plone.app.discussion
-    Sphinx
-    Sphinx-PyPI-upload
-    repoze.sphinx.autointerface
-    plone.formwidget.captcha
-    plone.formwidget.recaptcha
-    collective.akismet 
-    collective.autoresizetextarea
-    Products.PdbDebugMode
-    Products.PrintingMailHost
-    plone.reload
-
-develop =
-    .
-
-auto-checkout =
-    Products.PloneTestCase
-    plone.formwidget.captcha
-    plone.formwidget.recaptcha
-    collective.akismet
-    collective.autoresizetextarea
-    collective.z3cform.norobots
-    plone.app.registry
-    plone.app.z3cform
-    plone.z3cform
-    z3c.form
-
-[versions]
-zope.schema = 3.6.0
-Sphinx = 0.6.6
-collective.recipe.sphinxbuilder = 0.6.3.3
-Products.TinyMCE = 1.1.1
-
-[instance]
-# For more information on this step and configuration options see:
-# http://pypi.python.org/pypi/plone.recipe.zope2instance
-recipe = plone.recipe.zope2instance
-user = admin:admin
-http-address = 8080
-#debug-mode = on
-#verbose-security = on
-blob-storage = var/blobstorage
-# If you want Zope to know about any additional eggs, list them here.
-# This should include any development eggs you listed in develop-eggs above,
-# e.g. eggs = Plone my.package
-eggs =
-    Zope2
-    Plone
-    ${buildout:eggs}
-
-# If you want to register ZCML slugs for any packages, list them here.
-# e.g. zcml = my.package my.other.package
-zcml =
-    collective.akismet
-    collective.autoresizetextarea
-    plone.formwidget.captcha
-    plone.formwidget.recaptcha
-
-
-[zopepy]
-# For more information on this step and configuration options see:
-# http://pypi.python.org/pypi/zc.recipe.egg
-recipe = zc.recipe.egg
-eggs = ${instance:eggs}
-interpreter = zopepy
-scripts = zopepy
-
-
-[ipzope]
-recipe = zc.recipe.egg
-eggs =
-    ipython
-    ${instance:eggs}
-initialization =
-    import sys, os
-    os.environ["SOFTWARE_HOME"] = "${instance:location}/lib/python"
-    os.environ["INSTANCE_HOME"] = "${instance:location}"
-    sys.argv[1:1] = "-p zope".split()
-extra-paths = ${instance:location}/lib/python
-scripts = ipython=ipzope
-
-
-[releaser]
-recipe = zc.recipe.egg
-eggs = jarn.mkrelease
-
-
-[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]
-Products.PloneTestCase = svn http://svn.plone.org/svn/collective/Products.PloneTestCase/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
-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/branches/p4-discussion-captchaplugin/
-plone.app.registry = svn http://svn.plone.org/svn/plone/plone.app.registry/trunk
-plone.app.z3cform = svn http://svn.plone.org/svn/plone/plone.app.z3cform/trunk
-plone.z3cform = svn http://svn.zope.org/repos/main/plone.z3cform/trunk/
-z3c.form = svn http://svn.zope.org/repos/main/z3c.form/trunk
diff --git a/test-plone-3.3.x.cfg b/test-plone-3.3.x.cfg
deleted file mode 100644
index c9984d2..0000000
--- a/test-plone-3.3.x.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-[buildout]
-extends =
-    http://svn.plone.org/svn/collective/buildout/plonetest/plone-3.3.x.cfg
-
-package-name = plone.app.discussion
-
-[versions]
-Products.PloneTestCase = 0.9.8
-collective.autopermission = 1.0b1
-collective.monkeypatcher = 1.0b2
-collective.z3cform.datetimewidget = 0.1a9
-plone.app.registry = 1.0b1
-plone.app.z3cform = 0.4.9
-plone.autoform = 1.0b2
-plone.registry = 1.0b1
-plone.supermodel = 1.0b4
-plone.z3cform = 0.5.10
-z3c.batching = 1.1.0
-z3c.form = 2.3.3
-z3c.formwidget.query = 0.3
-zope.app.broken = 3.4.0
-zope.component = 3.5.1
-zope.container = 3.7.0
-zope.i18n = 3.4.0
-zope.location = 3.4.0
-zope.schema = 3.6.4
-zope.security = 3.4.3
-zope.site = 3.5.1
-zope.testing = 3.8.1
diff --git a/test-plone-4.0.x.cfg b/test-plone-4.0.x.cfg
deleted file mode 100644
index aa15b30..0000000
--- a/test-plone-4.0.x.cfg
+++ /dev/null
@@ -1,182 +0,0 @@
-[buildout]
-extends =
-    http://svn.plone.org/svn/collective/buildout/plonetest/plone-4.0.x.cfg
-
-package-name = plone.app.discussion
-package-directory = plone/app/discussion
-
-parts +=
-    omelette
-    test
-    pycoverage
-    coverage
-    coverage-plain    
-    coverage-xml
-    coverage-html
-    jstestdriver-build
-    jstestdriver-build-coverage
-    jstestdriver
-    pylint
-    pylint-test
-    zptlint
-    zptlint-test
-    
-[versions]
-zope.schema = 3.6.0
-Sphinx <= 0.7dev
-collective.recipe.sphinxbuilder = 0.6.3.3
-Products.TinyMCE = 1.1.1
-
-[omelette]
-recipe = collective.recipe.omelette
-eggs = ${instance:eggs}
-packages = ${instance:location}/lib/python ./
-
-[test]
-recipe = collective.xmltestreport
-eggs = ${buildout:package-name} [test]
-defaults = ['--auto-color', '--auto-progress']
-
-[pycoverage]
-recipe = zc.recipe.egg
-eggs = coverage
-scripts = coverage=pycoverage
-
-[coverage]
-recipe = zc.recipe.egg
-eggs = coverage
-initialization =
-    sys.argv = sys.argv[:] + ['run', 'bin/test', '-k', '-q', '--xml']
-
-[coverage-plain]
-recipe = zc.recipe.egg
-eggs = coverage
-scripts = coverage=coverage-plain
-initialization =
-    exclude = '--omit=' + '${buildout:package-directory}/tests/*'
-    include = '--include=' + '${buildout:package-directory}/*.py'
-    sys.argv = sys.argv[:] + ['report', '-i', include, exclude]
-
-[coverage-xml]
-recipe = zc.recipe.egg
-eggs = coverage
-scripts = coverage=coverage-xml
-initialization =
-    exclude = '--omit=' + '${buildout:package-directory}/tests/*'
-    include = '--include=' + '${buildout:package-directory}/*.py'
-    sys.argv = sys.argv[:] + ['xml', '-i', include, exclude]
-
-[coverage-html]
-recipe = zc.recipe.egg
-eggs = coverage
-scripts = coverage=coverage-html
-initialization =
-    exclude = '--omit=' + '${buildout:package-directory}/tests/*'
-    include = '--include=' + '${buildout:package-directory}/*.py'
-    sys.argv = sys.argv[:] + ['html', '-i', include, exclude]
-
-[jstestdriver-build]
-recipe = hexagonit.recipe.download
-url = http://js-test-driver.googlecode.com/files/JsTestDriver-1.2.2.jar
-download-only = True
-destination = parts/jstestdriver
-filename = JsTestDriver.jar
-
-[jstestdriver-build-coverage]
-recipe = hexagonit.recipe.download
-url = http://js-test-driver.googlecode.com/files/coverage-1.2.2.jar
-download-only = True
-destination = parts/jstestdriver
-filename = coverage.jar
-
-[jstestdriver]
-recipe = collective.recipe.template
-input = inline:
-    #!/bin/sh
-    java -jar ${buildout:directory}/parts/jstestdriver/JsTestDriver.jar --port 9876 --config ${buildout:package-directory}/tests/jsTestDriver.conf --browser /usr/bin/firefox --tests all --verbose
-output = ${buildout:directory}/bin/jstestdriver
-mode = 755
-
-[pylint]
-recipe = zc.recipe.egg
-eggs = logilab.pylintinstaller
-extra-paths = ${instance:location}/lib/python
-entry-points = pylint=pylint.lint:Run
-arguments = sys.argv[1:]
-arguments = [
-    '--output-format=parseable',
-    '--zope=y',
-    '--reports=y',
-    '--disable-msg=E0611,F0401,W0232,E1101,C0103,C0111,R0201,W0201,R0911,R0904,F0220,E1103,R0901,E0211,E0213,E1002,W0622',
-    '--generated-members=objects',
-    ] + sys.argv[1:]
-
-# Disable messages:
-#
-# E0611: No name %r in module %r. Used when a name cannot be found in a module.
-# F0401: Unable to import %r (%s). Used when pylint has been unable to import a module.
-# W0232: Class has no __init__ method. Used when a class has no __init__ method, neither its parent classes.
-# C0103: Invalid name "%s" (should match %s). Used when the name doesn't match the regular expression associated to its type (constant, variable, class...).
-# C0111: Message Missing docstring Description Used when a module, function, class or method has no docstring. Some special methods like init don't necessary require a docstring. Explanation…
-# R0201: Method could be a function
-# W0201: Attribute %r defined outside __init__
-# R0911: Too many return statements (%s/%s)
-
-# E0211: Method has no argument
-#        - Reason: raises an error on zope.interface definitions
-# E0213 Method should have "self" as first argument
-#       - Reason: raises an error on zope.interface definitions
-# E1121 Too many positional arguments for function call
-#       - Reason: ???
-# E1002 Use super on an old style class
-#       - Reason: super(CommentsViewlet, self).update() raises an error
-# W0622 total_comments: Redefining built-in 'object'
-#       - Reason: top level def function will not work (e.g. for catalog indexers)
-# ...
-# See http://pylint-messages.wikidot.com/all-messages for a full list.
-
-[pylint-test]
-recipe = collective.recipe.template
-input = inline:
-    #!/bin/sh
-    if [ -s pylint.log ]; then
-      rm pylint.log
-      echo "Old pylint.log file removed"
-    fi
-    echo "Running pylint"
-    find -L ${buildout:package-directory} -regex ".*\.[c]?py" | xargs bin/pylint >> pylint.log
-    echo "finish"
-output = ${buildout:directory}/bin/pylint-test
-mode = 755
-
-[zptlint]
-recipe = zc.recipe.egg
-eggs =
-   zptlint
-entry-points = zptlint=zptlint:run
-
-[zptlint-test]
-recipe = collective.recipe.template
-input = inline:
-    #!/bin/sh
-    if [ -e zptlint.log ]; then
-      echo "Old zptlint.log file removed"
-      rm zptlint.log
-    fi
-    echo "Running zptlint-test"
-    TMPL=$(find ${buildout:package-directory} -regex ".*\.[c|z]?pt")
-    echo "Checking"
-    echo $TMPL
-    find ${buildout:package-directory} -regex ".*\.[c|z]?pt" | xargs bin/zptlint > zptlint.log
-    if [ -s zptlint.log ]; then
-      echo "Errors were found:"
-      cat zptlint.log 
-      echo "Errors were written to zptlint.log"
-      exit 1;
-    else
-      echo "No errors found"
-      rm zptlint.log
-    fi
-output = ${buildout:directory}/bin/zptlint-test
-mode = 755
-
diff --git a/versions.plone3.cfg b/versions.plone3.cfg
deleted file mode 100644
index 2945878..0000000
--- a/versions.plone3.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-[versions]
-Products.PDBDebugMode = 1.1
-collective.recipe.omelette = 0.9
-collective.xmltestreport = 1.0b2
-mr.developer = 1.12
-plone.reload = 1.3
-recaptcha-client = 1.0.5
-roadrunner = 0.2.3.1
-zc.recipe.testrunner = 1.2.0
-zope.i18n = 3.7.2
-zope.proxy = 3.5.0
-
-#Required by:
-#plone.formwidget.captcha 1.0a3
-skimpyGimpy = 1.4
diff --git a/versions.plone4.cfg b/versions.plone4.cfg
deleted file mode 100644
index f39b226..0000000
--- a/versions.plone4.cfg
+++ /dev/null
@@ -1,61 +0,0 @@
-[versions]
-Products.PDBDebugMode = 1.3.1
-Products.PrintingMailHost = 0.7
-Sphinx-PyPI-upload = 0.2.1
-collective.recipe.omelette = 0.10
-collective.recipe.template = 1.8
-collective.xmltestreport = 1.2.1
-collective.z3cform.datetimewidget = 1.0.4
-coverage = 3.4
-hexagonit.recipe.download = 1.5.0
-interlude = 1.1.1
-ipython = 0.10.2
-jarn.mkrelease = 3.0.9
-logilab.pylintinstaller = 0.15.2
-plone.app.testing = 4.0a6
-plone.autoform = 1.0b6
-plone.supermodel = 1.0b8
-plone.testing = 4.0a6
-recaptcha-client = 1.0.6
-repoze.sphinx.autointerface = 0.6.2
-zptlint = 0.2.4
-
-#Required by:
-#collective.akismet 1.0b2dev
-akismet = 0.2.0
-
-#Required by:
-#plone.app.discussion 2.0.1
-plone.app.uuid = 1.0b2
-
-#Required by:
-#plone.app.discussion 2.0.1
-plone.registry = 1.0b5
-
-#Required by:
-#plone.app.uuid 1.0b2
-plone.uuid = 1.0b2
-
-#Required by:
-#jarn.mkrelease 3.0.9
-setuptools-git = 0.4.2
-
-#Required by:
-#jarn.mkrelease 3.0.9
-setuptools-hg = 0.2
-
-#Required by:
-#plone.formwidget.captcha 1.0b3
-skimpyGimpy = 1.4
-
-#Required by:
-#plone.z3cform 0.7.1dev
-z3c.batching = 1.1.0
-
-#Required by:
-#plone.app.z3cform 0.5.1
-z3c.formwidget.query = 0.5
-
-#Required by:
-#collective.xmltestreport 1.2.1
-zope.testrunner = 4.0.3