Added clean up to buildout