Cleaning up the POM