Update and clean-up.