pom cleanup and dependency update