1 files changed, 9 insertions, 21 deletions

diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m
index fbe3b4b96..0c8bf9153 100644
--- a/SmartDeviceLink/SDLDeviceStatus.m
+++ b/SmartDeviceLink/SDLDeviceStatus.m
@@ -82,7 +82,7 @@
     return [store objectForKey:NAMES_textMsgAvailable];
 }
 
-- (void)setBattLevelStatus:(SDLDeviceLevelStatus *)battLevelStatus {
+- (void)setBattLevelStatus:(SDLDeviceLevelStatus )battLevelStatus {
     if (battLevelStatus != nil) {
         [store setObject:battLevelStatus forKey:NAMES_battLevelStatus];
     } else {
@@ -90,13 +90,9 @@
     }
 }
 
-- (SDLDeviceLevelStatus *)battLevelStatus {
+- (SDLDeviceLevelStatus )battLevelStatus {
     NSObject *obj = [store objectForKey:NAMES_battLevelStatus];
-    if (obj == nil || [obj isKindOfClass:SDLDeviceLevelStatus.class]) {
-        return (SDLDeviceLevelStatus *)obj;
-    } else {
-        return [SDLDeviceLevelStatus valueOf:(NSString *)obj];
-    }
+    return (SDLDeviceLevelStatus)obj;
 }
 
 - (void)setStereoAudioOutputMuted:(NSNumber *)stereoAudioOutputMuted {
@@ -123,7 +119,7 @@
     return [store objectForKey:NAMES_monoAudioOutputMuted];
 }
 
-- (void)setSignalLevelStatus:(SDLDeviceLevelStatus *)signalLevelStatus {
+- (void)setSignalLevelStatus:(SDLDeviceLevelStatus)signalLevelStatus {
     if (signalLevelStatus != nil) {
         [store setObject:signalLevelStatus forKey:NAMES_signalLevelStatus];
     } else {
@@ -131,16 +127,12 @@
     }
 }
 
-- (SDLDeviceLevelStatus *)signalLevelStatus {
+- (SDLDeviceLevelStatus)signalLevelStatus {
     NSObject *obj = [store objectForKey:NAMES_signalLevelStatus];
-    if (obj == nil || [obj isKindOfClass:SDLDeviceLevelStatus.class]) {
-        return (SDLDeviceLevelStatus *)obj;
-    } else {
-        return [SDLDeviceLevelStatus valueOf:(NSString *)obj];
-    }
+    return (SDLDeviceLevelStatus)obj;
 }
 
-- (void)setPrimaryAudioSource:(SDLPrimaryAudioSource *)primaryAudioSource {
+- (void)setPrimaryAudioSource:(SDLPrimaryAudioSource)primaryAudioSource {
     if (primaryAudioSource != nil) {
         [store setObject:primaryAudioSource forKey:NAMES_primaryAudioSource];
     } else {
@@ -148,13 +140,9 @@
     }
 }
 
-- (SDLPrimaryAudioSource *)primaryAudioSource {
+- (SDLPrimaryAudioSource)primaryAudioSource {
     NSObject *obj = [store objectForKey:NAMES_primaryAudioSource];
-    if (obj == nil || [obj isKindOfClass:SDLPrimaryAudioSource.class]) {
-        return (SDLPrimaryAudioSource *)obj;
-    } else {
-        return [SDLPrimaryAudioSource valueOf:(NSString *)obj];
-    }
+    return (SDLPrimaryAudioSource)obj;
 }
 
 - (void)setECallEventActive:(NSNumber *)eCallEventActive {