More cleanup and updating of packages.