Cleaning up benchmarks