Clean-up of WIMRVehicleModel