removed location_id