#1081: Cleanup and dependency upgrades in pom.xml