1 files changed, 12 insertions, 32 deletions

diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m
index 3386ca450..146be4280 100644
--- a/SmartDeviceLink/SDLOnVehicleData.m
+++ b/SmartDeviceLink/SDLOnVehicleData.m
@@ -7,7 +7,6 @@
 #import "SDLBeltStatus.h"
 #import "SDLBodyInformation.h"
 #import "SDLClusterModeStatus.h"
-#import "SDLComponentVolumeStatus.h"
 #import "SDLDeviceStatus.h"
 #import "SDLECallInfo.h"
 #import "SDLEmergencyEvent.h"
@@ -15,10 +14,7 @@
 #import "SDLHeadLampStatus.h"
 #import "SDLMyKey.h"
 #import "SDLNames.h"
-#import "SDLPRNDL.h"
 #import "SDLTireStatus.h"
-#import "SDLVehicleDataEventStatus.h"
-#import "SDLWiperStatus.h"
 
 
 @implementation SDLOnVehicleData
@@ -88,7 +84,7 @@
     return [parameters objectForKey:NAMES_fuelLevel];
 }
 
-- (void)setFuelLevel_State:(SDLComponentVolumeStatus *)fuelLevel_State {
+- (void)setFuelLevel_State:(SDLComponentVolumeStatus)fuelLevel_State {
     if (fuelLevel_State != nil) {
         [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State];
     } else {
@@ -96,13 +92,9 @@
     }
 }
 
-- (SDLComponentVolumeStatus *)fuelLevel_State {
+- (SDLComponentVolumeStatus)fuelLevel_State {
     NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State];
-    if (obj == nil || [obj isKindOfClass:SDLComponentVolumeStatus.class]) {
-        return (SDLComponentVolumeStatus *)obj;
-    } else {
-        return [SDLComponentVolumeStatus valueOf:(NSString *)obj];
-    }
+    return (SDLComponentVolumeStatus)obj;
 }
 
 - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption {
@@ -141,7 +133,7 @@
     return [parameters objectForKey:NAMES_vin];
 }
 
-- (void)setPrndl:(SDLPRNDL *)prndl {
+- (void)setPrndl:(SDLPRNDL)prndl {
     if (prndl != nil) {
         [parameters setObject:prndl forKey:NAMES_prndl];
     } else {
@@ -149,13 +141,9 @@
     }
 }
 
-- (SDLPRNDL *)prndl {
+- (SDLPRNDL)prndl {
     NSObject *obj = [parameters objectForKey:NAMES_prndl];
-    if (obj == nil || [obj isKindOfClass:SDLPRNDL.class]) {
-        return (SDLPRNDL *)obj;
-    } else {
-        return [SDLPRNDL valueOf:(NSString *)obj];
-    }
+    return (SDLPRNDL)obj;
 }
 
 - (void)setTirePressure:(SDLTireStatus *)tirePressure {
@@ -238,7 +226,7 @@
     }
 }
 
-- (void)setDriverBraking:(SDLVehicleDataEventStatus *)driverBraking {
+- (void)setDriverBraking:(SDLVehicleDataEventStatus)driverBraking {
     if (driverBraking != nil) {
         [parameters setObject:driverBraking forKey:NAMES_driverBraking];
     } else {
@@ -246,16 +234,12 @@
     }
 }
 
-- (SDLVehicleDataEventStatus *)driverBraking {
+- (SDLVehicleDataEventStatus)driverBraking {
     NSObject *obj = [parameters objectForKey:NAMES_driverBraking];
-    if (obj == nil || [obj isKindOfClass:SDLVehicleDataEventStatus.class]) {
-        return (SDLVehicleDataEventStatus *)obj;
-    } else {
-        return [SDLVehicleDataEventStatus valueOf:(NSString *)obj];
-    }
+    return (SDLVehicleDataEventStatus)obj;
 }
 
-- (void)setWiperStatus:(SDLWiperStatus *)wiperStatus {
+- (void)setWiperStatus:(SDLWiperStatus)wiperStatus {
     if (wiperStatus != nil) {
         [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
     } else {
@@ -263,13 +247,9 @@
     }
 }
 
-- (SDLWiperStatus *)wiperStatus {
+- (SDLWiperStatus)wiperStatus {
     NSObject *obj = [parameters objectForKey:NAMES_wiperStatus];
-    if (obj == nil || [obj isKindOfClass:SDLWiperStatus.class]) {
-        return (SDLWiperStatus *)obj;
-    } else {
-        return [SDLWiperStatus valueOf:(NSString *)obj];
-    }
+    return (SDLWiperStatus)obj;
 }
 
 - (void)setHeadLampStatus:(SDLHeadLampStatus *)headLampStatus {