Cleanup of pom.xml