Clean up versus harness
Finished cleanup of versus and single benchmark harnesses