POM clean up