Refactoring: do not normalize grok library right away