cleanup work and maven upgrades