Cleanup benchmarks. Fix travis.