More PF cleanup.