Benchmarking tool cleanup