#1081: More cleanup in pom.xml