PMD fixes and mvn cleanups