Clean up dirtybench a bit