Add AST types
Remove unused combinators