diff --git a/package.json b/package.json
index 3c4a11a..902c7f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "reactivexcomponent.js",
-    "version": "7.0.8",
+    "version": "7.0.9",
     "description": "Javascript reactive client API for XComponent",
     "module": "dist/index.js",
     "main": "dist/index.js",
diff --git a/src/communication/WebSocketSubscriber.ts b/src/communication/WebSocketSubscriber.ts
index b409048..920a19c 100644
--- a/src/communication/WebSocketSubscriber.ts
+++ b/src/communication/WebSocketSubscriber.ts
@@ -19,11 +19,11 @@ import { StateMachineInstance } from '../interfaces/StateMachineInstance';
 import { StateMachineRef } from '../interfaces/StateMachineRef';
 import { StateMachineUpdateListener } from '../interfaces/StateMachineUpdateListener';
 import { generateUUID } from '../utils/uuid';
-import { Logger } from '../utils/Logger';
+// import { Logger } from '../utils/Logger';
 import { WebSocketWrapper } from './WebSocketWrapper';
 
 export class WebSocketSubscriber {
-    private logger = Logger.getLogger('WebSocketSubscriber');
+    // private logger = Logger.getLogger('WebSocketSubscriber');
     private stateMachineRefSendPublisher: WebSocketPublisher;
     private subscribedStateMachines: { [componentName: string]: Array<String> };
     private updates$: Observable<DeserializedData>;
@@ -256,7 +256,6 @@ export class WebSocketSubscriber {
     }
 
     public getJsonDataFromSnapshot(data: string, topic?: string): Array<StateMachineInstance> {
-        this.logger.debug('JsonData received from snapshot: ', { data: data, topic: topic }, 2);
         let jsonData = this.deserializer.getJsonData(data);
         let b64Data = JSON.parse(jsonData.JsonMessage).Items;
         let items;
@@ -264,10 +263,9 @@ export class WebSocketSubscriber {
             const raw = JSON.parse(this.deserializer.decodeServerMessage(b64Data)!);
             if (raw.$values) {
                 items = raw.$values;
+            } else {
+                items = raw;
             }
-			else {
-				items = raw;
-			}
         } catch (e) {
             items = b64Data;
         }
@@ -286,7 +284,7 @@ export class WebSocketSubscriber {
     }
 
     public getJsonDataFromEvent(data: string, topic?: string): StateMachineInstance {
-        this.logger.debug('JsonData received from event: ', { data: data, topic: topic }, 2);
+        // this.logger.debug('JsonData received from event: ', { data: data, topic: topic }, 2);
         let jsonData = this.deserializer.getJsonData(data);
         let stateMachineRef = this.getStateMachineRef(
             jsonData.Header.StateMachineId,
diff --git a/src/communication/xcomponentMessages.ts b/src/communication/xcomponentMessages.ts
index 9a7e7c2..1d98206 100644
--- a/src/communication/xcomponentMessages.ts
+++ b/src/communication/xcomponentMessages.ts
@@ -1,4 +1,4 @@
-import { Logger } from '../utils/Logger';
+// import { Logger } from '../utils/Logger';
 
 import * as pako from 'pako';
 
@@ -71,17 +71,15 @@ export let getHeaderWithIncomingType = (): Header => {
 };
 
 export class Serializer {
-    private logger = Logger.getLogger('Serializer');
+    // private logger = Logger.getLogger('Serializer');
 
     public convertToWebsocketInputFormat(data: Data): string {
         let input = `${data.RoutingKey} ${data.ComponentCode} ${JSON.stringify(data.Event)}`;
-        this.logger.debug('Message send : ', input);
         return input;
     }
 
     public convertCommandDataToWebsocketInputFormat(commandData: CommandData): string {
         let input = `${commandData.Command} ${JSON.stringify(commandData.Data)}`;
-        this.logger.debug('Message send : ', input);
         return input;
     }
 }