AST cleanup