Update and clean-up