Removed redundant fn vehicle->location-fn