Removed references to LocationOld