Cleanup/Fixing: allt the pom.xml