Cleanup and optimize POM