Cleaning up pom.xml