More fixes to use new grok lib
Use updated grok version
Clean up code
Closes #1657