1 files changed, 6 insertions, 17 deletions
diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m
index e395717eb..b4b2a3608 100644
--- a/SmartDeviceLink/SDLVehicleDataResult.m
+++ b/SmartDeviceLink/SDLVehicleDataResult.m
@@ -4,9 +4,6 @@
 #import "SDLVehicleDataResult.h"
 
 #import "SDLNames.h"
-#import "SDLVehicleDataResultCode.h"
-#import "SDLVehicleDataType.h"
-
 
 @implementation SDLVehicleDataResult
 
@@ -22,7 +19,7 @@
     return self;
 }
 
-- (void)setDataType:(SDLVehicleDataType *)dataType {
+- (void)setDataType:(SDLVehicleDataType)dataType {
     if (dataType != nil) {
         [store setObject:dataType forKey:NAMES_dataType];
     } else {
@@ -30,16 +27,12 @@
     }
 }
 
-- (SDLVehicleDataType *)dataType {
+- (SDLVehicleDataType)dataType {
     NSObject *obj = [store objectForKey:NAMES_dataType];
-    if (obj == nil || [obj isKindOfClass:SDLVehicleDataType.class]) {
-        return (SDLVehicleDataType *)obj;
-    } else {
-        return [SDLVehicleDataType valueOf:(NSString *)obj];
-    }
+    return (SDLVehicleDataType)obj;
 }
 
-- (void)setResultCode:(SDLVehicleDataResultCode *)resultCode {
+- (void)setResultCode:(SDLVehicleDataResultCode)resultCode {
     if (resultCode != nil) {
         [store setObject:resultCode forKey:NAMES_resultCode];
     } else {
@@ -47,13 +40,9 @@
     }
 }
 
-- (SDLVehicleDataResultCode *)resultCode {
+- (SDLVehicleDataResultCode)resultCode {
     NSObject *obj = [store objectForKey:NAMES_resultCode];
-    if (obj == nil || [obj isKindOfClass:SDLVehicleDataResultCode.class]) {
-        return (SDLVehicleDataResultCode *)obj;
-    } else {
-        return [SDLVehicleDataResultCode valueOf:(NSString *)obj];
-    }
+    return (SDLVehicleDataResultCode)obj;
 }
 
 @end