Some pom clean up