Buildout cleanup