Clean-up of pom.xml