refactor removeRP out of rollBackIti