Further pom cleanup