Update and clean up.