Clean up of benchmark code and docs