PLD: rebase cleanup