Supporting P-rade

P-rade cleanup gets many helping hands, and pickup sticks.