Dependency maintenance

Upgrade packages.  Consolidate packages.