Minor refactor benchmarks
Remove tracker.resolve method
Merge pull request #158 from golyshevd/bench

Refactor