1 files changed, 3 insertions, 50 deletions
diff --git a/SmartDeviceLink/SDLInteractionMode.m b/SmartDeviceLink/SDLInteractionMode.m
index 07dc5f7b2..5baf0f14c 100644
--- a/SmartDeviceLink/SDLInteractionMode.m
+++ b/SmartDeviceLink/SDLInteractionMode.m
@@ -4,53 +4,6 @@
 
 #import "SDLInteractionMode.h"
 
-SDLInteractionMode *SDLInteractionMode_MANUAL_ONLY = nil;
-SDLInteractionMode *SDLInteractionMode_VR_ONLY = nil;
-SDLInteractionMode *SDLInteractionMode_BOTH = nil;
-
-NSArray *SDLInteractionMode_values = nil;
-
-@implementation SDLInteractionMode
-
-+ (SDLInteractionMode *)valueOf:(NSString *)value {
-    for (SDLInteractionMode *item in SDLInteractionMode.values) {
-        if ([item.value isEqualToString:value]) {
-            return item;
-        }
-    }
-    return nil;
-}
-
-+ (NSArray *)values {
-    if (SDLInteractionMode_values == nil) {
-        SDLInteractionMode_values = @[
-            SDLInteractionMode.MANUAL_ONLY,
-            SDLInteractionMode.VR_ONLY,
-            SDLInteractionMode.BOTH,
-        ];
-    }
-    return SDLInteractionMode_values;
-}
-
-+ (SDLInteractionMode *)MANUAL_ONLY {
-    if (SDLInteractionMode_MANUAL_ONLY == nil) {
-        SDLInteractionMode_MANUAL_ONLY = [[SDLInteractionMode alloc] initWithValue:@"MANUAL_ONLY"];
-    }
-    return SDLInteractionMode_MANUAL_ONLY;
-}
-
-+ (SDLInteractionMode *)VR_ONLY {
-    if (SDLInteractionMode_VR_ONLY == nil) {
-        SDLInteractionMode_VR_ONLY = [[SDLInteractionMode alloc] initWithValue:@"VR_ONLY"];
-    }
-    return SDLInteractionMode_VR_ONLY;
-}
-
-+ (SDLInteractionMode *)BOTH {
-    if (SDLInteractionMode_BOTH == nil) {
-        SDLInteractionMode_BOTH = [[SDLInteractionMode alloc] initWithValue:@"BOTH"];
-    }
-    return SDLInteractionMode_BOTH;
-}
-
-@end
+SDLInteractionMode const SDLInteractionModeManualOnly = @"MANUAL_ONLY";
+SDLInteractionMode const SDLInteractionModeVrOnly = @"VR_ONLY";
+SDLInteractionMode const SDLInteractionModeBoth = @"BOTH";