Removed dependency on a custom antlr4 build.
Cleanup