Do proper speed comparison
Cleanup stopwatch and old search code