Refactor remote -> resolved