cleanup and pom fixes