AAE cleanup.