Revert "still pmd warnings"

This reverts commit af234492f2a552918076ad82dcb192597e378e1f.