misc pom cleanup