RPS service: Remove leftover code