Merge pull request #880 from spumko/perf

Performance and hawk options
Cleanup pack requirePath