--- a/Preferences/__init__.py	Fri Jun 15 11:56:58 2018 +0200
+++ b/Preferences/__init__.py	Fri Jun 15 18:49:48 2018 +0200
@@ -31,7 +31,7 @@
 from PyQt5.QtCore import QDir, QPoint, QLocale, QSettings, QFileInfo, \
     QCoreApplication, QByteArray, QSize, QUrl, Qt, QLibraryInfo, QDateTime
 from PyQt5.QtGui import QColor, QFont, QPalette
-from PyQt5.QtWidgets import QInputDialog, QApplication
+from PyQt5.QtWidgets import QApplication
 from PyQt5.QtNetwork import QNetworkRequest
 try:
     from PyQt5.QtWebKit import QWebSettings
@@ -48,8 +48,8 @@
 from E5Network.E5Ftp import E5FtpProxyType
 
 from Globals import settingsNameOrganization, settingsNameGlobal, \
-    settingsNameRecent, isWindowsPlatform, findPythonInterpreters, \
-    getPyQt5ModulesDirectory, qVersionTuple
+    settingsNameRecent, isWindowsPlatform, getPyQt5ModulesDirectory, \
+    qVersionTuple
 
 from Project.ProjectBrowserFlags import SourcesBrowserFlag, FormsBrowserFlag, \
     ResourcesBrowserFlag, TranslationsBrowserFlag, InterfacesBrowserFlag, \
@@ -94,8 +94,6 @@
         "ShowExceptionInShell": True,
         "Python2VirtualEnv": "",
         "Python3VirtualEnv": "",
-        "PythonInterpreter": "",
-        "Python3Interpreter": "",
         "RubyInterpreter": "",
         "DebugClientType": "standard",
         # supported "standard", "custom"
@@ -1799,6 +1797,8 @@
             prefClass.settings.value(
                 "Debugger/" + key, prefClass.debuggerDefaults[key]))
     elif key in ["PythonInterpreter", "Python3Interpreter"]:
+        # TODO: Remove this statement when done
+##        raise KeyError("{0} is no longer supported.".format(key))
         # This code is here to ensure backward compatibility.
         if key == "PythonInterpreter":
             newKey = "Python2VirtualEnv"