diff --git a/build.py b/build.py
index 8d3bb87d88a..0922a84b0ee 100755
--- a/build.py
+++ b/build.py
@@ -9,21 +9,19 @@
 # General build scripts.
 
 import os
-import re
 import sys
-import time
 import subprocess
 
 BUILD_PY = "-Dbuild.py=true"
 
 
 def popen(args, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE):
-        copy = os.environ.copy()
-        return subprocess.Popen(args,
-                env=copy,
-                stdin=stdin,
-                stdout=stdout,
-                stderr=stderr)
+    copy = os.environ.copy()
+    return subprocess.Popen(args,
+                            env=copy,
+                            stdin=stdin,
+                            stdout=stdout,
+                            stderr=stderr)
 
 
 def execute(args):
@@ -43,48 +41,54 @@ def notification(msg, prio):
         return
 
     try:
-        p = popen(["growlnotify","-t","OMERO Build Status","-p",str(prio)], stdin=subprocess.PIPE)
+        p = popen(["growlnotify", "-t", "OMERO Build Status", "-p",
+                   str(prio)], stdin=subprocess.PIPE)
         p.communicate(msg)
         rc = p.wait()
         if rc != 0:
-            pass # growl didn't work
+            pass  # growl didn't work
     except OSError:
-        pass # No growlnotify found, may want to use another tool
+        pass  # No growlnotify found, may want to use another tool
+
 
 def java_omero(args):
-    command = [ find_java() ]
-    p = os.path.join( os.path.curdir, "lib", "log4j-build.xml")
+    command = [find_java()]
+    p = os.path.join(os.path.curdir, "lib", "log4j-build.xml")
     command.append("-Dlog4j.configuration=%s" % p)
     command.append(BUILD_PY)
-    command.extend( calculate_memory_args() )
+    command.extend(calculate_memory_args())
     command.extend(["omero"])
-    if isinstance(args,str):
+    if isinstance(args, str):
         command.append(args)
     else:
         command.extend(args)
     execute(command)
 
+
 def find_java():
     return "java"
 
+
 def calculate_memory_args():
     return "-Xmx600M -XX:MaxPermSize=256m".split(" ")
 
+
 def handle_tools(args):
     _ = os.path.sep.join
     additions = []
     mappings = {
         "-top": _(["build.xml"]),
-        "-cpp": _(["components","tools","OmeroCpp","build.xml"]),
-        "-fs": _(["components","tools","OmeroFS","build.xml"]),
-        "-java": _(["components","tools","OmeroJava","build.xml"]),
-        "-py": _(["components","tools","OmeroPy","build.xml"]),
-        "-web": _(["components","tools","OmeroWeb","build.xml"]),
+        "-cpp": _(["components", "tools", "OmeroCpp", "build.xml"]),
+        "-fs": _(["components", "tools", "OmeroFS", "build.xml"]),
+        "-java": _(["components", "tools", "OmeroJava", "build.xml"]),
+        "-py": _(["components", "tools", "OmeroPy", "build.xml"]),
+        "-web": _(["components", "tools", "OmeroWeb", "build.xml"]),
     }
     while len(args) > 0 and args[0] in mappings.keys()+["-perf"]:
         if args[0] == "-perf":
             args.pop(0)
-            A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split()
+            A = ["-listener",
+                 "net.sf.antcontrib.perf.AntPerformanceListener"]
             additions.extend(A)
         elif args[0] in mappings.keys():
             F = mappings[args.pop(0)]
diff --git a/components/blitz/blitz_tools.py b/components/blitz/blitz_tools.py
index a0fe07dc677..b9cef7f309b 100644
--- a/components/blitz/blitz_tools.py
+++ b/components/blitz/blitz_tools.py
@@ -8,45 +8,47 @@
 #   Use is subject to license terms supplied in LICENSE.txt
 #
 
-import sys, os, glob, subprocess
-import optparse
-from SCons.Script.SConscript import *
-from SCons.Script import AddOption, GetOption
-from SCons.SConf import *
-from SCons.Variables import *
+import os
+import glob
+import subprocess
+from SCons.Script.SConscript import SConsEnvironment
 
 #
 # Global Directories
 #
-cwd = os.path.abspath( os.path.dirname( __file__ ) )
-top = os.path.abspath( os.path.join( cwd, os.path.pardir, os.path.pardir ) )
-blitz_resources = os.path.abspath( os.path.join( top, "components", "blitz", "resources") )
-blitz_generated = os.path.abspath( os.path.join( top, "components", "blitz", "generated") )
-tools_include = os.path.abspath( os.path.join( top, "components", "tools", "target", "include" ) )
-tools_library = os.path.abspath( os.path.join( top, "components", "tools", "target", "lib" ) )
-header = os.path.join( blitz_resources, "header.txt" )
+cwd = os.path.abspath(os.path.dirname(__file__))
+top = os.path.abspath(os.path.join(cwd, os.path.pardir, os.path.pardir))
+blitz_resources = os.path.abspath(
+    os.path.join(top, "components", "blitz", "resources"))
+blitz_generated = os.path.abspath(
+    os.path.join(top, "components", "blitz", "generated"))
+tools_include = os.path.abspath(
+    os.path.join(top, "components", "tools", "target", "include"))
+tools_library = os.path.abspath(
+    os.path.join(top, "components", "tools", "target", "lib"))
+header = os.path.join(blitz_resources, "header.txt")
 
 # Relative
 resources = os.path.abspath("resources")
 generated = os.path.abspath("generated")
 
 # Support ICE_HOME
-if os.environ.has_key("ICE_HOME"):
-    ice_home = os.path.abspath( os.environ["ICE_HOME"] )
+if "ICE_HOME" in os.environ:
+    ice_home = os.path.abspath(os.environ["ICE_HOME"])
     print "Using env[ICE_HOME] = %s" % (ice_home)
 else:
     ice_home = None
-if os.environ.has_key("SLICEPATH"):
-    slicepath = os.path.abspath( os.environ["SLICEPATH"] )
+if "SLICEPATH" in os.environ:
+    slicepath = os.path.abspath(os.environ["SLICEPATH"])
     print "Using env[SLICEPATH] = %s" % (slicepath)
 else:
     slicepath = None
-if os.environ.has_key("SLICE2JAVA"):
+if "SLICE2JAVA" in os.environ:
     slice2java = os.environ["SLICE2JAVA"]
     print "Using env[SLICE2JAVA] = %s" % (slice2java)
 else:
     slice2java = None
-if os.environ.has_key("SLICE2PY"):
+if "SLICE2PY" in os.environ:
     slice2py = os.environ["SLICE2PY"]
     print "Using env[SLICE2PY] = %s" % (slice2py)
 else:
@@ -68,17 +70,21 @@ def jdep(DEPMAP, target):
 # Helpers
 #
 
-def common(dir = generated):
+
+def common(dir=generated):
     """
     Necessary since output for C++ does not include directories.
     """
-    return ["-I%s" % generated, "-I%s" % resources, "-I%s" % slicepath, "--output-dir=%s" % dir]
+    return ["-I%s" % generated, "-I%s" % resources, "-I%s" % slicepath,
+            "--output-dir=%s" % dir]
+
 
 def names(dir, ice):
     basename = os.path.basename(ice)[:-4]
     filename = '%s/%s' % (dir, basename)
     return (basename, filename)
 
+
 def basenames(where, dir):
     for ice in glob.glob("%s/%s/*.ice" % (where, dir)):
         yield names(dir, ice)
@@ -87,37 +93,40 @@ def basenames(where, dir):
 # Define calls to slice2java and slice2py
 #
 
+
 def make_slice(command):
     def slice(target, source, env):
         args = command+[str(source[0].get_abspath())]
         rv = subprocess.call(args)
         if rv != 0:
-            raise Exception("%s returned %s" % (str(args), str(rv)) )
+            raise Exception("%s returned %s" % (str(args), str(rv)))
     return slice
 
+
 def slice_java(env, where, dir):
-    command  = [slice2java, "--tie"] + common()
+    command = [slice2java, "--tie"] + common()
     actions = []
     for basename, filename in basenames(where, dir):
         c = env.Command(
-            jdep(env["DEPMAP"], filename + '.java' ),             # target
+            jdep(env["DEPMAP"], filename + '.java'),              # target
             filename + '.ice',                                    # source
             make_slice(command),                                  # command
-            chdir = where )                                       # dir
-        actions.append( c )
+            chdir=where)                                          # dir
+        actions.append(c)
     return actions
 
+
 def slice_py(env, where, dir):
-    prefix = dir.replace("/","_") + "_"
-    command = [slice2py, "--prefix", "%s" % prefix ] + common()
+    prefix = dir.replace("/", "_") + "_"
+    command = [slice2py, "--prefix", "%s" % prefix] + common()
     actions = []
     for basename, filename in basenames(where, dir):
         c = env.Command(
-            [prefix + basename + '_ice.py' ],                      # target
-            filename + '.ice',                                     # source
+            [prefix + basename + '_ice.py'],                      # target
+            filename + '.ice',                                    # source
             make_slice(command),                                  # command
-            chdir = where )                                        # dir
-        actions.append( c )
+            chdir=where)                                          # dir
+        actions.append(c)
     return actions
 
 #
@@ -149,8 +158,10 @@ def __init__(self, **kwargs):
         except KeyError:
             self.omero_quiet = False
 
-        # Very odd error: using ENV = os.environ, rather than ENV = dict(os.environ)
-        # causes *sub*processes to receive a fresh environment with registry values
-        # for PATH, LIB, etc. *pre*pended to the variables.
-        SConsEnvironment.__init__(self, ENV = dict(os.environ), tools=tools, **kwargs)
+        # Very odd error: using ENV = os.environ, rather than
+        # ENV = dict(os.environ) causes *sub*processes to receive a fresh
+        # environment with registry values for PATH, LIB, etc. *pre*pended to
+        # the variables.
+        SConsEnvironment.__init__(self, ENV=dict(os.environ), tools=tools,
+                                  **kwargs)
         self.Decider('MD5-timestamp')
diff --git a/components/server/src/ome/services/sharing/make_data.py b/components/server/src/ome/services/sharing/make_data.py
index bab462a7057..5a823206249 100755
--- a/components/server/src/ome/services/sharing/make_data.py
+++ b/components/server/src/ome/services/sharing/make_data.py
@@ -10,7 +10,12 @@
 See LICENSE for details.
 
 """
-import sys, os, subprocess, time, glob
+import sys
+import os
+import subprocess
+import time
+import glob
+
 
 def readlink(file=sys.argv[0]):
     import stat
@@ -36,48 +41,56 @@ def readlink(file=sys.argv[0]):
 rep = os.path.join(top, "lib", "repository")
 rep = os.path.normpath(rep)
 
+
 def call(cmd, cwd="."):
     rc = subprocess.call(cmd, shell=True, cwd=cwd)
     if rc != 0:
         print "Halting..."
         sys.exit(rc)
 
+
 def clean(dir=dat):
         if os.path.exists(dat):
-            print "Removing %s. Cancel now if necessary. Waiting 5 seconds." % dat
+            print "Removing %s. Cancel now if necessary. Waiting 5 seconds." \
+                % dat
             time.sleep(5)
             ls = os.listdir(dat)
             for file in ls:
                 print "Removing %s" % file
-                os.remove(os.path.join(dat,file))
+                os.remove(os.path.join(dat, file))
             os.rmdir(dat)
 
+
 def slice(dir=dat):
         os.mkdir(dat)
-        README = open(os.path.join(dat,"README.txt"),"w")
+        README = open(os.path.join(dat, "README.txt"), "w")
         README.write("""
         THE FILES IN THIS DIRECTORY ARE GENERATE
         AND WILL BE AUTOMATICALLY DELETED
         """)
         README.flush()
         README.close()
-        call("""slice2freezej --dict ome.services.sharing.data.ShareMap,long,ome::services::sharing::data::ShareData \
-	--dict-index ome.services.sharing.data.ShareMap,id \
-	--dict-index ome.services.sharing.data.ShareMap,owner \
-        --output-dir %s \
-	Share.ice""" % src)
-        call("""slice2freezej --dict ome.services.sharing.data.ShareItems,long,ome::services::sharing::data::ShareItem \
-	--dict-index ome.services.sharing.data.ShareItems,type \
-	--dict-index ome.services.sharing.data.ShareItems,share \
-        --output-dir %s \
-	Share.ice""" % src)
+        call("""slice2freezej \
+--dict ome.services.sharing.data.ShareMap,\
+long,ome::services::sharing::data::ShareData \
+--dict-index ome.services.sharing.data.ShareMap,id \
+--dict-index ome.services.sharing.data.ShareMap,owner \
+--output-dir %s Share.ice""" % src)
+        call("""slice2freezej \
+--dict ome.services.sharing.data.ShareItems,\
+long,ome::services::sharing::data::ShareItem \
+--dict-index ome.services.sharing.data.ShareItems,type \
+--dict-index ome.services.sharing.data.ShareItems,share \
+--output-dir %s Share.ice""" % src)
         call("""slice2java --output-dir %s Share.ice""" % src)
 
+
 def compile(dir=dat):
-        proc = subprocess.Popen("slice2java --version", \
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE,
-                shell=True)
+        proc = subprocess.Popen(
+            "slice2java --version",
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            shell=True)
         version = proc.communicate()[1].strip()
         pat = "%s/ice*%s.jar" % (rep, version)
         cp = ":".join(glob.glob(pat))
diff --git a/components/tests/ui/library/python/ImageCheckLibrary.py b/components/tests/ui/library/python/ImageCheckLibrary.py
index 917fa4de600..1696040d0d7 100644
--- a/components/tests/ui/library/python/ImageCheckLibrary.py
+++ b/components/tests/ui/library/python/ImageCheckLibrary.py
@@ -33,10 +33,12 @@ def image_should_be_blank(path, expected=True):
 
     if expected:
         if not blank:
-            raise AssertionError("Image %s is not blank. min: %s, max: %s" % (path, minVals, maxVals))
+            raise AssertionError("Image %s is not blank. min: %s, max: %s"
+                                 % (path, minVals, maxVals))
     else:
         if blank:
-            raise AssertionError("Image %s is blank. min: %s, max: %s" % (path, minVals, maxVals))
+            raise AssertionError("Image %s is blank. min: %s, max: %s"
+                                 % (path, minVals, maxVals))
 
 
 def image_should_not_be_blank(path):
diff --git a/components/tools/setup.cfg b/components/tools/setup.cfg
deleted file mode 100644
index 13b90498fca..00000000000
--- a/components/tools/setup.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-[flake8]
-exclude=target,OmeroPy/src/omero_ext,OmeroPy/build,OmeroPy/target,pytest-*,OmeroWeb/omeroweb/webclient,OmeroWeb/omeroweb/webgateway
-
diff --git a/components/tools/travis-build b/components/tools/travis-build
index 8d1f3f6c579..cbbec0216be 100755
--- a/components/tools/travis-build
+++ b/components/tools/travis-build
@@ -35,7 +35,7 @@ build_java()
 
 build_python()
 {
-    flake8 -v components/tools
+    flake8 -v .
     ./build.py build-default
     ./build.py -py test -Dtest.with.fail=true -DMARK="not broken"
     ./build.py -fs test -Dtest.with.fail=true -DMARK="not broken"
diff --git a/docs/hudson/OMERO-qa-upgrade.py b/docs/hudson/OMERO-qa-upgrade.py
deleted file mode 100644
index ba759c0ac47..00000000000
--- a/docs/hudson/OMERO-qa-upgrade.py
+++ /dev/null
@@ -1,390 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import os
-import platform
-import subprocess
-
-
-def DEFINE(key, value):
-    m = globals()
-    m[key] = os.environ.get(key, value)
-    print key, "=>", m[key]
-
-
-###########################################################################
-# DETECTION
-###########################################################################
-WINDOWS = platform.system() == "Windows"
-p = subprocess.Popen(["hostname"], stdout=subprocess.PIPE)
-h = p.communicate()[0].strip()
-DEFINE("HOSTNAME", h)
-
-
-###########################################################################
-# CONFIGURATION
-###########################################################################
-
-# Most likely to be changed
-DEFINE("NAME", HOSTNAME)
-if HOSTNAME == "gretzky":
-    DEFINE("ADDRESS", "gretzky.openmicroscopy.org.uk")
-elif HOSTNAME == "howe":
-    DEFINE("ADDRESS", "howe.openmicroscopy.org.uk")
-elif HOSTNAME == "ome-dev-svr":
-    DEFINE("NAME", "win-2k8")
-    DEFINE("ADDRESS", "bp.openmicroscopy.org.uk")
-else:
-    DEFINE("ADDRESS", HOSTNAME)
-    # Don't send emails if we're not on a known host.
-    DEFINE("SKIPEMAIL", "true")
-if "SKIPEMAIL" not in globals():
-    DEFINE("SKIPEMAIL", "false")
-
-if WINDOWS:
-    DEFINE("UNZIP", "C:\\Program Files (x86)\\7-Zip\\7z.exe")
-    DEFINE("UNZIPARGS", "x")
-else:
-    DEFINE("UNZIP", "unzip")
-    DEFINE("UNZIPARGS", "")
-
-# new_server.py
-DEFINE("MEM", "Xmx1024M")
-DEFINE("SYM", "OMERO-CURRENT")
-DEFINE("CFG", os.path.join(os.path.expanduser("~"), "config.xml"))
-DEFINE("WEB", """'[["localhost", 4064, "%s"], ["gretzky.openmicroscopy.org.uk", 4064, "gretzky"], ["howe.openmicroscopy.org.uk", 4064, "howe"]]'""" % NAME)
-
-# send_email.py
-DEFINE("SUBJECT", "OMERO - %s was upgraded" % NAME)
-DEFINE("BRANCH", "OMERO-trunk")
-DEFINE("BUILD", "http://hudson.openmicroscopy.org.uk/job/%s/lastSuccessfulBuild/" % BRANCH)
-DEFINE("SENDER", "Chris Allan <callan@lifesci.dundee.ac.uk>")
-DEFINE("RECIPIENTS", ["ome-nitpick@lists.openmicroscopy.org.uk"])
-DEFINE("SERVER", "%s (%s)" % (NAME, ADDRESS))
-DEFINE("SMTP_SERVER", "smtp.dundee.ac.uk")
-DEFINE("WEBURL", "http://%s/omero/webclient/" % ADDRESS)
-
-DEFINE("SKIPWEB", "false")
-DEFINE("SKIPUNZIP", "false")
-###########################################################################
-
-import fileinput
-import smtplib
-import sys
-import urllib
-import re
-
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEText import MIMEText
-from email.MIMEImage import MIMEImage
-
-from zipfile import ZipFile
-
-from xml.etree.ElementTree import XML, ElementTree, tostring
-
-
-class Artifacts(object):
-
-    def __init__(self, build = BUILD):
-        self.server = None
-        self.win = list()
-        self.mac = list()
-        self.linux = list()
-
-        url = urllib.urlopen(build+"api/xml")
-        hudson_xml = url.read()
-        url.close()
-
-        root = XML(hudson_xml)
-
-        artifacts = root.findall("./artifact")
-        base_url = build+"artifact/"
-        if len(artifacts) <= 0:
-            raise AttributeError("No artifacts, please check build on Hudson.")
-        for artifact in artifacts:
-            filename = artifact.find("fileName").text
-
-            if filename.startswith("OMERO.server"):
-                self.server = base_url + artifact.find("relativePath").text
-            elif filename.startswith('OMERO.source'):
-                self.source = base_url + artifact.find("relativePath").text
-            elif filename.startswith('OMERO.imagej') or\
-                 filename.startswith('OMERO.java') or\
-                 filename.startswith('OMERO.matlab') or\
-                 filename.startswith('OMERO.py') or\
-                 filename.startswith('OMERO.server'):
-                pass
-            elif filename.startswith("OMERO.importer"):
-                regex = re.compile(r'.*win.zip')
-                regex2 = re.compile(r'.*mac.zip')
-                if not regex.match(filename) and not regex2.match(filename):
-                    self.linux.append(base_url + artifact.find("relativePath").text)
-            else:
-                regex = re.compile(r'.*win.zip')
-                if regex.match(filename):
-                    self.win.append(base_url + artifact.find("relativePath").text)
-
-                regex = re.compile(r'.*OSX.zip')
-                if regex.match(filename):
-                    self.mac.append(base_url + artifact.find("relativePath").text)
-
-                regex = re.compile(r'.*mac.zip')
-                if regex.match(filename):
-                    self.mac.append(base_url + artifact.find("relativePath").text)
-
-                regex = re.compile(r'.*b\d+.zip')
-                if regex.match(filename):
-                    self.linux.append(base_url + artifact.find("relativePath").text)
-
-    def download_server(self):
-
-        if self.server == None:
-            raise Exception("No server found")
-
-        filename = os.path.basename(self.server)
-        unzipped = filename.replace(".zip", "")
-
-        if os.path.exists(unzipped):
-            return unzipped
-
-        if not os.path.exists(filename):
-            print "Downloading %s..." % self.server
-            urllib.urlretrieve(self.server, filename)
-
-        if "false" == SKIPUNZIP.lower():
-            if UNZIPARGS:
-                command = [UNZIP, UNZIPARGS, filename]
-            else:
-                command = [UNZIP, filename]
-            p = subprocess.Popen(command)
-            rc = p.wait()
-            if rc != 0:
-                print "Couldn't unzip!"
-            else:
-                return unzipped
-
-        print "Unzip and run again"
-        sys.exit(0)
-
-
-class Email(object):
-
-    def __init__(self, artifacts, server = SERVER,\
-            sender = SENDER, recipients = RECIPIENTS,\
-            weburl = WEBURL, subject = SUBJECT,\
-            smtp_server = SMTP_SERVER):
-
-        TO = ",".join(recipients)
-        FROM = sender
-        text = "The OMERO.server on %s has been upgraded. \n" \
-                    "=========================\n" \
-                    "THIS SERVER REQUIRES VPN!\n" \
-                    "=========================\n" \
-                    "Please download suitable clients from: \n " \
-                    "\n - Windows: \n %s\n " \
-                    "\n - MAC: \n %s\n " \
-                    "\n - Linux: \n %s\n " \
-                    "\n - Webclient available on %s. \n \n " %\
-                    (server, "\n".join(artifacts.win), "\n".join(artifacts.mac), "\
-                    \n".join(artifacts.linux), weburl)
-        BODY = "\r\n".join((
-                "From: %s" % FROM,
-                "To: %s" % TO,
-                "Subject: %s" % subject,
-                "",
-                text))
-        server = smtplib.SMTP(smtp_server)
-        server.sendmail(FROM, recipients, BODY)
-        server.quit()
-
-        print "Mail was sent to: %s" % ",".join(recipients)
-
-
-class Upgrade(object):
-
-    def __init__(self, dir, cfg = CFG, mem = MEM, sym = SYM, skipweb = SKIPWEB):
-
-        print "%s: Upgrading %s (%s)..." % (self.__class__.__name__, dir, sym)
-
-        self.mem = mem
-        self.sym = sym
-        self.skipweb = skipweb
-
-        _ = self.set_cli(self.sym)
-
-        # Need lib/python set above
-        import path
-        self.cfg = path.path(cfg)
-        self.dir = path.path(dir)
-
-        self.stop(_)
-        self.configure(_)
-        self.directories(_)
-        self.start(_)
-
-    def stop(self, _):
-        import omero
-        try:
-            print "Stopping server..."
-            _("admin status --nodeonly")
-            _("admin stop")
-        except omero.cli.NonZeroReturnCode:
-            pass
-
-        if self.web():
-            print "Stopping web..."
-            self.stopweb(_)
-
-    def configure(self, _):
-
-        target = self.dir / "etc" / "grid" / "config.xml"
-        if target.exists():
-            print "Target %s already exists. Skipping..." % target
-            return # Early exit!
-
-        if not self.cfg.exists():
-            print "%s not found. Copying old files" % self.cfg
-            from path import path
-            old_grid = path("OMERO-CURRENT") / "etc" / "grid"
-            old_cfg = old_grid / "config.xml"
-            old_cfg.copy(target)
-        else:
-            self.cfg.copy(target)
-            _(["config", "set", "omero.web.server_list", WEB]) # TODO: Unneeded if copy old?
-
-        for line in fileinput.input([self.dir / "etc" / "grid" / "templates.xml"], inplace=True):
-            print line.replace("Xmx512M", self.mem).replace("Xmx256M", self.mem),
-
-    def start(self, _):
-        _("admin start")
-        if self.web():
-            print "Starting web ..."
-            self.startweb(_)
-
-    def set_cli(self, dir):
-
-        dir = os.path.abspath(dir)
-        lib = os.path.join(dir, "lib", "python")
-        if not os.path.exists(lib):
-            raise Exception("%s does not exist!" % lib)
-        sys.path.insert(0, lib)
-
-        import omero
-        import omero.cli
-
-        print "Using %s..." % omero.cli.__file__
-
-        self.cli = omero.cli.CLI()
-        self.cli.loadplugins()
-
-        return self._
-
-    def _(self, command):
-        """
-        Runs a command as if from the command-line
-        without the need for using popen or subprocess
-        """
-        if isinstance(command, str):
-            command = command.split()
-        else:
-            for idx, val in enumerate(command):
-                command[idx] = val
-        self.cli.invoke(command, strict=True)
-
-    def web(self):
-        return "false" == self.skipweb.lower()
-
-
-class UnixUpgrade(Upgrade):
-    """
-    def rmtree(self, d):
-        def on_rmtree(self, func, name, exc):
-            print "rmtree error: %s('%s') => %s" % (func.__name__, name, exc[1])
-        d = path.path(d)
-        d.rmtree(onerror = on_rmtree)
-    """
-
-    def stopweb(self, _):
-        _("web stop")
-
-    def startweb(self, _):
-        _("web start")
-
-    def confgure(self, _):
-        super(UnixUpgrade, self).configure(_)
-        var = self.dir / "var"
-        var.mkdir()
-        var.chmod(0755) # For Apache/Nginx
-
-    def directories(self, _):
-        try:
-            os.unlink(self.sym)
-        except:
-            print "Failed to delete %s" % self.sym
-
-        try:
-            os.symlink(self.dir, self.sym)
-        except:
-            print "Failed to symlink %s to %s" % (self.dir, self.sym)
-
-
-class WindowsUpgrade(Upgrade):
-
-    def stopweb(self, _):
-        print "Removing web from IIS ..."
-        _("web iis --remove")
-        self.iisreset()
-
-    def startweb(self, _):
-        print "Configuring web in IIS ..."
-        _("web iis")
-        self.iisreset()
-
-    def directories(self, _):
-        self.rmdir()
-        print "Should probably move directory to OLD_OMERO and test handles"
-        self.mklink(self.dir)
-
-    def call(self, command):
-        rc = subprocess.call(command, shell=True)
-        if rc != 0:
-            print "*"*80
-            print "Warning: '%s' returned with non-zero value: %s" % (command, rc)
-            print "*"*80
-
-    def rmdir(self):
-        """
-        """
-        self.call("rmdir OMERO-CURRENT".split())
-
-    def mklink(self, dir):
-        """
-        """
-        self.call("mklink /d OMERO-CURRENT".split() + ["%s" % dir])
-
-    def iisreset(self):
-        """
-        Calls iisreset
-        """
-        self.call(["iisreset"])
-
-
-if __name__ == "__main__":
-
-    artifacts = Artifacts()
-
-    if len(sys.argv) != 2:
-        dir = artifacts.download_server()
-        # Exits if directory does not exist!
-    else:
-        dir = sys.argv[1]
-
-    if platform.system() != "Windows":
-        u = UnixUpgrade(dir)
-    else:
-        u = WindowsUpgrade(dir)
-
-    if "false" == SKIPEMAIL.lower():
-        e = Email(artifacts)
-    else:
-        print "Skipping email..."
diff --git a/docs/hudson/launcher.py b/docs/hudson/launcher.py
deleted file mode 100644
index c3d7ce09bc8..00000000000
--- a/docs/hudson/launcher.py
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# $Id$
-#
-# Copyright 2010 Glencoe Software, Inc. All rights reserved.
-# Use is subject to license terms supplied in LICENSE.txt
-#
-# Hudson launcher script which properly launches the script
-# on the right system. This is used by most jobs via:
-#
-#   cd src
-#   cd docs
-#   cd hudson
-#   python launcher.py
-#
-# which will:
-#
-#   * download <BRANCH>.log from hudson
-#   * create hudson.log
-#   * run sh docs/hudson/OMERO-<BRANCH>-<COMPONENT>.sh
-#      or    docs\hudson\OMERO-<BRANCH>-<COMPONENT>.bat
-#
-
-import os
-import re
-import sys
-import urllib
-import platform
-import subprocess
-
-
-LOG_URL = "http://hudson.openmicroscopy.org.uk/job/OMERO-%(BRANCH)s/lastSuccessfulBuild/artifact/src/target/%(BRANCH)s.log"
-JOB_NAME_STR = "^OMERO-([^-]+)-(.*?)(/(.*))?$"
-JOB_NAME_REG = re.compile(JOB_NAME_STR)
-
-
-class ConfigOpener(urllib.FancyURLopener):
-    def http_error_default(self, url, fp, errcode, errmsg, headers):
-        if errcode and errcode > 400:
-             raise Exception("Error loading %s: %s" % (url, errcode))
-
-
-if __name__ == "__main__":
-
-
-    #
-    # FIND JOB NAME
-    #
-    job_name = os.environ["JOB_NAME"]
-    m = JOB_NAME_REG.match(job_name)
-    if not m:
-        print "Bad job name: %s doesn't match %r" % (job_name, JOB_NAME_STR)
-        sys.exit(1)
-
-    branch = m.group(1)
-    build = m.group(2)
-    axises = m.group(4)
-    if axises:
-        values = {}
-        for axis in axises.split(","):
-            parts = axis.split("=")
-            values[parts[0]] = parts[1]
-        job = values["component"]
-        label = values["label"]
-    else:
-        job = build
-
-    #
-    # SETUP
-    #
-    os.chdir("..") # docs
-    os.chdir("..") # OMERO_HOME
-    top = os.path.abspath(".")
-    build_log = os.path.join(top, "%s.log" % branch)
-    hudson_log = os.path.join(top, "hudson.log")
-    config_file = os.path.join(top, "%s.config" % branch)
-
-
-    #
-    # LOG FILES
-    #
-    log_url = LOG_URL % {"BRANCH": branch}
-    print "Loading %s ..." % log_url
-    url = urllib.urlopen(log_url)
-    build_log_text = url.read()
-    url.close()
-
-    f = open(build_log, "w")
-    for line in build_log_text.split("\n"):
-        f.write(line)
-        f.write("\n")
-        # Also import the file into the environment
-        line = line.strip()
-        parts = line.split("=")
-        if parts and parts[0]:
-            k = str(parts[0])
-            try:
-                v = str(parts[1])
-                os.environ[k] = v
-            except:
-                os.environ[k] = ""
-    f.close()
-
-    f = open(hudson_log, "w")
-    for key in sorted(os.environ):
-        f.write("%s=%s\n" % (key, os.environ[key]))
-    f.close
-
-    #
-    # CONFIG FILE
-    # -----------
-    # If this is not the "start" job, then download
-    # the <BRANCH>.config file created by start in
-    # order to access the server.
-    #
-    if axises and job != "start":
-        build_url = os.environ["BUILD_URL"]
-        build_url = build_url.replace("component=%s" % job, "component=start")
-        # These jobs don't have their own
-        # "start" component, so let them use
-        # the "linux" label.
-        if label == "macosx" or label == "matlab":
-            build_url = build_url.replace("label=%s" % label, "label=linux")
-        build_url = "%s/%s" % (build_url, "artifact/src/%s.config" % branch)
-        if os.path.exists(config_file):
-            print "Removing %s ..." % config_file
-            os.remove(config_file)
-        print "Downloading %s ... " % build_url
-        ConfigOpener().retrieve(build_url, filename=config_file)
-        os.environ["ICE_CONFIG"] = config_file
-
-
-    #
-    # BUILD COMMAND
-    #
-    path = os.path.join("docs", "hudson")
-    base = "OMERO-%s" % job
-    if "Windows" == platform.system():
-        name = base + ".bat"
-        cmd = []
-    else:
-        name = base + ".sh"
-        cmd = ["sh"]
-    path = os.path.join(path, name)
-    cmd.append(path)
-
-
-    #
-    # RUN
-    #
-    print "Launching", " ".join(cmd)
-    print "="*60
-    popen = subprocess.Popen(cmd, env = os.environ)
-    rcode = popen.wait()
-    if rcode != 0:
-        print "="*60
-        print "Build failed with rcode=%s" % rcode
-    sys.exit(rcode)
-
diff --git a/lib/composite.py b/lib/composite.py
index 37fc25a8a18..842a3bd9f86 100644
--- a/lib/composite.py
+++ b/lib/composite.py
@@ -17,17 +17,15 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 import time
-import sys
 import re
 import os
 
-from getopt import getopt, GetoptError
 from glob import glob
 from zipfile import ZipFile
 
@@ -47,6 +45,7 @@
 
 IGNORE = []
 
+
 def find(pattern):
     """Grabs platform specific distribution targets from target"""
     target = os.path.join(os.path.dirname(os.path.dirname(__file__)), "target")
@@ -55,6 +54,7 @@ def find(pattern):
         raise Exception("Nothing found! %s" % pattern)
     return artifacts
 
+
 def extract(artifact, target, ignore):
     """
     Extracts all files of a given artifact to a target directory filtering and
@@ -100,6 +100,7 @@ def extract(artifact, target, ignore):
     finally:
         zip_file.close()
 
+
 def compress(target, base):
     """Creates a ZIP recursively from a given base directory."""
     zip_file = ZipFile(target, 'w')
@@ -155,4 +156,3 @@ def compress(target, base):
 compress('%s.zip' % target, target)
 
 # Insight no longer uses omero_client.jar
-
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000000..edf92a31a0a
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[flake8]
+exclude=.git,components/bioformats,components/blitz/generated,components/tools/**/build,components/**/target,components/tools/OmeroPy/src/omero_ext,*pytest-*,components/tools/OmeroWeb/omeroweb/webclient,components/tools/OmeroWeb/omeroweb/webgateway,dist,docs/sphinx,docs/sphinx-api,target,examples,sql