some pp cleanup