Pom cleanup

Improve pom.xml file. See commits for details.