1 files changed, 6 insertions, 14 deletions

diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m
index 9be7a88d6..810820336 100644
--- a/SmartDeviceLink/SDLBodyInformation.m
+++ b/SmartDeviceLink/SDLBodyInformation.m
@@ -35,7 +35,7 @@
     return [store objectForKey:NAMES_parkBrakeActive];
 }
 
-- (void)setIgnitionStableStatus:(SDLIgnitionStableStatus *)ignitionStableStatus {
+- (void)setIgnitionStableStatus:(SDLIgnitionStableStatus)ignitionStableStatus {
     if (ignitionStableStatus != nil) {
         [store setObject:ignitionStableStatus forKey:NAMES_ignitionStableStatus];
     } else {
@@ -43,16 +43,12 @@
     }
 }
 
-- (SDLIgnitionStableStatus *)ignitionStableStatus {
+- (SDLIgnitionStableStatus)ignitionStableStatus {
     NSObject *obj = [store objectForKey:NAMES_ignitionStableStatus];
-    if (obj == nil || [obj isKindOfClass:SDLIgnitionStableStatus.class]) {
-        return (SDLIgnitionStableStatus *)obj;
-    } else {
-        return [SDLIgnitionStableStatus valueOf:(NSString *)obj];
-    }
+    return (SDLIgnitionStableStatus)obj;
 }
 
-- (void)setIgnitionStatus:(SDLIgnitionStatus *)ignitionStatus {
+- (void)setIgnitionStatus:(SDLIgnitionStatus)ignitionStatus {
     if (ignitionStatus != nil) {
         [store setObject:ignitionStatus forKey:NAMES_ignitionStatus];
     } else {
@@ -60,13 +56,9 @@
     }
 }
 
-- (SDLIgnitionStatus *)ignitionStatus {
+- (SDLIgnitionStatus)ignitionStatus {
     NSObject *obj = [store objectForKey:NAMES_ignitionStatus];
-    if (obj == nil || [obj isKindOfClass:SDLIgnitionStatus.class]) {
-        return (SDLIgnitionStatus *)obj;
-    } else {
-        return [SDLIgnitionStatus valueOf:(NSString *)obj];
-    }
+    return (SDLIgnitionStatus)obj;
 }
 
 - (void)setDriverDoorAjar:(NSNumber *)driverDoorAjar {