More POM cleanup

Aligning changes with f68b1e07b2