Pld/misc cleanup