Remove saveOriginalLocation since it is not used.