vehicle-system: fixed nil values and left-over code