Move non-P/R out of P/R