Removing AST Dependency