Fix delete_vehicle to find pico by ID as well. Move function to common