I haven't removed tools/benchmark.py. Probably should. Also, improved the timeit parameters over benchmark.py.