cleaning up the PMD critical warnings