Refactored RS update pipeline
More cleanup