PLD: cleanup paths, patches, other app references