Clean-up and update.