diff --git a/src/Mod/Arch/ArchAxis.py b/src/Mod/Arch/ArchAxis.py
index 0966a79b26..2f02b187ef 100644
--- a/src/Mod/Arch/ArchAxis.py
+++ b/src/Mod/Arch/ArchAxis.py
@@ -21,7 +21,7 @@
 
 import six
 
-import FreeCAD,Draft,math,DraftVecUtils,ArchCommands
+import FreeCAD,Draft,math,ArchCommands
 from FreeCAD import Vector
 if FreeCAD.GuiUp:
     import FreeCADGui
diff --git a/src/Mod/Arch/ArchBuilding.py b/src/Mod/Arch/ArchBuilding.py
index a1192c271d..2d37f63af6 100644
--- a/src/Mod/Arch/ArchBuilding.py
+++ b/src/Mod/Arch/ArchBuilding.py
@@ -23,7 +23,7 @@
 import FreeCAD,Draft,ArchCommands,ArchFloor
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
+    from PySide import QtCore
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchBuildingPart.py b/src/Mod/Arch/ArchBuildingPart.py
index cd8a3063e0..277d7f289d 100644
--- a/src/Mod/Arch/ArchBuildingPart.py
+++ b/src/Mod/Arch/ArchBuildingPart.py
@@ -30,7 +30,6 @@ import tempfile
 import os
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchComponent.py b/src/Mod/Arch/ArchComponent.py
index 6207ca7db6..119593e9d0 100644
--- a/src/Mod/Arch/ArchComponent.py
+++ b/src/Mod/Arch/ArchComponent.py
@@ -31,8 +31,7 @@ __title__  = "FreeCAD Arch Component"
 __author__ = "Yorik van Havre"
 __url__    = "https://www.freecadweb.org"
 
-import FreeCAD,Draft,ArchCommands,math,sys,json,os,ArchIFC,ArchIFCSchema
-from FreeCAD import Vector
+import FreeCAD,Draft,ArchCommands,sys,ArchIFC
 if FreeCAD.GuiUp:
     import FreeCADGui
     from PySide import QtGui,QtCore
diff --git a/src/Mod/Arch/ArchCurtainWall.py b/src/Mod/Arch/ArchCurtainWall.py
index 3226d37518..4696a79483 100644
--- a/src/Mod/Arch/ArchCurtainWall.py
+++ b/src/Mod/Arch/ArchCurtainWall.py
@@ -24,16 +24,14 @@ __title__  = "FreeCAD Arch Curtain Wall"
 __author__ = "Yorik van Havre"
 __url__    = "https://www.freecadweb.org"
 
-import math,sys
+import math
 import FreeCAD
-import Draft
 import ArchComponent
 import ArchCommands
 import DraftVecUtils
 
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchCutPlane.py b/src/Mod/Arch/ArchCutPlane.py
index 6339fd5012..00ac07d8d8 100644
--- a/src/Mod/Arch/ArchCutPlane.py
+++ b/src/Mod/Arch/ArchCutPlane.py
@@ -21,7 +21,6 @@
 #*****************************************************************************
 
 import FreeCAD,ArchCommands
-from FreeCAD import Vector
 if FreeCAD.GuiUp:
     import FreeCADGui
     from PySide import QtCore, QtGui
diff --git a/src/Mod/Arch/ArchEquipment.py b/src/Mod/Arch/ArchEquipment.py
index d9645dab88..205333c2c8 100644
--- a/src/Mod/Arch/ArchEquipment.py
+++ b/src/Mod/Arch/ArchEquipment.py
@@ -24,12 +24,10 @@ __title__  = "FreeCAD Equipment"
 __author__ = "Yorik van Havre"
 __url__    = "https://www.freecadweb.org"
 
-import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands
-from FreeCAD import Units
-from FreeCAD import Vector
+import FreeCAD,ArchComponent,DraftVecUtils
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
+    from PySide import QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchFence.py b/src/Mod/Arch/ArchFence.py
index a358c5a694..25c90ca1bc 100644
--- a/src/Mod/Arch/ArchFence.py
+++ b/src/Mod/Arch/ArchFence.py
@@ -25,7 +25,6 @@ import math
 
 import FreeCAD
 import ArchComponent
-import Draft
 import draftobjects.patharray as patharray
 
 if FreeCAD.GuiUp:
diff --git a/src/Mod/Arch/ArchFloor.py b/src/Mod/Arch/ArchFloor.py
index 7ebf61a3b4..94d85bc962 100644
--- a/src/Mod/Arch/ArchFloor.py
+++ b/src/Mod/Arch/ArchFloor.py
@@ -31,7 +31,6 @@ IfcType.
 import FreeCAD,Draft,ArchCommands, DraftVecUtils, ArchIFC
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchFrame.py b/src/Mod/Arch/ArchFrame.py
index af8c87223d..1fee9e3a70 100644
--- a/src/Mod/Arch/ArchFrame.py
+++ b/src/Mod/Arch/ArchFrame.py
@@ -19,11 +19,9 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands
-from FreeCAD import Vector
+import FreeCAD,Draft,ArchComponent,DraftVecUtils
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchIFC.py b/src/Mod/Arch/ArchIFC.py
index 1ab03aa79f..3ab5ea20eb 100644
--- a/src/Mod/Arch/ArchIFC.py
+++ b/src/Mod/Arch/ArchIFC.py
@@ -25,7 +25,7 @@
 and attributes of Arch/BIM objects.
 """
 
-import FreeCAD, os, json
+import FreeCAD,json
 
 if FreeCAD.GuiUp:
     from PySide.QtCore import QT_TRANSLATE_NOOP
diff --git a/src/Mod/Arch/ArchNesting.py b/src/Mod/Arch/ArchNesting.py
index b1abcbc954..45ca853378 100644
--- a/src/Mod/Arch/ArchNesting.py
+++ b/src/Mod/Arch/ArchNesting.py
@@ -23,7 +23,7 @@
 
 from __future__ import print_function
 
-import FreeCAD, Part, DraftGeomUtils, WorkingPlane, DraftVecUtils, math, Draft
+import FreeCAD, Part, DraftGeomUtils, WorkingPlane, DraftVecUtils, math
 from datetime import datetime
 
 # This is roughly based on the no-fit polygon algorithm, used in
diff --git a/src/Mod/Arch/ArchPanel.py b/src/Mod/Arch/ArchPanel.py
index a8fc8b3ef1..c6badcac1e 100644
--- a/src/Mod/Arch/ArchPanel.py
+++ b/src/Mod/Arch/ArchPanel.py
@@ -19,7 +19,7 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands,math, Part, ArchNesting
+import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands,math, Part
 from FreeCAD import Vector
 if FreeCAD.GuiUp:
     import FreeCADGui
diff --git a/src/Mod/Arch/ArchPipe.py b/src/Mod/Arch/ArchPipe.py
index 8a11b08b1d..d72626c697 100644
--- a/src/Mod/Arch/ArchPipe.py
+++ b/src/Mod/Arch/ArchPipe.py
@@ -22,8 +22,7 @@
 
 import FreeCAD, ArchComponent
 if FreeCAD.GuiUp:
-    import FreeCADGui, Arch_rc, os
-    from PySide import QtCore, QtGui
+    import FreeCADGui, Arch_rc
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchPrecast.py b/src/Mod/Arch/ArchPrecast.py
index 80dfbc4056..78a6b16f88 100644
--- a/src/Mod/Arch/ArchPrecast.py
+++ b/src/Mod/Arch/ArchPrecast.py
@@ -29,8 +29,6 @@ Beams, pillars, slabs and panels"""
 import ArchCommands,ArchComponent,FreeCAD
 from FreeCAD import Vector
 if FreeCAD.GuiUp:
-    import FreeCADGui
-    from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchProject.py b/src/Mod/Arch/ArchProject.py
index ee2bb2920a..503631235c 100644
--- a/src/Mod/Arch/ArchProject.py
+++ b/src/Mod/Arch/ArchProject.py
@@ -25,10 +25,9 @@ objects specifically for better IFC compatibility, allowing the user to tweak
 certain IFC relevant values.
 """
 
-import FreeCAD,Draft,ArchComponent,ArchCommands,math,re,datetime,ArchIFC,ArchIFCView
+import FreeCAD,ArchIFC,ArchIFCView
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchRebar.py b/src/Mod/Arch/ArchRebar.py
index 592c5b96a3..39bd4b6b6c 100644
--- a/src/Mod/Arch/ArchRebar.py
+++ b/src/Mod/Arch/ArchRebar.py
@@ -21,10 +21,8 @@
 # Modified Amritpal Singh <amrit3701@gmail.com> on 07-07-2017
 
 import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands
-from FreeCAD import Vector
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchRoof.py b/src/Mod/Arch/ArchRoof.py
index ec641320ad..6e09b91c04 100644
--- a/src/Mod/Arch/ArchRoof.py
+++ b/src/Mod/Arch/ArchRoof.py
@@ -22,8 +22,6 @@
 import math
 
 import ArchComponent
-import Arch_rc
-import Draft
 import DraftGeomUtils
 import DraftVecUtils
 import FreeCAD
diff --git a/src/Mod/Arch/ArchSchedule.py b/src/Mod/Arch/ArchSchedule.py
index b9fca79999..13454bf423 100644
--- a/src/Mod/Arch/ArchSchedule.py
+++ b/src/Mod/Arch/ArchSchedule.py
@@ -22,9 +22,9 @@
 
 from __future__ import print_function
 import sys
-import FreeCAD, time
+import FreeCAD
 if FreeCAD.GuiUp:
-    import FreeCADGui, Arch_rc, os
+    import FreeCADGui
     from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
diff --git a/src/Mod/Arch/ArchSectionPlane.py b/src/Mod/Arch/ArchSectionPlane.py
index 9aa8818b2e..50f559ca9a 100644
--- a/src/Mod/Arch/ArchSectionPlane.py
+++ b/src/Mod/Arch/ArchSectionPlane.py
@@ -20,13 +20,11 @@
 #***************************************************************************
 
 import FreeCAD
-import WorkingPlane
 import math
 import Draft
 import ArchCommands
 import DraftVecUtils
 import ArchComponent
-import os
 import re
 import tempfile
 import uuid
diff --git a/src/Mod/Arch/ArchSite.py b/src/Mod/Arch/ArchSite.py
index 1586de1f6f..e51532cd51 100644
--- a/src/Mod/Arch/ArchSite.py
+++ b/src/Mod/Arch/ArchSite.py
@@ -27,7 +27,6 @@ containers for Arch objects, and also define a terrain surface.
 import FreeCAD,Draft,ArchCommands,math,re,datetime,ArchIFC
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchSpace.py b/src/Mod/Arch/ArchSpace.py
index 344902f162..f196e6fb5a 100644
--- a/src/Mod/Arch/ArchSpace.py
+++ b/src/Mod/Arch/ArchSpace.py
@@ -145,7 +145,7 @@ ConditioningTypes = [
 "NaturallyVentedOnly"
 ]
 
-import FreeCAD,ArchComponent,ArchCommands,math,Draft,sys
+import FreeCAD,ArchComponent,ArchCommands,Draft,sys
 if FreeCAD.GuiUp:
     import FreeCADGui
     from PySide import QtCore, QtGui
diff --git a/src/Mod/Arch/ArchStairs.py b/src/Mod/Arch/ArchStairs.py
index 3877159b4b..f1cc5afaca 100644
--- a/src/Mod/Arch/ArchStairs.py
+++ b/src/Mod/Arch/ArchStairs.py
@@ -24,14 +24,13 @@ __author__ = "Yorik van Havre"
 __url__ = "https://www.freecadweb.org"
 
 
-import FreeCAD,ArchComponent,ArchCommands,Draft,DraftVecUtils,math,ArchPipe
+import FreeCAD,ArchComponent,Draft,DraftVecUtils,math,ArchPipe
 import Part, DraftGeomUtils
 
 
 from FreeCAD import Vector
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/ArchTruss.py b/src/Mod/Arch/ArchTruss.py
index fa5743894d..40fb76076e 100644
--- a/src/Mod/Arch/ArchTruss.py
+++ b/src/Mod/Arch/ArchTruss.py
@@ -24,15 +24,12 @@ __title__  = "FreeCAD Arch Truss"
 __author__ = "Yorik van Havre"
 __url__    = "https://www.freecadweb.org"
 
-import math,sys
+import math
 import FreeCAD
-import Draft
 import ArchComponent
-import ArchCommands
 
 if FreeCAD.GuiUp:
     import FreeCADGui
-    from PySide import QtCore, QtGui
     from DraftTools import translate
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
diff --git a/src/Mod/Arch/Dice3DS/dom3ds.py b/src/Mod/Arch/Dice3DS/dom3ds.py
index 3d688ce162..826d91c006 100644
--- a/src/Mod/Arch/Dice3DS/dom3ds.py
+++ b/src/Mod/Arch/Dice3DS/dom3ds.py
@@ -16,7 +16,7 @@ data of the second object like this:
 
 """
 
-import os, sys, struct
+import sys, struct
 
 import numpy
 
diff --git a/src/Mod/Arch/importGBXML.py b/src/Mod/Arch/importGBXML.py
index 3c54de64e8..21416fe404 100644
--- a/src/Mod/Arch/importGBXML.py
+++ b/src/Mod/Arch/importGBXML.py
@@ -23,7 +23,7 @@ __title__  = "FreeCAD GbXml exporter"
 __author__ = "Yorik van Havre"
 __url__    = "https://www.freecadweb.org"
 
-import os,FreeCAD,Draft
+import FreeCAD,Draft
 
 if FreeCAD.GuiUp:
     from DraftTools import translate
diff --git a/src/Mod/Arch/importSH3D.py b/src/Mod/Arch/importSH3D.py
index 31ebe74c8f..d7ad2d8737 100644
--- a/src/Mod/Arch/importSH3D.py
+++ b/src/Mod/Arch/importSH3D.py
@@ -24,7 +24,7 @@ __title__  = "FreeCAD SweetHome3D Importer"
 __author__ = "Yorik van Havre"
 __url__    = "https://www.freecadweb.org"
 
-import os,zipfile,xml.sax,FreeCAD,Part,Draft,Arch,Mesh,tempfile,math,Sketcher
+import os,zipfile,xml.sax,FreeCAD,Part,Draft,Arch,Mesh,tempfile,math
 
 ## @package importSH3D
 #  \ingroup ARCH
diff --git a/src/Mod/Arch/importWebGL.py b/src/Mod/Arch/importWebGL.py
index 0148279984..f2bae8213e 100644
--- a/src/Mod/Arch/importWebGL.py
+++ b/src/Mod/Arch/importWebGL.py
@@ -37,7 +37,7 @@
 
 """FreeCAD WebGL Exporter"""
 
-import FreeCAD,Mesh,Draft,Part,DraftGeomUtils,Arch,OfflineRenderingUtils,json,six
+import FreeCAD,Mesh,Draft,Part,OfflineRenderingUtils,json,six
 
 if FreeCAD.GuiUp:
     import FreeCADGui