Further cleanup pom.xml