codebase and pom cleanup.