Take out SERVICE_URL from rc_branch, simplify post-restor-code