maven upgrades and general cleanup