diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py
index 5619b283fb..195d0facc3 100644
--- a/src/Tools/SubWCRev.py
+++ b/src/Tools/SubWCRev.py
@@ -233,7 +233,6 @@ class GitControl(VersionControl):
                 if remote in self.remotes:
                     url=self.remotes[remote]
                     #rewrite github to public url
-                    import re
                     match = re.match('git@github\.com:(\S+?)/(\S+\.git)',url) \
                             or re.match('https://github\.com/(\S+)/(\S+\.git)'\
                             ,url)
@@ -331,7 +330,6 @@ class GitControl(VersionControl):
         self.branch=self.branch[2:]
         self.getremotes() #setup self.remotes and branchlst
 
-        remote='origin' #used to determine the url
         self.geturl()
         origin = None #remote for the blessed master
         for fetchurl in ("git@github.com:FreeCAD/FreeCAD.git",\
@@ -350,8 +348,6 @@ class GitControl(VersionControl):
         if self.branch == '(no branch)': #check for remote branches
             if len(self.branchlst) >= 2:
                 self.branch = self.branchlst[1]
-                if '/' in self.branch:
-                    remote=self.branch.split('/',1)[0]
             else: # guess
                 self.branch = '(%s)' % \
                     os.popen("git describe --all --dirty").read().strip()
diff --git a/src/Tools/dir2qrc.py b/src/Tools/dir2qrc.py
index dbf2fc6913..9cd7b517c5 100644
--- a/src/Tools/dir2qrc.py
+++ b/src/Tools/dir2qrc.py
@@ -29,7 +29,7 @@ Version:
   0.1
 """
 
-import os,sys,string,getopt
+import os,sys,getopt
 from os.path import join
 
 # Globals
diff --git a/src/Tools/embedded/PySide/mainwindow2.py b/src/Tools/embedded/PySide/mainwindow2.py
index 62ea1bf5dc..eaa60d8cee 100644
--- a/src/Tools/embedded/PySide/mainwindow2.py
+++ b/src/Tools/embedded/PySide/mainwindow2.py
@@ -1,7 +1,7 @@
 import sys
 #sys.path.append("")
 
-from PySide import QtCore, QtGui
+from PySide import QtGui
 import FreeCADGui
 
 class MainWindow(QtGui.QMainWindow):
diff --git a/src/Tools/embedded/PySide/minimal.py b/src/Tools/embedded/PySide/minimal.py
index a07ae4dc5e..a1f4e00200 100644
--- a/src/Tools/embedded/PySide/minimal.py
+++ b/src/Tools/embedded/PySide/minimal.py
@@ -1,6 +1,6 @@
 import sys
-from PySide2 import QtCore, QtGui, QtWidgets
-import FreeCAD, FreeCADGui
+from PySide2 import QtWidgets
+import FreeCADGui
 
 class MainWindow(QtWidgets.QMainWindow):
     def showEvent(self, event):
diff --git a/src/Tools/fcbt/DistSetup.py b/src/Tools/fcbt/DistSetup.py
index c2182c3ae7..76b357a533 100644
--- a/src/Tools/fcbt/DistSetup.py
+++ b/src/Tools/fcbt/DistSetup.py
@@ -1,11 +1,4 @@
 
-
-# shell and operating system
-import os
-
-#import sys
-#sys.path.append( "E:\\Develop\\Projekte\\FreeCADWin\\src\\Tools" )
-
 from . import DistTools,FileTools
 
 DistName = DistTools.BuildDistName()
diff --git a/src/Tools/generateBase/generateTools.py b/src/Tools/generateBase/generateTools.py
index 2e4efa3243..ee65d00802 100644
--- a/src/Tools/generateBase/generateTools.py
+++ b/src/Tools/generateBase/generateTools.py
@@ -4,7 +4,7 @@
 
 from __future__ import print_function # this allows py2 to print(str1,str2) correctly
 
-import os, errno
+import os
 
 
 def temporary_exec(text, globals, locals):
diff --git a/src/Tools/generateTemplates/templateModule.py b/src/Tools/generateTemplates/templateModule.py
index 779060ed72..562e0016f8 100644
--- a/src/Tools/generateTemplates/templateModule.py
+++ b/src/Tools/generateTemplates/templateModule.py
@@ -2,8 +2,7 @@
 # -*- coding: utf-8 -*-
 # (c) 2006 Juergen Riegel 
 
-from . import template, templateModuleApp,templateModuleGui
-import generateBase.generateModel_Module
+from . import template, templateModuleApp
 
 class TemplateModule (template.ModelTemplate):
     def Generate(self):
diff --git a/src/Tools/generateTemplates/templateModuleGui.py b/src/Tools/generateTemplates/templateModuleGui.py
index fc0975863b..df0fe13fe4 100644
--- a/src/Tools/generateTemplates/templateModuleGui.py
+++ b/src/Tools/generateTemplates/templateModuleGui.py
@@ -3,9 +3,8 @@
 # (c) 2006 Juergen Riegel 
 
 from . import template
-import generateBase.generateModel_Module
 
 class TemplateModuleGui (template.ModelTemplate):
     def Generate(self):
-        print("Genertate() needs to be implemented in a Template class!")
+        print("Generate() needs to be implemented in a Template class!")
 
diff --git a/src/Tools/updatets.py b/src/Tools/updatets.py
index 66f8fb5f58..729511e6e8 100755
--- a/src/Tools/updatets.py
+++ b/src/Tools/updatets.py
@@ -50,7 +50,7 @@ Version:
   0.4
 """
 
-import os, re, sys
+import os, sys
 
 directories = [
         {"tsname":"FreeCAD", "workingdir":"./src/Gui", "tsdir":"Language"},