removed workarrounds needed for previously buggy antlr4.0 version