More pom.xml cleanup