safety refactorings, local vs remote