I will do a pom cleanup in a separate pull request.