diff --git a/Step/wwwroot/src/app.business-logic.ts b/Step/wwwroot/src/app.business-logic.ts
index b17b112b..a2d531cd 100644
--- a/Step/wwwroot/src/app.business-logic.ts
+++ b/Step/wwwroot/src/app.business-logic.ts
@@ -185,14 +185,6 @@ if (typeof cmsClient != "undefined") {
     else
       stopDrag()
   });
-
-
-
-  /*   Factory.Get(MessageService).subscribeToChannel("HMI-end-render", args => {
-      clearTimeout(RerenderInterval);
-      RerenderInterval = setTimeout(ElaborateHMIStatus, 15);
-    });  */
-
 }
 
 //Private functions for HMI State (show-functions):
@@ -222,35 +214,21 @@ function ShowHmiProduction(){
 }
 
 //Private functions for HMI State (hide-functions):
-/** 22/01/18 Method to delete glitch
- * 1) Send message to UI -> Re-render HMI image -> Channel "HMI-start-render"
- * 2) Wait UI Render the new image -> Channel "HMI-end-render"
- * 3) Hide HMI
- * */
 function HideHmi() {
   HMIvisible = false;
-  /*
-  if(HMIvisibleInProduction){
-    HMIvisibleInProduction = false;
-    HMIprodTimeout = setTimeout(ShowHmiProduction, 700);
-  }*/
   ElaborateHMIStatus();
-  //Factory.Get(MessageService).publishToChannel("HMI-start-render");
 }
 function showAlarms() {
   HMIAlarmsVisible = true;
   ElaborateHMIStatus();
-  //Factory.Get(MessageService).publishToChannel("HMI-start-render");
 }
 function showModal() {
   HMIModalsVisible = true;
   ElaborateHMIStatus();
-  //Factory.Get(MessageService).publishToChannel("HMI-start-render");
 }
 function startDrag() {
   HMIDragging = true;
   ElaborateHMIStatus();
-  //Factory.Get(MessageService).publishToChannel("HMI-start-render");
 }
 
 function HideHmiProduction(){
diff --git a/Step/wwwroot/src/components/production.vue b/Step/wwwroot/src/components/production.vue
index 9158bca4..16671bbe 100644
--- a/Step/wwwroot/src/components/production.vue
+++ b/Step/wwwroot/src/components/production.vue
@@ -118,6 +118,10 @@ export default {
             }
         }
     },
+    beforeDestroy: function () {
+        Factory.Get(MessageService).publishToChannel("HMI-production-hide");
+        Factory.Get(MessageService).publishToChannel("HMI-production-hide-state");
+    },
     methods:{
         selectHead(h){
             this.selectedHead = h;