Post-frenzy clean-up