cleanup and pom update