Some maven pom cleanup