#1081: Cleanup and some dependency upgrades.
#1081: Cleanup and some dependency upgrades.