1 files changed, 9 insertions, 25 deletions

diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m
index 896f3a99a..c9a18180f 100644
--- a/SmartDeviceLink/SDLKeyboardProperties.m
+++ b/SmartDeviceLink/SDLKeyboardProperties.m
@@ -3,12 +3,8 @@
 
 #import "SDLKeyboardProperties.h"
 
-#import "SDLKeyboardLayout.h"
-#import "SDLKeypressMode.h"
-#import "SDLLanguage.h"
 #import "SDLNames.h"
 
-
 @implementation SDLKeyboardProperties
 
 - (instancetype)init {
@@ -23,7 +19,7 @@
     return self;
 }
 
-- (void)setLanguage:(SDLLanguage *)language {
+- (void)setLanguage:(SDLLanguage)language {
     if (language != nil) {
         [store setObject:language forKey:NAMES_language];
     } else {
@@ -31,16 +27,12 @@
     }
 }
 
-- (SDLLanguage *)language {
+- (SDLLanguage)language {
     NSObject *obj = [store objectForKey:NAMES_language];
-    if (obj == nil || [obj isKindOfClass:SDLLanguage.class]) {
-        return (SDLLanguage *)obj;
-    } else {
-        return [SDLLanguage valueOf:(NSString *)obj];
-    }
+    return (SDLLanguage )obj;
 }
 
-- (void)setKeyboardLayout:(SDLKeyboardLayout *)keyboardLayout {
+- (void)setKeyboardLayout:(SDLKeyboardLayout)keyboardLayout {
     if (keyboardLayout != nil) {
         [store setObject:keyboardLayout forKey:NAMES_keyboardLayout];
     } else {
@@ -48,16 +40,12 @@
     }
 }
 
-- (SDLKeyboardLayout *)keyboardLayout {
+- (SDLKeyboardLayout)keyboardLayout {
     NSObject *obj = [store objectForKey:NAMES_keyboardLayout];
-    if (obj == nil || [obj isKindOfClass:SDLKeyboardLayout.class]) {
-        return (SDLKeyboardLayout *)obj;
-    } else {
-        return [SDLKeyboardLayout valueOf:(NSString *)obj];
-    }
+    return (SDLKeyboardLayout)obj;
 }
 
-- (void)setKeypressMode:(SDLKeypressMode *)keypressMode {
+- (void)setKeypressMode:(SDLKeypressMode)keypressMode {
     if (keypressMode != nil) {
         [store setObject:keypressMode forKey:NAMES_keypressMode];
     } else {
@@ -65,13 +53,9 @@
     }
 }
 
-- (SDLKeypressMode *)keypressMode {
+- (SDLKeypressMode)keypressMode {
     NSObject *obj = [store objectForKey:NAMES_keypressMode];
-    if (obj == nil || [obj isKindOfClass:SDLKeypressMode.class]) {
-        return (SDLKeypressMode *)obj;
-    } else {
-        return [SDLKeypressMode valueOf:(NSString *)obj];
-    }
+    return (SDLKeypressMode)obj;
 }
 
 - (void)setLimitedCharacterList:(NSMutableArray *)limitedCharacterList {