cleanup and pom fix