finished first part of removing location_data