Pom cleanup, to try to resolve downstream versioning challenges