Add no remove remote option for sanity.