some cleanup in benchmark2