Updated to antlr4 and removed some unused code