Clean-up based on PMD reporting