Post-async refactor cleanup