Cleanup differnces between P/R and non-P/R