diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee5e027473..ff9fbe9244 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,10 +148,6 @@ endif()
 if (BUILD_CLIENT)
   add_subdirectory(interface)
   set_target_properties(interface PROPERTIES FOLDER "Apps")
-  if (ANDROID)
-    add_subdirectory(gvr-interface)
-    set_target_properties(gvr-interface PROPERTIES FOLDER "Apps")
-  endif()
 
   option(USE_SIXENSE "Build Interface with sixense library/plugin" OFF)
 endif()
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index d175fb29c5..368282ab7a 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -855,6 +855,9 @@ Section "-Core installation"
   ; Rename the incorrectly cased Raleway font
   Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml"
 
+  ; Remove the Old Interface directory and vcredist_x64.exe (from installs prior to Server Console)
+  RMDir /r "$INSTDIR\Interface"
+
   ;Use the entire tree produced by the INSTALL target.  Keep the
   ;list of directories here in sync with the RMDir commands below.
   SetOutPath "$INSTDIR"
@@ -970,7 +973,7 @@ SectionEnd
     ${If} $R0 == 0
 
       ; the process is running, ask the user to close it
-      
+
       ${If} "${displayName}" == "@CONSOLE_DISPLAY_NAME@"
       MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION \
         "${displayName} cannot be ${action} while ${displayName} is running.$\r$\nPlease close it in the system tray and click Retry to continue." \