removed store_location