cleanup, pom updates