minor maven upgrades and cleanup