More PMD cleanup