diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj
index 9fb4ce4..ae97d07 100644
--- a/MVMCore/MVMCore.xcodeproj/project.pbxproj
+++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj
@@ -31,7 +31,6 @@
 		01F2A04E23A82CF500D954D8 /* ActionPopup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04D23A82CF500D954D8 /* ActionPopup.swift */; };
 		01F2A05023A82D0800D954D8 /* ActionTopAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A04F23A82D0800D954D8 /* ActionTopAlert.swift */; };
 		01F2A05223A8325100D954D8 /* ModelMapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A05123A8325100D954D8 /* ModelMapping.swift */; };
-		01F2A05423A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F2A05323A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift */; };
 		30349BF11FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 30349BEF1FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		30349BF21FCCA78A00546A1E /* MVMCoreSessionTimeHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 30349BF01FCCA78A00546A1E /* MVMCoreSessionTimeHandler.m */; };
 		881D26931FCC9D180079C521 /* MVMCoreErrorObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 881D268F1FCC9D180079C521 /* MVMCoreErrorObject.m */; };
@@ -176,7 +175,6 @@
 		01F2A04D23A82CF500D954D8 /* ActionPopup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionPopup.swift; sourceTree = "<group>"; };
 		01F2A04F23A82D0800D954D8 /* ActionTopAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionTopAlert.swift; sourceTree = "<group>"; };
 		01F2A05123A8325100D954D8 /* ModelMapping.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelMapping.swift; sourceTree = "<group>"; };
-		01F2A05323A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyedDecodingContainer+CodingKey.swift"; sourceTree = "<group>"; };
 		0A11030B20864F94008ADD90 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		0A11030C20864F9A008ADD90 /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		30349BEF1FCCA78A00546A1E /* MVMCoreSessionTimeHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreSessionTimeHandler.h; sourceTree = "<group>"; };
@@ -431,7 +429,6 @@
 			children = (
 				946EE1AA237B5C940036751F /* Decoder.swift */,
 				946EE1B3237B619D0036751F /* Encoder.swift */,
-				01F2A05323A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -922,7 +919,6 @@
 				01F2A05223A8325100D954D8 /* ModelMapping.swift in Sources */,
 				AFBB969E1FBA3A9A0008D868 /* MVMCoreAlertObject.m in Sources */,
 				8876D5F51FB50AB000EB2E3D /* UILabel+MFCustom.m in Sources */,
-				01F2A05423A83E9200D954D8 /* KeyedDecodingContainer+CodingKey.swift in Sources */,
 				AFBB96B31FBA3B590008D868 /* MVMCoreGetterUtility.m in Sources */,
 				AF43A7071FC4D7A2008E9347 /* MVMCoreObject.m in Sources */,
 				D2DEDCB723C63F3B00C44CC4 /* Clamping.swift in Sources */,
diff --git a/MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift b/MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift
deleted file mode 100644
index e54ade6..0000000
--- a/MVMCore/MVMCore/Models/Extensions/KeyedDecodingContainer+CodingKey.swift
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-//  KeyedDecodingContainer+Action.swift
-//  MVMCore
-//
-//  Created by Suresh, Kamlesh on 12/16/19.
-//  Copyright © 2019 myverizon. All rights reserved.
-//
-
-import Foundation
-
-extension KeyedDecodingContainer where Key : CodingKey {
-//    private enum TypeCodingKey: String, CodingKey {
-//        case type
-//    }
-
-//    public func decode(codingKey: KeyedDecodingContainer<K>.Key) throws -> ActionProtocol {
-//        return try decode(codingKey: codingKey, typeCodingKey: TypeCodingKey.type)
-//    }
-//
-//    public func decodeActionIfPresent(codingKey: KeyedDecodingContainer<K>.Key) throws -> ActionProtocol? {
-//        return try decodeIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.type)
-//    }
-//
-//    public func decodeActionArray(codingKey: KeyedDecodingContainer<K>.Key) throws -> [ActionProtocol] {
-//        guard let models = try decodeArray(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) as? [ActionProtocol] else {
-//            throw ModelRegistry.Error.decoderError
-//        }
-//        return models
-//    }
-//
-//    public func decodeActionArrayIfPresent(codingKey: KeyedDecodingContainer<K>.Key) throws -> [ActionProtocol]? {
-//        return try decodeArrayIfPresent(codingKey: codingKey, typeCodingKey: TypeCodingKey.type) as? [ActionProtocol]
-//    }
-}
diff --git a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h
index efa33b6..eb9fba9 100644
--- a/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h
+++ b/MVMCore/MVMCore/Utility/HardCodedServerResponse/MFHardCodedServerResponse.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "MVMCoreRequestParameters.h"
 
-#define ENABLE_HARD_CODED_RESPONSE 1 && DEBUG
+#define ENABLE_HARD_CODED_RESPONSE 0 && DEBUG
 
 #if ENABLE_HARD_CODED_RESPONSE