Clean up benchmarking.
General clean up.