Pom clean up and Version bump