Revert "Added generics to Expr types"

This reverts commit 4a71ebd3e8f2e1abe75fb6029b173bd5f989977d.
Re-added antlr library