Even more pom.xml cleanup