pom cleanup and unification