diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 8c6292681b..193de2792d 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -725,45 +725,51 @@ Menu::Menu() {
         DependencyManager::get<PickManager>().data(), SLOT(setForceCoarsePicking(bool)));
 
     // Developer > Crash >>>
-    MenuWrapper* crashMenu = developerMenu->addMenu("Crash");
+    bool result = false;
+    const QString HIFI_SHOW_DEVELOPER_CRASH_MENU("HIFI_SHOW_DEVELOPER_CRASH_MENU");
+    result = QProcessEnvironment::systemEnvironment().contains(HIFI_SHOW_DEVELOPER_CRASH_MENU);
+    if (result) {
+        MenuWrapper* crashMenu = developerMenu->addMenu("Crash");
     
-    // Developer > Crash > Display Crash Options
-    addCheckableActionToQMenuAndActionHash(crashMenu, MenuOption::DisplayCrashOptions, 0, true);
+        // Developer > Crash > Display Crash Options
+        addCheckableActionToQMenuAndActionHash(crashMenu, MenuOption::DisplayCrashOptions, 0, true);
 
-    addActionToQMenuAndActionHash(crashMenu, MenuOption::DeadlockInterface, 0, qApp, SLOT(deadlockApplication()));
-    addActionToQMenuAndActionHash(crashMenu, MenuOption::UnresponsiveInterface, 0, qApp, SLOT(unresponsiveApplication()));
+        addActionToQMenuAndActionHash(crashMenu, MenuOption::DeadlockInterface, 0, qApp, SLOT(deadlockApplication()));
+        addActionToQMenuAndActionHash(crashMenu, MenuOption::UnresponsiveInterface, 0, qApp, SLOT(unresponsiveApplication()));
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunction);
-    connect(action, &QAction::triggered, qApp, []() { crash::pureVirtualCall(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunctionThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::pureVirtualCall).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunction);
+        connect(action, &QAction::triggered, qApp, []() { crash::pureVirtualCall(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashPureVirtualFunctionThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::pureVirtualCall).join(); });
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFree);
-    connect(action, &QAction::triggered, qApp, []() { crash::doubleFree(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFreeThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::doubleFree).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFree);
+        connect(action, &QAction::triggered, qApp, []() { crash::doubleFree(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashDoubleFreeThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::doubleFree).join(); });
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbort);
-    connect(action, &QAction::triggered, qApp, []() { crash::doAbort(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbortThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::doAbort).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbort);
+        connect(action, &QAction::triggered, qApp, []() { crash::doAbort(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashAbortThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::doAbort).join(); });
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereference);
-    connect(action, &QAction::triggered, qApp, []() { crash::nullDeref(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereferenceThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::nullDeref).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereference);
+        connect(action, &QAction::triggered, qApp, []() { crash::nullDeref(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNullDereferenceThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::nullDeref).join(); });
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccess);
-    connect(action, &QAction::triggered, qApp, []() { crash::outOfBoundsVectorCrash(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccessThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::outOfBoundsVectorCrash).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccess);
+        connect(action, &QAction::triggered, qApp, []() { crash::outOfBoundsVectorCrash(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOutOfBoundsVectorAccessThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::outOfBoundsVectorCrash).join(); });
 
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFault);
-    connect(action, &QAction::triggered, qApp, []() { crash::newFault(); });
-    action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFaultThreaded);
-    connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFault);
+        connect(action, &QAction::triggered, qApp, []() { crash::newFault(); });
+        action = addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashNewFaultThreaded);
+        connect(action, &QAction::triggered, qApp, []() { std::thread(crash::newFault).join(); });
 
-    addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOnShutdown, 0, qApp, SLOT(crashOnShutdown()));
+        addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOnShutdown, 0, qApp, SLOT(crashOnShutdown()));
+    }
+    
 
     // Developer > Show Statistics
     addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats, 0, true);
diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/sounds/emojiPopSound2.wav b/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/sounds/emojiPopSound2.wav
deleted file mode 100644
index 3d917997a7..0000000000
Binary files a/scripts/simplifiedUI/simplifiedEmote/emojiApp/resources/sounds/emojiPopSound2.wav and /dev/null differ
diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
index 1b16843b09..d8db41e488 100644
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
+++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/simplifiedEmoji.js
@@ -48,7 +48,6 @@ var UTF_CODE = 0;
 // Only plays a sound if it is downloaded.
 // Only plays one sound at a time.
 var emojiCreateSound = SoundCache.getSound(Script.resolvePath('resources/sounds/emojiPopSound1.wav'));
-var emojiDestroySound = SoundCache.getSound(Script.resolvePath('resources/sounds/emojiPopSound2.wav'));
 var injector;
 var DEFAULT_VOLUME = 0.01;
 var local = false;
@@ -326,9 +325,7 @@ function playPopAnimation() {
         if (popType === "in") {
             currentPopScale = MIN_POP_SCALE;
         } else {
-            // Start with the pop sound on the out
             currentPopScale = finalInPopScale ? finalInPopScale : MAX_POP_SCALE;
-            playSound(emojiDestroySound, DEFAULT_VOLUME, MyAvatar.position, true);
         }
     }