[Updated] Cleanup pom