Clean up; functionality moved to Buildout 2