POM cleanup and update.