Re-add location data, remove internal variable