1 files changed, 6 insertions, 25 deletions
diff --git a/src/components/HMI/app/controller/sdl/Controller.js b/src/components/HMI/app/controller/sdl/Controller.js
index a6dc92fc0d..76fbb7e059 100644
--- a/src/components/HMI/app/controller/sdl/Controller.js
+++ b/src/components/HMI/app/controller/sdl/Controller.js
@@ -55,7 +55,7 @@ SDL.SDLController = Em.Object
          */
         sysContext: function() {
 
-            if (SDL.SDLModel.VRActive) {
+            if (SDL.VRPopUp.VRActive) {
                 return 'VRSESSION';
             }
             if (SDL.AlertPopUp.active) {
@@ -78,7 +78,7 @@ SDL.SDLController = Em.Object
         }.property('SDL.OptionsView.active',
             'SDL.SliderView.active',
             'SDL.SDLModel.AudioPassThruState',
-            'SDL.SDLModel.VRActive',
+            'SDL.VRPopUp.VRActive',
             'SDL.AlertPopUp.active',
             'SDL.States.info.nonMedia.active',
             'SDL.States.media.sdlmedia.active',
@@ -200,9 +200,7 @@ SDL.SDLController = Em.Object
                         SDL.VRHelpListView.deactivate();
                     }
                 }
-            } else if (SDL.VRHelpListView.active) {
-                    SDL.VRHelpListView.deactivate();
-                }
+            }
         }.observes('SDL.SDLModel.VRActive', 'SDL.SDLModel.interactionData.vrHelp'),
 
         /**
@@ -416,15 +414,6 @@ SDL.SDLController = Em.Object
             FFW.BasicCommunication.ExitAllApplications(state);
         },
         /**
-         * OnAwakeSDL from HMI returns SDL to normal operation
-         * after OnExitAllApplications(SUSPEND)
-         *
-         */
-        onAwakeSDLNotificationSend: function() {
-            FFW.BasicCommunication.OnAwakeSDL();
-        },
-
-        /**
          * Method to sent notification with selected reason of OnSystemRequest
          *
          * @param {String}
@@ -469,8 +458,6 @@ SDL.SDLController = Em.Object
             if (choiceID && SDL.TTSPopUp.active && FFW.TTS.requestId == null) {
                 SDL.TTSPopUp.DeactivateTTS();
             }
-
-            SDL.SDLModel.interactionData.helpPrompt = null;
         },
         /**
          * Method to sent notification for Alert
@@ -601,7 +588,7 @@ SDL.SDLController = Em.Object
                 deviceName: params.deviceName,
                 appType: params.appType
             }));
-
+/*Uncomment to show useless add command buttons
             var exitCommand = {
                 "id": -10,
                 "params": {
@@ -614,7 +601,7 @@ SDL.SDLController = Em.Object
                 }
             };
 
-            SDL.SDLController.getApplicationModel(params.appID).addCommand(exitCommand);
+          SDL.SDLController.getApplicationModel(params.appID).addCommand(exitCommand);
 
             exitCommand = {
                 "id": -10,
@@ -629,6 +616,7 @@ SDL.SDLController = Em.Object
             };
 
             SDL.SDLController.getApplicationModel(params.appID).addCommand(exitCommand);
+*/
         },
         /**
          * Unregister application
@@ -653,10 +641,6 @@ SDL.SDLController = Em.Object
             if (SDL.SDLModel.stateLimited == appID) {
                 SDL.SDLModel.set('stateLimited', null);
             }
-
-            if (SDL.VRHelpListView.active) {
-                this.showVRHelpItems();
-            }
         },
         /**
          * SDL Driver Distraction ON/OFF switcher
@@ -751,9 +735,6 @@ SDL.SDLController = Em.Object
          */
         onActivateSDLApp: function(element) {
 
-            if (SDL.SDLModel.VRActive) {
-                SDL.SDLModel.toggleProperty('VRActive');
-            }
             FFW.BasicCommunication.ActivateApp(element.appID);
         },
         /**