more benchmarking cleanup