Update and clean up