Enhance buildbot to cleanup correctly