cleanup after ast refactoring