Removed some old code, moved the benchmark code to a separate method