PMD cleanup