Commiting changes before refactoring out the locations