simplify VE cleanup logic