Remove unused ANTLR rule
Add support for implicit joins