Some cleanup, removed all things PD