Pom cleanup for oss