aap CVehicle fixes and cleanup