More pom cleanup