diff --git a/setup.nsi b/setup.nsi
index ce2f3d84..d3994077 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -222,13 +222,6 @@ Section "Uninstall"
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
   RMDir /r "$SMPROGRAMS\$StartMenuFolder"
 
-  ; Delete the Install Directory and vendor directory (if empty)
-  Push $R0
-  RMDir /r "$INSTDIR" ;NSIS seems to recomend against this... look into options
-  ${GetParent} "$INSTDIR" $R0
-  RMDir $R0
-  Pop $R0
-
   ; Remove registry keys and vendor keys (if empty)
   DeleteRegKey  SHCTX "${BASEREGKEY}"
   DeleteRegKey /ifempty SHCTX "${VENDORREGKEY}"
@@ -246,6 +239,8 @@ Function .onInit
     SetRegView 32
   !endif
   !insertmacro MULTIUSER_INIT
+  ; it appears that the languages shown may not always be filtered correctly
+  !define MUI_LANGDLL_ALLLANGUAGES
   !insertmacro MUI_LANGDLL_DISPLAY 
 FunctionEnd