maven cleanup and upgrades