Remove tokens, pass benchmarks around