POM cleaned-up.