Removing Antlr for now