diff --git a/libraries/render-utils/src/GlWindow.cpp b/libraries/render-utils/src/GlWindow.cpp
index 78ac046b59..248b9305e2 100644
--- a/libraries/render-utils/src/GlWindow.cpp
+++ b/libraries/render-utils/src/GlWindow.cpp
@@ -43,11 +43,9 @@ bool GlWindow::makeCurrent() {
         qDebug() << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
     });
     
-    #ifndef QT_NO_DEBUG
-    QOpenGLContext * currentContext =
-    #endif
-        QOpenGLContext::currentContext();
+    QOpenGLContext * currentContext = QOpenGLContext::currentContext();
     Q_ASSERT(_context == currentContext);
+    
     return makeCurrentResult;
 }
 
diff --git a/libraries/ui/src/VrMenu.cpp b/libraries/ui/src/VrMenu.cpp
index a2cc7f0214..57df4d5306 100644
--- a/libraries/ui/src/VrMenu.cpp
+++ b/libraries/ui/src/VrMenu.cpp
@@ -108,13 +108,10 @@ void VrMenu::addMenu(QMenu* menu) {
         Q_ASSERT(false);
     }
     QVariant returnedValue;
-    #ifndef QT_NO_DEBUG
-    bool invokeResult =
-    #endif
-    QMetaObject::invokeMethod(this, "addMenu", Qt::DirectConnection,
-        Q_RETURN_ARG(QVariant, returnedValue),
-        Q_ARG(QVariant, QVariant::fromValue(qmlParent)),
-        Q_ARG(QVariant, QVariant::fromValue(menu->title())));
+    bool invokeResult = QMetaObject::invokeMethod(this, "addMenu", Qt::DirectConnection,
+                                                  Q_RETURN_ARG(QVariant, returnedValue),
+                                                  Q_ARG(QVariant, QVariant::fromValue(qmlParent)),
+                                                  Q_ARG(QVariant, QVariant::fromValue(menu->title())));
     Q_ASSERT(invokeResult);
     QObject* result = returnedValue.value<QObject*>();
     Q_ASSERT(result);
@@ -150,13 +147,11 @@ void VrMenu::addAction(QMenu* menu, QAction* action) {
     QObject* menuQml = findMenuObject(userData->uuid.toString());
     Q_ASSERT(menuQml);
     QVariant returnedValue;
-    #ifndef QT_NO_DEBUG
-    bool invokeResult =
-    #endif
-    QMetaObject::invokeMethod(this, "addItem", Qt::DirectConnection,
-        Q_RETURN_ARG(QVariant, returnedValue),
-        Q_ARG(QVariant, QVariant::fromValue(menuQml)),
-        Q_ARG(QVariant, QVariant::fromValue(action->text())));
+    
+    bool invokeResult = QMetaObject::invokeMethod(this, "addItem", Qt::DirectConnection,
+                                                  Q_RETURN_ARG(QVariant, returnedValue),
+                                                  Q_ARG(QVariant, QVariant::fromValue(menuQml)),
+                                                  Q_ARG(QVariant, QVariant::fromValue(action->text())));
     Q_ASSERT(invokeResult);
     QObject* result = returnedValue.value<QObject*>();
     Q_ASSERT(result);
@@ -173,14 +168,11 @@ void VrMenu::insertAction(QAction* before, QAction* action) {
     }
     QObject* menu = beforeQml->parent();
     QVariant returnedValue;
-    #ifndef QT_NO_DEBUG
-    bool invokeResult =
-    #endif
-    QMetaObject::invokeMethod(this, "insertItem", Qt::DirectConnection,
-        Q_RETURN_ARG(QVariant, returnedValue),
-        Q_ARG(QVariant, QVariant::fromValue(menu)),
-        Q_ARG(QVariant, QVariant::fromValue(beforeQml)),
-        Q_ARG(QVariant, QVariant::fromValue(action->text())));
+    bool invokeResult = QMetaObject::invokeMethod(this, "insertItem", Qt::DirectConnection,
+                                                  Q_RETURN_ARG(QVariant, returnedValue),
+                                                  Q_ARG(QVariant, QVariant::fromValue(menu)),
+                                                  Q_ARG(QVariant, QVariant::fromValue(beforeQml)),
+                                                  Q_ARG(QVariant, QVariant::fromValue(action->text())));
     Q_ASSERT(invokeResult);
     QObject* result = returnedValue.value<QObject*>();
     Q_ASSERT(result);
@@ -199,9 +191,5 @@ void VrMenu::removeAction(QAction* action) {
     bool invokeResult = QMetaObject::invokeMethod(this, "removeItem", Qt::DirectConnection,
         Q_ARG(QVariant, QVariant::fromValue(menu)),
         Q_ARG(QVariant, QVariant::fromValue(item)));
-#ifndef QT_NO_DEBUG
     Q_ASSERT(invokeResult);
-#else
-    Q_UNUSED(invokeResult);
-#endif
 }