pom cleanup

last upgrade pull.