Post-update clean-up