RPS cleaned up