Cleanup some of the leftover pefs stuff