Update packages, clean up code.