diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index 68e38615bf..bef6f4c2da 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -1068,6 +1068,7 @@ void Audio::toggleScope() {
         memset(_scopeInput.data(), 0, width * sizeof(int16_t));
         memset(_scopeOutputLeft.data(), 0, width * sizeof(int16_t));
         memset(_scopeOutputRight.data(), 0, width * sizeof(int16_t));
+        _scopeEnabledPause = false;
     }
 }
 
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 0587e979f6..eecc18534c 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -272,9 +272,6 @@ Menu::Menu() :
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Bandwidth, 0, true);
     addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, this, SLOT(bandwidthDetails()));
     addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, this, SLOT(octreeStatsDetails()));
-    addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::AudioScope, 0, false,
-                                           appInstance->getAudio(),
-                                           SLOT(toggleScope()));
 
     QMenu* developerMenu = addMenu("Developer");
 
@@ -371,20 +368,6 @@ Menu::Menu() :
     addCheckableActionToQMenuAndActionHash(renderDebugMenu, MenuOption::PipelineWarnings);
     addCheckableActionToQMenuAndActionHash(renderDebugMenu, MenuOption::SuppressShortTimings);
 
-    addCheckableActionToQMenuAndActionHash(renderDebugMenu,
-                                  MenuOption::CullSharedFaces,
-                                  Qt::CTRL | Qt::SHIFT | Qt::Key_C,
-                                  false,
-                                  appInstance->getVoxels(),
-                                  SLOT(cullSharedFaces()));
-
-    addCheckableActionToQMenuAndActionHash(renderDebugMenu,
-                                  MenuOption::ShowCulledSharedFaces,
-                                  0,
-                                  false,
-                                  appInstance->getVoxels(),
-                                  SLOT(showCulledSharedFaces()));
-
     QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools");
     addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction,
                                            0,
@@ -408,8 +391,11 @@ Menu::Menu() :
                                            false,
                                            appInstance->getAudio(),
                                            SLOT(toggleToneInjection()));
+    addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScope, Qt::CTRL | Qt::Key_P, false,
+                                           appInstance->getAudio(),
+                                           SLOT(toggleScope()));
     addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScopePause,
-                                           Qt::CTRL | Qt::Key_P,
+                                           Qt::CTRL | Qt::SHIFT | Qt::Key_P ,
                                            false,
                                            appInstance->getAudio(),
                                            SLOT(toggleScopePause()));
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index d1097929f7..1e13d5ff2a 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -297,7 +297,6 @@ namespace MenuOption {
     const QString CollideWithParticles = "Collide With Particles";
     const QString CollideWithVoxels = "Collide With Voxels";
     const QString Collisions = "Collisions";
-    const QString CullSharedFaces = "Cull Shared Voxel Faces";
     const QString DecreaseAvatarSize = "Decrease Avatar Size";
     const QString DecreaseVoxelSize = "Decrease Voxel Size";
     const QString DisableAutoAdjustLOD = "Disable Automatically Adjusting LOD";
@@ -363,7 +362,6 @@ namespace MenuOption {
     const QString SettingsExport = "Export Settings";
     const QString SettingsImport = "Import Settings";
     const QString Shadows = "Shadows";
-    const QString ShowCulledSharedFaces = "Show Culled Shared Voxel Faces";
     const QString ShowIKConstraints = "Show IK Constraints";
     const QString Stars = "Stars";
     const QString Stats = "Stats";
diff --git a/interface/src/voxels/VoxelSystem.cpp b/interface/src/voxels/VoxelSystem.cpp
index 0fac5a338c..8937cef7dd 100644
--- a/interface/src/voxels/VoxelSystem.cpp
+++ b/interface/src/voxels/VoxelSystem.cpp
@@ -1711,38 +1711,6 @@ bool VoxelSystem::inspectForExteriorOcclusionsOperation(OctreeElement* element,
     return true;
 }
 
-
-void VoxelSystem::cullSharedFaces() {
-
-    if (Menu::getInstance()->isOptionChecked(MenuOption::CullSharedFaces)) {
-        _useVoxelShader = false;
-        _usePrimitiveRenderer = true;
-        inspectForOcclusions();
-    } else {
-        _usePrimitiveRenderer = false;
-        clearAllNodesBufferIndex();
-    }
-    _writeRenderFullVBO = true;
-    _tree->setDirtyBit();
-    setupNewVoxelsForDrawing();
-}
-
-void VoxelSystem::showCulledSharedFaces() {
-
-    _tree->lockForRead();
-    if (Menu::getInstance()->isOptionChecked(MenuOption::ShowCulledSharedFaces)) {
-        _showCulledSharedFaces = true;
-    } else {
-        _showCulledSharedFaces = false;
-    }
-    _tree->unlock();
-    if (Menu::getInstance()->isOptionChecked(MenuOption::CullSharedFaces)) {
-        _writeRenderFullVBO = true;
-        _tree->setDirtyBit();
-        setupNewVoxelsForDrawing();
-    }
-}
-
 void VoxelSystem::inspectForOcclusions() {
 
     if (_inOcclusions) {
diff --git a/interface/src/voxels/VoxelSystem.h b/interface/src/voxels/VoxelSystem.h
index b134fe1539..15e2b20a75 100644
--- a/interface/src/voxels/VoxelSystem.h
+++ b/interface/src/voxels/VoxelSystem.h
@@ -95,9 +95,7 @@ public slots:
     // Methods that recurse tree
     void forceRedrawEntireTree();
     void clearAllNodesBufferIndex();
-    void cullSharedFaces();
-    void showCulledSharedFaces();
-
+ 
     void setDisableFastVoxelPipeline(bool disableFastVoxelPipeline);
     void setUseVoxelShader(bool useVoxelShader);
     void setVoxelsAsPoints(bool voxelsAsPoints);