General pom cleanup