Update benchmarks
Cleanup API