further cleanup
removed unneeded SingleBenchmarkState-related classes