More PFR Actor cleanup