Merge branch 'regSkills' into preview_proj_skills

2015-07-20 15:28:16 -04:00
2259 changed files with 2977 additions and 12396 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -13,11 +13,10 @@
 *.patch

 #Personal
-/saveddata/
+saveddata/

 #PyCharm
 .idea/

 #Pyfa file
 pyfaFits.html
-build/
--- a/README.md
+++ b/README.md
@@ -1,67 +1,22 @@
-# pyfa
+# Pyfa

-[![Join the chat at https://gitter.im/pyfa-org/Pyfa](https://badges.gitter.im/pyfa-org/Pyfa.svg)](https://gitter.im/pyfa-org/Pyfa?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+Pyfa is a cross-platform desktop fitting application for EVE online that can be used natively on any platform where python and wxwidgets are available.

-![pyfa](https://cloud.githubusercontent.com/assets/3904767/10271512/af385ef2-6ade-11e5-8f67-52b8b1e4c797.PNG)
+It provides many advanced features such as graphs and full calculations of any possible combination of modules, fits, etc.

-## What is it?
+Please see the [FAQ](https://github.com/DarkFenX/Pyfa/wiki/FAQ) for answers to common questions / concerns

-pyfa, short for **py**thon **f**itting **a**ssistant, allows you to create, experiment with, and save ship fittings without being in game. Open source and written in Python, it is available on any platform where Python 2.x and wxWidgets are available, including Windows, Mac OS X, and Linux.
+#### A note for Linux users
+pyfa currently only supports wxPython 2.8. However, there are some distros that have started to support 3.0 and subsequently dropped support for 2.8 altogether (such as Debian Jessie). If this is the case and wxPython 3.0 is the only version installed, the official pyfa releases will not run. You must either find a package for 2.8 or compile it yourself.

-## Latest Version and Changelogs
-The latest version along with release notes can always be found on the project's [Releases](https://github.com/DarkFenX/Pyfa/releases) page. pyfa will notify you if you are running an outdated version.
+For Debian Jessie, wxPython 2.8 is available in Sid (the unstable repo). you can use apt-pinning to install select packages from unstable and still keep your stable system. See http://jaqque.sbih.org/kplug/apt-pinning.html for me details.

-## Installation
-Windows and OS X users are supplied self-contained builds of pyfa on the [latest releases](https://github.com/pyfa-org/Pyfa/releases/latest) page. An `.exe` installer is also available for Windows builds. Linux users can run pyfa using their distribution's Python interpreter. There is no official self-contained package for Linux, however, there are a number of third-party packages available through distribution-specific repositories.
+3.0 support is being worked on and can be found on the wx3 branch. It may be stable enough for you, but there are a few bugs related to it. Please see the wx3 label on the GitHub issues area for me information on known issues (biggest one currently is GTK warning spam): https://github.com/DarkFenX/Pyfa/labels/wx3

-#### OS X
-There are two different distributives for OS X: `-mac` and `-mac-deprecated`. 
-
-* `-mac`: based on wxPython 3.0.2.0 and has updated libraries. This is the recommended build.
-* `-mac-deprecated`: utilizes older binaries running on wxPython 2.8; because of this, some features are not available (currently CREST support and Attribute Overrides). Additionally, as development happens primarily on wxPython 3.0, a few GUI bugs may pop up as `-mac-deprecated` is not actively tested. However, due to some general issues with wxPython 3.0, especially on some newer OS X versions, `-mac-deprecated` is still offered for those that need it.
-
-There is also a [Homebrew](http://brew.sh) option for installing pyfa on OS X. Please note this is maintained by a third-party and is not tested by pyfa developers. Simply fire up in terminal:
-```
-$ brew cask install pyfa
-```
-
-### Linux Distro-specific Packages
-The following is a list of pyfa packages available for certain distributions. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers.
-
-* Debian/Ubuntu/derivitives: https://github.com/AdamMajer/Pyfa/releases
-* Arch: https://aur.archlinux.org/packages/pyfa/
-* openSUSE: https://build.opensuse.org/package/show/home:rmk2/pyfa
-* FreeBSD: http://www.freshports.org/games/pyfa/ (see [#484](https://github.com/pyfa-org/Pyfa/issues/484) for instructions)
-
-### Dependencies
-If you wish to help with development or simply need to run pyfa through a Python interpreter, the following software is required:
-
-* Python 2.7
-* `wxPython` 2.8/3.0
-* `sqlalchemy` >= 0.6
-* `dateutil`
-* `matplotlib` (for some Linux distributions you may need to install separate wxPython bindings such as `python-matplotlib-wx`)
-* `requests`
-
-## Bug Reporting
-The preferred method of reporting bugs is through the project's [GitHub Issues interface](https://github.com/pyfa-org/Pyfa/issues). Alternatively, posting a report in the [pyfa thread](http://forums.eveonline.com/default.aspx?g=posts&t=247609) on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/DarkFenX/Pyfa/wiki/Bug-Reporting). 
-
-## License
-pyfa is licensed under the GNU GPL v3.0, see LICENSE
-
-## Resources
-* Development repository: [http://github.com/DarkFenX/Pyfa](http://github.com/DarkFenX/Pyfa)
-* XMPP conference: [pyfa@conference.jabber.org](pyfa@conference.jabber.org)
+#### Links
+* [Development repository: http://github.com/DarkFenX/Pyfa](http://github.com/DarkFenX/Pyfa)
+* [XMPP conference:
+pyfa@conference.jabber.org](pyfa@conference.jabber.org)
 * [EVE forum thread](http://forums.eveonline.com/default.aspx?g=posts&t=247609)
-* [EVE University guide using pyfa](http://wiki.eveuniversity.org/Guide_to_using_PYFA)
 * [EVE Online website](http://www.eveonline.com/)

-## Contacts:
-* Sable Blitzmann
-    * GitHub: @blitzmann
-    * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @blitzmann
-    * [Gitter chat](https://gitter.im/pyfa-org/Pyfa): @ blitzmann
-    * Email: sable.blitzmann@gmail.com
-
-## CCP Copyright Notice
-EVE Online, the EVE logo, EVE and all associated logos and designs are the intellectual property of CCP hf. All artwork, screenshots, characters, vehicles, storylines, world facts or other recognizable features of the intellectual property relating to these trademarks are likewise the intellectual property of CCP hf. EVE Online and the EVE logo are the registered trademarks of CCP hf. All rights are reserved worldwide. All other trademarks are the property of their respective owners. CCP hf. has granted permission to Osmium to use EVE Online and all associated logos and designs for promotional and information purposes on its website but does not endorse, and is not in any way affiliated with, Osmium. CCP is in no way responsible for the content on or functioning of this website, nor can it be liable for any damage arising from the use of this website.
--- a/config.py
+++ b/config.py
@@ -17,15 +17,18 @@ debug = False
 # Defines if our saveddata will be in pyfa root or not
 saveInRoot = False

+logLevel = logging.DEBUG
+
 # Version data
-version = "1.21.3"
-tag = "Stable"
-expansionName = "Citadel"
-expansionVersion = "1.11"
+version = "1.13.3"
+tag = "git"
+expansionName = "Aegis"
+expansionVersion = "1.0"
 evemonMinVersion = "4081"

 pyfaPath = None
 savePath = None
+staticPath = None
 saveDB = None
 gameDB = None

@@ -44,40 +47,23 @@ class StreamToLogger(object):
      for line in buf.rstrip().splitlines():
         self.logger.log(self.log_level, line.rstrip())

-def isFrozen():
-    if hasattr(sys, 'frozen'):
-        return True
-    else:
-        return False
-
-def getPyfaRoot():
-    base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else sys.argv[0]
-    root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
-    root = unicode(root, sys.getfilesystemencoding())
-    return root
-
 def __createDirs(path):
    if not os.path.exists(path):
        os.makedirs(path)

-def defPaths(customSavePath):
-    global debug
+def defPaths():
    global pyfaPath
    global savePath
+    global staticPath
    global saveDB
    global gameDB
    global saveInRoot
-
-    if debug:
-        logLevel = logging.DEBUG
-    else:
-        logLevel = logging.WARN
-
    # The main pyfa directory which contains run.py
    # Python 2.X uses ANSI by default, so we need to convert the character encoding
    pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
    if pyfaPath is None:
-        pyfaPath = getPyfaRoot()
+        pyfaPath = unicode(os.path.dirname(os.path.realpath(os.path.abspath(
+            sys.modules['__main__'].__file__))), sys.getfilesystemencoding())

    # Where we store the saved fits etc, default is the current users home directory
    if saveInRoot is True:
@@ -87,18 +73,11 @@ def defPaths(customSavePath):
    else:
        savePath = getattr(configforced, "savePath", None)
        if savePath is None:
-            if customSavePath is None: # customSavePath is not overriden
-                savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
+            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
                               sys.getfilesystemencoding())
-            else:
-                savePath = customSavePath

    __createDirs(savePath)

-    if isFrozen():
-        os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
-        os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
-
    format = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
    logging.basicConfig(format=format, level=logLevel)
    handler = logging.handlers.RotatingFileHandler(os.path.join(savePath, "log.txt"), maxBytes=1000000, backupCount=3)
@@ -113,10 +92,13 @@ def defPaths(customSavePath):
        sl = StreamToLogger(stdout_logger, logging.INFO)
        sys.stdout = sl

-        # This interferes with cx_Freeze's own handling of exceptions. Find a way to fix this.
-        #stderr_logger = logging.getLogger('STDERR')
-        #sl = StreamToLogger(stderr_logger, logging.ERROR)
-        #sys.stderr = sl
+        stderr_logger = logging.getLogger('STDERR')
+        sl = StreamToLogger(stderr_logger, logging.ERROR)
+        sys.stderr = sl
+
+    # Static EVE Data from the staticdata repository, should be in the staticdata
+    # directory in our pyfa directory
+    staticPath = os.path.join(pyfaPath, "staticdata")

    # The database where we store all the fits etc
    saveDB = os.path.join(savePath, "saveddata.db")
@@ -124,7 +106,7 @@ def defPaths(customSavePath):
    # The database where the static EVE data from the datadump is kept.
    # This is not the standard sqlite datadump but a modified version created by eos
    # maintenance script
-    gameDB = os.path.join(pyfaPath, "eve.db")
+    gameDB = os.path.join(staticPath, "eve.db")

    ## DON'T MODIFY ANYTHING BELOW ##
    import eos.config
--- a/dist_assets/mac/pyfa.icns
+++ b/dist_assets/mac/pyfa.icns
--- a/dist_assets/win/pyfa.ico
+++ b/dist_assets/win/pyfa.ico
--- a/eos/capSim.py
+++ b/eos/capSim.py
@@ -59,20 +59,26 @@ class CapSimulator(object):
        return duration, capNeed

    def init(self, modules):
-        """prepare modules. a list of (duration, capNeed, clipSize, disableStagger) tuples is
+        """prepare modules. a list of (duration, capNeed, clipSize) tuples is
         expected, with clipSize 0 if the module has infinite ammo.
            """
-        self.modules = modules
+        mods = {}
+        for module in modules:
+                if module in mods:
+                        mods[module] += 1
+                else:
+                        mods[module] = 1
+
+        self.modules = mods
+

    def reset(self):
        """Reset the simulator state"""
        self.state = []
-        mods = {}
        period = 1
        disable_period = False

-        # Loop over modules, clearing clipSize if applicable, and group modules based on attributes
-        for (duration, capNeed, clipSize, disableStagger) in self.modules:
+        for (duration, capNeed, clipSize), amount in self.modules.iteritems():
            if self.scale:
                duration, capNeed = self.scale_activation(duration, capNeed)

@@ -81,15 +87,7 @@ class CapSimulator(object):
            if not self.reload and capNeed > 0:
                clipSize = 0

-            # Group modules based on their properties
-            if (duration, capNeed, clipSize, disableStagger) in mods:
-                mods[(duration, capNeed, clipSize, disableStagger)] += 1
-            else:
-                mods[(duration, capNeed, clipSize, disableStagger)] = 1
-
-        # Loop over grouped modules, configure staggering and push to the simulation state
-        for (duration, capNeed, clipSize, disableStagger), amount in mods.iteritems():
-            if self.stagger and not disableStagger:
+            if self.stagger:
                if clipSize == 0:
                    duration = int(duration/amount)
                else:
@@ -169,13 +167,13 @@ class CapSimulator(object):

            iterations += 1

-            t_last = t_now
-
            if cap < cap_lowest:
                if cap < 0.0:
                    break
                cap_lowest = cap

+            t_last = t_now
+
            # queue the next activation of this module
            t_now += duration
            shot += 1
--- a/eos/config.py
+++ b/eos/config.py
@@ -4,8 +4,8 @@ import sys
 debug = False
 gamedataCache = True
 saveddataCache = True
-gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")), sys.getfilesystemencoding())
-saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
+gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "staticdata", "eve.db")), sys.getfilesystemencoding())
+saveddata_connectionstring = 'sqlite:///:memory:'

 #Autodetect path, only change if the autodetection bugs out.
 path = dirname(unicode(__file__, sys.getfilesystemencoding()))
--- a/eos/db/init.py
+++ b/eos/db/init.py
@@ -68,8 +68,14 @@ from eos.db.gamedata import *
 from eos.db.saveddata import *

 #Import queries
-from eos.db.gamedata.queries import *
-from eos.db.saveddata.queries import *
+from eos.db.gamedata.queries import getItem, searchItems, getVariations, getItemsByCategory, directAttributeRequest, \
+                                    getMarketGroup, getGroup, getCategory, getAttributeInfo, getMetaData, getMetaGroup
+from eos.db.saveddata.queries import getUser, getCharacter, getFit, getFitsWithShip, countFitsWithShip, searchFits, \
+                                     getCharacterList, getPrice, getDamagePatternList, getDamagePattern, \
+                                     getFitList, getFleetList, getFleet, save, remove, commit, add, \
+                                     getCharactersForUser, getMiscData, getSquadsIDsWithFitID, getWing, \
+                                     getSquad, getBoosterFits, getProjectedFits, getTargetResistsList, getTargetResists,\
+                                     clearPrices, countAllFits

 #If using in memory saveddata, you'll want to reflect it so the data structure is good.
 if config.saveddata_connectionstring == "sqlite:///:memory:":
--- a/eos/db/migration.py
+++ b/eos/db/migration.py
@@ -3,18 +3,22 @@ import shutil
 import time
 import re
 import os
-import migrations
-import logging

-logger = logging.getLogger(__name__)
+def getAppVersion():
+    # calculate app version based on upgrade files we have
+    appVersion = 0
+    for fname in os.listdir(os.path.join(os.path.dirname(__file__), "migrations")):
+        m = re.match("^upgrade(?P<index>\d+)\.py$", fname)
+        if not m:
+            continue
+        index = int(m.group("index"))
+        appVersion = max(appVersion, index)
+    return appVersion

 def getVersion(db):
    cursor = db.execute('PRAGMA user_version')
    return cursor.fetchone()[0]

-def getAppVersion():
-    return migrations.appVersion
-
 def update(saveddata_engine):
    dbVersion = getVersion(saveddata_engine)
    appVersion = getAppVersion()
@@ -33,10 +37,10 @@ def update(saveddata_engine):
        shutil.copyfile(config.saveDB, toFile)

        for version in xrange(dbVersion, appVersion):
-            func = migrations.updates[version+1]
-            if func:
-                logger.info("Applying database update: %d", version+1)
-                func(saveddata_engine)
+            module = __import__("eos.db.migrations.upgrade{}".format(version + 1), fromlist=True)
+            upgrade = getattr(module, "upgrade", False)
+            if upgrade:
+                upgrade(saveddata_engine)

        # when all is said and done, set version to current
        saveddata_engine.execute("PRAGMA user_version = {}".format(appVersion))
--- a/eos/db/migrations/init.py
+++ b/eos/db/migrations/init.py
@@ -7,25 +7,3 @@ define an upgrade() function with the logic. Please note that there must be as
 many upgrade files as there are database versions (version 5 would include
 upgrade files 1-5)
 """
-
-import pkgutil
-import re
-
-
-updates = {}
-appVersion = 0
-
-prefix = __name__ + "."
-for importer, modname, ispkg in pkgutil.iter_modules(__path__, prefix):
-    # loop through python files, extracting update number and function, and
-    # adding it to a list
-    modname_tail = modname.rsplit('.', 1)[-1]
-    module = __import__(modname, fromlist=True)
-    m = re.match("^upgrade(?P<index>\d+)$", modname_tail)
-    if not m:
-        continue
-    index = int(m.group("index"))
-    appVersion = max(appVersion, index)
-    upgrade = getattr(module, "upgrade", False)
-    if upgrade:
-        updates[index] = upgrade
--- a/eos/db/migrations/upgrade11.py
+++ b/eos/db/migrations/upgrade11.py
@@ -1,116 +0,0 @@
-"""
-Migration 11
-
- Converts modules based on December Release 2015 Tiericide
-    Some modules have been unpublished (and unpublished module attributes are removed
-    from database), which causes pyfa to crash. We therefore replace these
-    modules with their new replacements
-"""
-
-
-CONVERSIONS = {
-    16467: (  # Medium Gremlin Compact Energy Neutralizer
-        16471,  # Medium Unstable Power Fluctuator I
-    ),
-    22947: (  # 'Beatnik' Small Remote Armor Repairer
-        23414,  # 'Brotherhood' Small Remote Armor Repairer
-    ),
-    8295: (  # Type-D Restrained Shield Flux Coil
-        8293,  # Beta Reactor Control: Shield Flux I
-    ),
-    16499: (  # Heavy Knave Scoped Energy Nosferatu
-        16501,  # E500 Prototype Energy Vampire
-    ),
-    16477: (  # Heavy Infectious Scoped Energy Neutralizer
-        16473,  # Heavy Rudimentary Energy Destabilizer I
-    ),
-    16475: (  # Heavy Gremlin Compact Energy Neutralizer
-        16479,  # Heavy Unstable Power Fluctuator I
-    ),
-    16447: (  # Medium Solace Scoped Remote Armor Repairer
-        16445,  # Medium 'Arup' Remote Armor Repairer
-    ),
-    508: (  # 'Basic' Shield Flux Coil
-        8325,  # Alpha Reactor Shield Flux
-        8329,  # Marked Generator Refitting: Shield Flux
-        8323,  # Partial Power Plant Manager: Shield Flux
-        8327,  # Type-E Power Core Modification: Shield Flux
-    ),
-    1419: (  # 'Basic' Shield Power Relay
-        8341,  # Alpha Reactor Shield Power Relay
-        8345,  # Marked Generator Refitting: Shield Power Relay
-        8339,  # Partial Power Plant Manager: Shield Power Relay
-        8343,  # Type-E Power Core Modification: Shield Power Relay
-    ),
-    16439: (  # Small Solace Scoped Remote Armor Repairer
-        16437,  # Small 'Arup' Remote Armor Repairer
-    ),
-    16505: (  # Medium Ghoul Compact Energy Nosferatu
-        16511,  # Medium Diminishing Power System Drain I
-    ),
-    8297: (  # Mark I Compact Shield Flux Coil
-        8291,  # Local Power Plant Manager: Reaction Shield Flux I
-    ),
-    16455: (  # Large Solace Scoped Remote Armor Repairer
-        16453,  # Large 'Arup' Remote Armor Repairer
-    ),
-    6485: (  # M51 Benefactor Compact Shield Recharger
-        6491,  # Passive Barrier Compensator I
-        6489,  # 'Benefactor' Ward Reconstructor
-        6487,  # Supplemental Screen Generator I
-    ),
-    5137: (  # Small Knave Scoped Energy Nosferatu
-        5135,  # E5 Prototype Energy Vampire
-    ),
-    8579: (  # Medium Murky Compact Remote Shield Booster
-        8581,  # Medium 'Atonement' Remote Shield Booster
-    ),
-    8531: (  # Small Murky Compact Remote Shield Booster
-        8533,  # Small 'Atonement' Remote Shield Booster
-    ),
-    16497: (  # Heavy Ghoul Compact Energy Nosferatu
-        16503,  # Heavy Diminishing Power System Drain I
-    ),
-    4477: (  # Small Gremlin Compact Energy Neutralizer
-        4475,  # Small Unstable Power Fluctuator I
-    ),
-    8337: (  # Mark I Compact Shield Power Relay
-        8331,  # Local Power Plant Manager: Reaction Shield Power Relay I
-    ),
-    23416: (  # 'Peace' Large Remote Armor Repairer
-        22951,  # 'Pacifier' Large Remote Armor Repairer
-    ),
-    5141: (  # Small Ghoul Compact Energy Nosferatu
-        5139,  # Small Diminishing Power System Drain I
-    ),
-    4471: (  # Small Infectious Scoped Energy Neutralizer
-        4473,  # Small Rudimentary Energy Destabilizer I
-    ),
-    16469: (  # Medium Infectious Scoped Energy Neutralizer
-        16465,  # Medium Rudimentary Energy Destabilizer I
-    ),
-    8335: (  # Type-D Restrained Shield Power Relay
-        8333,  # Beta Reactor Control: Shield Power Relay I
-    ),
-    405: (  # 'Micro' Remote Shield Booster
-        8631,  # Micro Asymmetric Remote Shield Booster
-        8627,  # Micro Murky Remote Shield Booster
-        8629,  # Micro 'Atonement' Remote Shield Booster
-        8633,  # Micro S95a Remote Shield Booster
-    ),
-    8635: (  # Large Murky Compact Remote Shield Booster
-        8637,  # Large 'Atonement' Remote Shield Booster
-    ),
-    16507: (  # Medium Knave Scoped Energy Nosferatu
-        16509,  # E50 Prototype Energy Vampire
-    ),
-}
-
-def upgrade(saveddata_engine):
-
-    # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
-        for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-
--- a/eos/db/migrations/upgrade12.py
+++ b/eos/db/migrations/upgrade12.py
@@ -1,340 +0,0 @@
-"""
-Migration 12
-
- Converts modules based on March 2016 Module Tiericide
-    Some modules have been unpublished (and unpublished module attributes are removed
-    from database), which causes pyfa to crash. We therefore replace these
-    modules with their new replacements
-"""
-
-
-CONVERSIONS = {
-    16457: (  # Crosslink Compact Ballistic Control System
-        16459,  # Muon Coil Bolt Array I
-        16461,  # Multiphasic Bolt Array I
-        16463,  # 'Pandemonium' Ballistic Enhancement
-    ),
-    5281: (  # Coadjunct Scoped Remote Sensor Booster
-        7218,  # Piercing ECCM Emitter I
-    ),
-    5365: (  # Cetus Scoped Burst Jammer
-        5359,  # 1Z-3 Subversive ECM Eruption
-    ),
-    1973: (  # Sensor Booster I
-        1947,  # ECCM - Radar I
-        2002,  # ECCM - Ladar I
-        2003,  # ECCM - Magnetometric I
-        2004,  # ECCM - Gravimetric I
-        2005,  # ECCM - Omni I
-    ),
-    1951: (  # 'Basic' Tracking Enhancer
-        6322,  # Beta-Nought Tracking Mode
-        6323,  # Azimuth Descalloping Tracking Enhancer
-        6324,  # F-AQ Delay-Line Scan Tracking Subroutines
-        6321,  # Beam Parallax Tracking Program
-    ),
-    521: (  # 'Basic' Damage Control
-        5829,  # GLFF Containment Field
-        5831,  # Interior Force Field Array
-        5835,  # F84 Local Damage System
-        5833,  # Systematic Damage Control
-    ),
-    22925: (  # 'Bootleg' Remote Sensor Booster
-        22939,  # 'Boss' Remote Sensor Booster
-        22941,  # 'Entrepreneur' Remote Sensor Booster
-    ),
-    5443: (  # Faint Epsilon Scoped Warp Scrambler
-        5441,  # Fleeting Progressive Warp Scrambler I
-    ),
-    1963: (  # Remote Sensor Booster I
-        1959,  # ECCM Projector I
-    ),
-    6325: (  # Fourier Compact Tracking Enhancer
-        6326,  # Sigma-Nought Tracking Mode I
-        6327,  # Auto-Gain Control Tracking Enhancer I
-        6328,  # F-aQ Phase Code Tracking Subroutines
-    ),
-    21486: (  # 'Kindred' Gyrostabilizer
-        21488,  # Monophonic Stabilization Actuator I
-    ),
-    19927: (  # Hypnos Scoped Magnetometric ECM
-        9518,  # Initiated Ion Field ECM I
-    ),
-    10188: (  # 'Basic' Magnetic Field Stabilizer
-        11111,  # Insulated Stabilizer Array
-        11109,  # Linear Flux Stabilizer
-        11115,  # Gauss Field Balancer
-        11113,  # Magnetic Vortex Stabilizer
-    ),
-    22919: (  # 'Monopoly' Magnetic Field Stabilizer
-        22917,  # 'Capitalist' Magnetic Field Stabilizer I
-    ),
-    5839: (  # IFFA Compact Damage Control
-        5841,  # Emergency Damage Control I
-        5843,  # F85 Peripheral Damage System I
-        5837,  # Pseudoelectron Containment Field I
-    ),
-    522: (  # 'Micro' Cap Battery
-        4747,  # Micro Ld-Acid Capacitor Battery I
-        4751,  # Micro Ohm Capacitor Reserve I
-        4745,  # Micro F-4a Ld-Sulfate Capacitor Charge Unit
-        4749,  # Micro Peroxide Capacitor Power Cell
-        3480,  # Micro Capacitor Battery II
-    ),
-    518: (  # 'Basic' Gyrostabilizer
-        5915,  # Lateral Gyrostabilizer
-        5919,  # F-M2 Weapon Inertial Suspensor
-        5913,  # Hydraulic Stabilization Actuator
-        5917,  # Stabilized Weapon Mounts
-    ),
-    19931: (  # Compulsive Scoped Multispectral ECM
-        19933,  # 'Hypnos' Multispectral ECM I
-    ),
-    5403: (  # Faint Scoped Warp Disruptor
-        5401,  # Fleeting Warp Disruptor I
-    ),
-    23902: (  # 'Trebuchet' Heat Sink I
-        23900,  # 'Mangonel' Heat Sink I
-    ),
-    1893: (  # 'Basic' Heat Sink
-        5845,  # Heat Exhaust System
-        5856,  # C3S Convection Thermal Radiator
-        5855,  # 'Boreas' Coolant System
-        5854,  # Stamped Heat Sink
-    ),
-    6160: (  # F-90 Compact Sensor Booster
-        20214,  # Extra Radar ECCM Scanning Array I
-        20220,  # Extra Ladar ECCM Scanning Array I
-        20226,  # Extra Gravimetric ECCM Scanning Array I
-        20232,  # Extra Magnetometric ECCM Scanning Array I
-        7948,  # Gravimetric Positional ECCM Sensor System I
-        7964,  # Radar Positional ECCM Sensor System I
-        7965,  # Omni Positional ECCM Sensor System I
-        7966,  # Ladar Positional ECCM Sensor System I
-        7970,  # Magnetometric Positional ECCM Sensor System I
-        20218,  # Conjunctive Radar ECCM Scanning Array I
-        20224,  # Conjunctive Ladar ECCM Scanning Array I
-        20230,  # Conjunctive Gravimetric ECCM Scanning Array I
-        20236,  # Conjunctive Magnetometric ECCM Scanning Array I
-        6157,  # Supplemental Scanning CPU I
-    ),
-    23418: (  # 'Radical' Damage Control
-        22893,  # 'Gonzo' Damage Control I
-    ),
-    19952: (  # Umbra Scoped Radar ECM
-        9520,  # 'Penumbra' White Noise ECM
-    ),
-    1952: (  # Sensor Booster II
-        2258,  # ECCM - Omni II
-        2259,  # ECCM - Gravimetric II
-        2260,  # ECCM - Ladar II
-        2261,  # ECCM - Magnetometric II
-        2262,  # ECCM - Radar II
-    ),
-    5282: (  # Linked Enduring Sensor Booster
-        7219,  # Scattering ECCM Projector I
-    ),
-    1986: (  # Signal Amplifier I
-        2579,  # Gravimetric Backup Array I
-        2583,  # Ladar Backup Array I
-        2587,  # Magnetometric Backup Array I
-        2591,  # Multi Sensor Backup Array I
-        4013,  # RADAR Backup Array I
-    ),
-    4871: (  # Large Compact Pb-Acid Cap Battery
-        4875,  # Large Ohm Capacitor Reserve I
-        4869,  # Large F-4a Ld-Sulfate Capacitor Charge Unit
-        4873,  # Large Peroxide Capacitor Power Cell
-    ),
-    1964: (  # Remote Sensor Booster II
-        1960,  # ECCM Projector II
-    ),
-    5933: (  # Counterbalanced Compact Gyrostabilizer
-        5931,  # Cross-Lateral Gyrostabilizer I
-        5935,  # F-M3 Munition Inertial Suspensor
-        5929,  # Pneumatic Stabilization Actuator I
-    ),
-    4025: (  # X5 Enduring Stasis Webifier
-        4029,  # 'Langour' Drive Disruptor I
-    ),
-    4027: (  # Fleeting Compact Stasis Webifier
-        4031,  # Patterned Stasis Web I
-    ),
-    22937: (  # 'Enterprise' Remote Tracking Computer
-        22935,  # 'Tycoon' Remote Tracking Computer
-    ),
-    22929: (  # 'Marketeer' Tracking Computer
-        22927,  # 'Economist' Tracking Computer I
-    ),
-    1987: (  # Signal Amplifier II
-        2580,  # Gravimetric Backup Array II
-        2584,  # Ladar Backup Array II
-        2588,  # Magnetometric Backup Array II
-        2592,  # Multi Sensor Backup Array II
-        4014,  # RADAR Backup Array II
-    ),
-    19939: (  # Enfeebling Scoped Ladar ECM
-        9522,  # Faint Phase Inversion ECM I
-    ),
-    5340: (  # P-S Compact Remote Tracking Computer
-        5341,  # 'Prayer' Remote Tracking Computer
-    ),
-    19814: (  # Phased Scoped Target Painter
-        19808,  # Partial Weapon Navigation
-    ),
-    1949: (  # 'Basic' Signal Amplifier
-        1946,  # Basic RADAR Backup Array
-        1982,  # Basic Ladar Backup Array
-        1983,  # Basic Gravimetric Backup Array
-        1984,  # Basic Magnetometric Backup Array
-        1985,  # Basic Multi Sensor Backup Array
-        6193,  # Emergency Magnetometric Scanners
-        6194,  # Emergency Multi-Frequency Scanners
-        6202,  # Emergency RADAR Scanners
-        6216,  # Emergency Ladar Scanners
-        6217,  # Emergency Gravimetric Scanners
-        6225,  # Sealed RADAR Backup Cluster
-        6238,  # Sealed Magnetometric Backup Cluster
-        6239,  # Sealed Multi-Frequency Backup Cluster
-        6241,  # Sealed Ladar Backup Cluster
-        6242,  # Sealed Gravimetric Backup Cluster
-        6257,  # Surplus RADAR Reserve Array
-        6258,  # F-42 Reiterative RADAR Backup Sensors
-        6283,  # Surplus Magnetometric Reserve Array
-        6284,  # F-42 Reiterative Magnetometric Backup Sensors
-        6285,  # Surplus Multi-Frequency Reserve Array
-        6286,  # F-42 Reiterative Multi-Frequency Backup Sensors
-        6289,  # Surplus Ladar Reserve Array
-        6290,  # F-42 Reiterative Ladar Backup Sensors
-        6291,  # Surplus Gravimetric Reserve Array
-        6292,  # F-42 Reiterative Gravimetric Backup Sensors
-        6309,  # Amplitude Signal Enhancer
-        6310,  # 'Acolyth' Signal Booster
-        6311,  # Type-E Discriminative Signal Augmentation
-        6312,  # F-90 Positional Signal Amplifier
-    ),
-    21527: (  # 'Firewall' Signal Amplifier
-        21521,  # Gravimetric Firewall
-        21523,  # Ladar Firewall
-        21525,  # Magnetometric Firewall
-        21527,  # Multi Sensor Firewall
-        21529,  # RADAR Firewall
-    ),
-    23416: (  # 'Peace' Large Remote Armor Repairer
-        None,  # 'Pacifier' Large Remote Armor Repairer
-    ),
-    6176: (  # F-12 Enduring Tracking Computer
-        6174,  # Monopulse Tracking Mechanism I
-    ),
-    6159: (  # Alumel-Wired Enduring Sensor Booster
-        7917,  # Alumel Radar ECCM Sensor Array I
-        7918,  # Alumel Ladar ECCM Sensor Array I
-        7922,  # Alumel Gravimetric ECCM Sensor Array I
-        7926,  # Alumel Omni ECCM Sensor Array I
-        7937,  # Alumel Magnetometric ECCM Sensor Array I
-        7867,  # Supplemental Ladar ECCM Scanning Array I
-        7869,  # Supplemental Gravimetric ECCM Scanning Array I
-        7870,  # Supplemental Omni ECCM Scanning Array I
-        7887,  # Supplemental Radar ECCM Scanning Array I
-        7889,  # Supplemental Magnetometric ECCM Scanning Array I
-        20216,  # Incremental Radar ECCM Scanning Array I
-        20222,  # Incremental Ladar ECCM Scanning Array I
-        20228,  # Incremental Gravimetric ECCM Scanning Array I
-        20234,  # Incremental Magnetometric ECCM Scanning Array I
-        7892,  # Prototype ECCM Radar Sensor Cluster
-        7893,  # Prototype ECCM Ladar Sensor Cluster
-        7895,  # Prototype ECCM Gravimetric Sensor Cluster
-        7896,  # Prototype ECCM Omni Sensor Cluster
-        7914,  # Prototype ECCM Magnetometric Sensor Cluster
-        6158,  # Prototype Sensor Booster
-    ),
-    5849: (  # Extruded Compact Heat Sink
-        5846,  # Thermal Exhaust System I
-        5858,  # C4S Coiled Circuit Thermal Radiator
-        5857,  # 'Skadi' Coolant System I
-    ),
-    22895: (  # 'Shady' Sensor Booster
-        22897,  # 'Forger' ECCM - Magnetometric I
-    ),
-    11105: (  # Vortex Compact Magnetic Field Stabilizer
-        11103,  # Insulated Stabilizer Array I
-        11101,  # Linear Flux Stabilizer I
-        11107,  # Gauss Field Balancer I
-    ),
-    22945: (  # 'Executive' Remote Sensor Dampener
-        22943,  # 'Broker' Remote Sensor Dampener I
-    ),
-    6173: (  # Optical Compact Tracking Computer
-        6175,  # 'Orion' Tracking CPU I
-    ),
-    5279: (  # F-23 Compact Remote Sensor Booster
-        7217,  # Spot Pulsing ECCM I
-        7220,  # Phased Muon ECCM Caster I
-        5280,  # Connected Remote Sensor Booster
-    ),
-    4787: (  # Small Compact Pb-Acid Cap Battery
-        4791,  # Small Ohm Capacitor Reserve I
-        4785,  # Small F-4a Ld-Sulfate Capacitor Charge Unit
-        4789,  # Small Peroxide Capacitor Power Cell
-    ),
-    19946: (  # BZ-5 Scoped Gravimetric ECM
-        9519,  # FZ-3 Subversive Spatial Destabilizer ECM
-    ),
-    6073: (  # Medium Compact Pb-Acid Cap Battery
-        6097,  # Medium Ohm Capacitor Reserve I
-        6111,  # Medium F-4a Ld-Sulfate Capacitor Charge Unit
-        6083,  # Medium Peroxide Capacitor Power Cell
-    ),
-    21484: (  # 'Full Duplex' Ballistic Control System
-        21482,  # Ballistic 'Purge' Targeting System I
-    ),
-    6296: (  # F-89 Compact Signal Amplifier
-        6218,  # Protected Gravimetric Backup Cluster I
-        6222,  # Protected Ladar Backup Cluster I
-        6226,  # Protected Magnetometric Backup Cluster I
-        6230,  # Protected Multi-Frequency Backup Cluster I
-        6234,  # Protected RADAR Backup Cluster I
-        6195,  # Reserve Gravimetric Scanners
-        6199,  # Reserve Ladar Scanners
-        6203,  # Reserve Magnetometric Scanners
-        6207,  # Reserve Multi-Frequency Scanners
-        6212,  # Reserve RADAR Scanners
-        20238,  # Secure Gravimetric Backup Cluster I
-        20244,  # Secure Ladar Backup Cluster I
-        20250,  # Secure Magnetometric Backup Cluster I
-        20260,  # Secure Radar Backup Cluster I
-        6244,  # F-43 Repetitive Gravimetric Backup Sensors
-        6252,  # F-43 Repetitive Ladar Backup Sensors
-        6260,  # F-43 Repetitive Magnetometric Backup Sensors
-        6268,  # F-43 Repetitive Multi-Frequency Backup Sensors
-        6276,  # F-43 Repetitive RADAR Backup Sensors
-        20240,  # Shielded Gravimetric Backup Cluster I
-        20246,  # Shielded Ladar Backup Cluster I
-        20252,  # Shielded Magnetometric Backup Cluster I
-        20262,  # Shielded Radar Backup Cluster I
-        6243,  # Surrogate Gravimetric Reserve Array I
-        6251,  # Surrogate Ladar Reserve Array I
-        6259,  # Surrogate Magnetometric Reserve Array I
-        6267,  # Surrogate Multi-Frequency Reserve Array I
-        6275,  # Surrogate RADAR Reserve Array I
-        20242,  # Warded Gravimetric Backup Cluster I
-        20248,  # Warded Ladar Backup Cluster I
-        20254,  # Warded Magnetometric Backup Cluster I
-        20264,  # Warded Radar Backup Cluster I
-        6294,  # 'Mendicant' Signal Booster I
-        6293,  # Wavelength Signal Enhancer I
-        6295,  # Type-D Attenuation Signal Augmentation
-    ),
-    5302: (  # Phased Muon Scoped Sensor Dampener
-        5300,  # Indirect Scanning Dampening Unit I
-    ),
-}
-
-def upgrade(saveddata_engine):
-
-    # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
-        for retired_item in list:
-            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
-
--- a/eos/db/migrations/upgrade13.py
+++ b/eos/db/migrations/upgrade13.py
@@ -1,15 +0,0 @@
-"""
-Migration 13
-
- Alters fits table to introduce implant location attribute
-"""
-
-import sqlalchemy
-
-def upgrade(saveddata_engine):
-    # Update fits schema to include implant location attribute
-    try:
-        saveddata_engine.execute("SELECT implantLocation FROM fits LIMIT 1")
-    except sqlalchemy.exc.DatabaseError:
-        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN implantLocation INTEGER;")
-        saveddata_engine.execute("UPDATE fits SET implantLocation = 0")
--- a/eos/db/migrations/upgrade14.py
+++ b/eos/db/migrations/upgrade14.py
@@ -1,19 +0,0 @@
-"""
-Migration 14
-
- This should take care of issue #586.
-"""
-
-import sqlalchemy
-
-def upgrade(saveddata_engine):
-    if saveddata_engine.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='fighters'").scalar() == 'fighters':
-        # Fighters table exists
-        try:
-            saveddata_engine.execute("SELECT active FROM fighters LIMIT 1")
-        except sqlalchemy.exc.DatabaseError:
-            # if we don't have the active column, we are on an old pre-release version. Drop the tables and move on
-            # (they will be recreated)
-
-            saveddata_engine.execute("DROP TABLE fighters")
-            saveddata_engine.execute("DROP TABLE fightersAbilities")
--- a/eos/db/saveddata/init.py
+++ b/eos/db/saveddata/init.py
@@ -1,19 +1,3 @@
-__all__ = [
-    "character",
-    "fit",
-    "module",
-    "user",
-    "skill",
-    "price",
-    "booster",
-    "drone",
-    "implant",
-    "fleet",
-    "damagePattern",
-    "miscData",
-    "targetResists",
-    "override",
-    "crest",
-    "implantSet"
-]
-
+__all__ = ["character", "fit", "module", "user", "skill", "price",
+           "booster", "drone", "implant", "fleet", "damagePattern",
+           "miscData", "targetResists"]
--- a/eos/db/saveddata/character.py
+++ b/eos/db/saveddata/character.py
@@ -36,23 +36,9 @@ characters_table = Table("characters", saveddata_meta,
                         Column("ownerID", ForeignKey("users.ID"), nullable = True))

 mapper(Character, characters_table,
-        properties = {
-            "savedName": characters_table.c.name,
-            "_Character__owner": relation(
-                User,
-                backref = "characters"),
-            "_Character__skills": relation(
-                Skill,
-                backref="character",
-                cascade = "all,delete-orphan"),
-            "_Character__implants": relation(
-                Implant,
-                collection_class = HandledImplantBoosterList,
-                cascade='all,delete-orphan',
-                backref='character',
-                single_parent=True,
-                primaryjoin = charImplants_table.c.charID == characters_table.c.ID,
-                secondaryjoin = charImplants_table.c.implantID == Implant.ID,
-                secondary = charImplants_table),
-        }
-)
+       properties = {"_Character__owner" : relation(User, backref = "characters"),
+                     "_Character__skills" : relation(Skill, backref="character", cascade = "all,delete-orphan"),
+                     "_Character__implants" : relation(Implant, collection_class = HandledImplantBoosterList, cascade='all,delete-orphan', single_parent=True,
+                                                       primaryjoin = charImplants_table.c.charID == characters_table.c.ID,
+                                                       secondaryjoin = charImplants_table.c.implantID == Implant.ID,
+                                                       secondary = charImplants_table),})
--- a/eos/db/saveddata/crest.py
+++ b/eos/db/saveddata/crest.py
@@ -1,31 +0,0 @@
-#===============================================================================
-# Copyright (C) 2010 Diego Duclos
-#
-# This file is part of eos.
-#
-# eos is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# eos is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
-
-from sqlalchemy import Table, Column, Integer, String, Boolean
-from sqlalchemy.orm import mapper
-
-from eos.db import saveddata_meta
-from eos.types import CrestChar
-
-crest_table = Table("crest", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("name", String, nullable = False, unique = True),
-                         Column("refresh_token", String, nullable = False))
-
-mapper(CrestChar, crest_table)
--- a/eos/db/saveddata/fighter.py
+++ b/eos/db/saveddata/fighter.py
@@ -1,51 +0,0 @@
-#===============================================================================
-# Copyright (C) 2010 Diego Duclos
-#
-# This file is part of eos.
-#
-# eos is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# eos is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
-
-from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
-from sqlalchemy.orm import mapper
-from eos.db import saveddata_meta
-from eos.types import Fighter
-from sqlalchemy.orm import *
-from sqlalchemy.sql import and_
-from eos.effectHandlerHelpers import *
-from eos.types import FighterAbility
-
-
-fighters_table = Table("fighters", saveddata_meta,
-                     Column("groupID", Integer, primary_key=True),
-                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
-                     Column("itemID", Integer, nullable = False),
-                     Column("active", Boolean, nullable=True),
-                     Column("amount", Integer, nullable = False),
-                     Column("projected", Boolean, default = False))
-
-fighter_abilities_table = Table("fightersAbilities", saveddata_meta,
-                     Column("groupID", Integer, ForeignKey("fighters.groupID"), primary_key=True, index = True),
-                     Column("effectID", Integer, nullable = False, primary_key=True),
-                     Column("active", Boolean, default = False))
-
-mapper(Fighter, fighters_table,
-       properties = {
-            "_Fighter__abilities": relation(
-                FighterAbility,
-                backref="fighter",
-                cascade='all, delete, delete-orphan'),
-       })
-
-mapper(FighterAbility, fighter_abilities_table)
--- a/eos/db/saveddata/fit.py
+++ b/eos/db/saveddata/fit.py
@@ -26,10 +26,9 @@ from sqlalchemy.orm.collections import attribute_mapped_collection
 from eos.db import saveddata_meta
 from eos.db.saveddata.module import modules_table
 from eos.db.saveddata.drone import drones_table
-from eos.db.saveddata.fighter import fighters_table
 from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.implant import fitImplants_table
-from eos.types import Fit, Module, User, Booster, Drone, Fighter, Cargo, Implant, Character, DamagePattern, TargetResists, ImplantLocation
+from eos.types import Fit, Module, User, Booster, Drone, Cargo, Implant, Character, DamagePattern, TargetResists
 from eos.effectHandlerHelpers import *

 fits_table = Table("fits", saveddata_meta,
@@ -43,7 +42,6 @@ fits_table = Table("fits", saveddata_meta,
                         Column("booster", Boolean, nullable = False, index = True, default = 0),
                         Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
                         Column("modeID", Integer, nullable=True),
-                         Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT),
 )

 projectedFits_table = Table("projectedFits", saveddata_meta,
@@ -119,12 +117,6 @@ mapper(Fit, fits_table,
                cascade='all, delete, delete-orphan',
                single_parent=True,
                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
-            "_Fit__fighters": relation(
-                Fighter,
-                collection_class=HandledDroneCargoList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == False)),
            "_Fit__cargo": relation(
                Cargo,
                collection_class=HandledDroneCargoList,
@@ -137,12 +129,6 @@ mapper(Fit, fits_table,
                cascade='all, delete, delete-orphan',
                single_parent=True,
                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
-            "_Fit__projectedFighters": relation(
-                Fighter,
-                collection_class=HandledProjectedDroneList,
-                cascade='all, delete, delete-orphan',
-                single_parent=True,
-                primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)),
            "_Fit__implants": relation(
                Implant,
                collection_class=HandledImplantBoosterList,
--- a/eos/db/saveddata/implant.py
+++ b/eos/db/saveddata/implant.py
@@ -36,8 +36,4 @@ charImplants_table = Table("charImplants", saveddata_meta,
                           Column("charID", ForeignKey("characters.ID"), index = True),
                           Column("implantID", ForeignKey("implants.ID"), primary_key = True))

-implantsSetMap_table = Table("implantSetMap", saveddata_meta,
-                             Column("setID", ForeignKey("implantSets.ID"), index = True),
-                             Column("implantID", ForeignKey("implants.ID"), primary_key = True))
-
 mapper(Implant, implants_table)
--- a/eos/db/saveddata/implantSet.py
+++ b/eos/db/saveddata/implantSet.py
@@ -1,45 +0,0 @@
-#===============================================================================
-# Copyright (C) 2016 Ryan Holmes
-#
-# This file is part of eos.
-#
-# eos is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# eos is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
-
-from sqlalchemy import Table, Column, Integer, ForeignKey, String
-from sqlalchemy.orm import relation, mapper
-
-from eos.db import saveddata_meta
-from eos.db.saveddata.implant import implantsSetMap_table
-from eos.types import Implant, ImplantSet
-from eos.effectHandlerHelpers import HandledImplantBoosterList
-
-implant_set_table = Table("implantSets", saveddata_meta,
-                         Column("ID", Integer, primary_key = True),
-                         Column("name", String, nullable = False),
-)
-
-mapper(ImplantSet, implant_set_table,
-        properties = {
-            "_ImplantSet__implants": relation(
-                Implant,
-                collection_class = HandledImplantBoosterList,
-                cascade='all, delete, delete-orphan',
-                backref='set',
-                single_parent=True,
-                primaryjoin = implantsSetMap_table.c.setID == implant_set_table.c.ID,
-                secondaryjoin = implantsSetMap_table.c.implantID == Implant.ID,
-                secondary = implantsSetMap_table),
-        }
-)
--- a/eos/db/saveddata/override.py
+++ b/eos/db/saveddata/override.py
@@ -1,31 +0,0 @@
-#===============================================================================
-# Copyright (C) 2010 Diego Duclos
-#
-# This file is part of eos.
-#
-# eos is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# eos is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with eos.  If not, see <http://www.gnu.org/licenses/>.
-#===============================================================================
-
-from sqlalchemy import Table, Column, Integer, Float
-from sqlalchemy.orm import mapper
-
-from eos.db import saveddata_meta
-from eos.types import Override
-
-overrides_table = Table("overrides", saveddata_meta,
-                     Column("itemID", Integer, primary_key=True,  index = True),
-                     Column("attrID", Integer, primary_key=True, index = True),
-                     Column("value", Float, nullable = False))
-
-mapper(Override, overrides_table)
--- a/eos/db/saveddata/queries.py
+++ b/eos/db/saveddata/queries.py
@@ -19,8 +19,7 @@

 from eos.db.util import processEager, processWhere
 from eos.db import saveddata_session, sd_lock
-
-from eos.types import *
+from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad, TargetResists
 from eos.db.saveddata.fleet import squadmembers_table
 from eos.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
@@ -154,7 +153,7 @@ def getCharacter(lookfor, eager=None):
    elif isinstance(lookfor, basestring):
        eager = processEager(eager)
        with sd_lock:
-            character = saveddata_session.query(Character).options(*eager).filter(Character.savedName == lookfor).first()
+            character = saveddata_session.query(Character).options(*eager).filter(Character.name == lookfor).first()
    else:
        raise TypeError("Need integer or string as argument")
    return character
@@ -183,7 +182,7 @@ def getFit(lookfor, eager=None):
        else:
            eager = processEager(eager)
            with sd_lock:
-                fit = saveddata_session.query(Fit).options(*eager).filter(Fit.ID == lookfor).first()
+                fit = saveddata_session.query(Fit).options(*eager).filter(Fit.ID == fitID).first()
    else:
        raise TypeError("Need integer as argument")

@@ -349,12 +348,6 @@ def getTargetResistsList(eager=None):
        patterns = saveddata_session.query(TargetResists).options(*eager).all()
    return patterns

-def getImplantSetList(eager=None):
-    eager = processEager(eager)
-    with sd_lock:
-        sets = saveddata_session.query(ImplantSet).options(*eager).all()
-    return sets
-
@cachedQuery(DamagePattern, 1, "lookfor")
 def getDamagePattern(lookfor, eager=None):
    if isinstance(lookfor, int):
@@ -391,24 +384,6 @@ def getTargetResists(lookfor, eager=None):
        raise TypeError("Need integer or string as argument")
    return pattern

-@cachedQuery(ImplantSet, 1, "lookfor")
-def getImplantSet(lookfor, eager=None):
-    if isinstance(lookfor, int):
-        if eager is None:
-            with sd_lock:
-                pattern = saveddata_session.query(ImplantSet).get(lookfor)
-        else:
-            eager = processEager(eager)
-            with sd_lock:
-                pattern = saveddata_session.query(ImplantSet).options(*eager).filter(TargetResists.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
-        eager = processEager(eager)
-        with sd_lock:
-            pattern = saveddata_session.query(ImplantSet).options(*eager).filter(TargetResists.name == lookfor).first()
-    else:
-        raise TypeError("Improper argument")
-    return pattern
-
 def searchFits(nameLike, where=None, eager=None):
    if not isinstance(nameLike, basestring):
        raise TypeError("Need string as argument")
@@ -441,45 +416,6 @@ def getProjectedFits(fitID):
    else:
        raise TypeError("Need integer as argument")

-def getCrestCharacters(eager=None):
-    eager = processEager(eager)
-    with sd_lock:
-        characters = saveddata_session.query(CrestChar).options(*eager).all()
-    return characters
-
-@cachedQuery(CrestChar, 1, "lookfor")
-def getCrestCharacter(lookfor, eager=None):
-    if isinstance(lookfor, int):
-        if eager is None:
-            with sd_lock:
-                character = saveddata_session.query(CrestChar).get(lookfor)
-        else:
-            eager = processEager(eager)
-            with sd_lock:
-                character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
-        eager = processEager(eager)
-        with sd_lock:
-            character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.name == lookfor).first()
-    else:
-        raise TypeError("Need integer or string as argument")
-    return character
-
-def getOverrides(itemID, eager=None):
-    if isinstance(itemID, int):
-        return saveddata_session.query(Override).filter(Override.itemID == itemID).all()
-    else:
-        raise TypeError("Need integer as argument")
-
-def clearOverrides():
-    with sd_lock:
-        deleted_rows = saveddata_session.query(Override).delete()
-    commit()
-    return deleted_rows
-
-def getAllOverrides(eager=None):
-    return saveddata_session.query(Override).all()
-
 def removeInvalid(fits):
    invalids = [f for f in fits if f.isInvalid]

--- a/eos/effectHandlerHelpers.py
+++ b/eos/effectHandlerHelpers.py
@@ -135,11 +135,6 @@ class HandledModuleList(HandledList):
        HandledList.append(self, mod)
        if mod.isInvalid:
            self.remove(mod)
-            return
-
-        # fix for #529, where a module may be in incorrect state after CCP changes mechanics of module
-        if not mod.isValidState(mod.state):
-            mod.state = eos.types.State.ONLINE

    def insert(self, index, mod):
        mod.position = index
@@ -164,10 +159,6 @@ class HandledModuleList(HandledList):
            dummy.position = index
            self[index] = dummy

-    def toModule(self, index, mod):
-        mod.position = index
-        self[index] = mod
-
    def freeSlot(self, slot):
        for i in range(len(self) -1, -1, -1):
            mod = self[i]
--- a/eos/effects/addtosignatureradius2.py
+++ b/eos/effects/addtosignatureradius2.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Bomb (2 of 2)
-# Modules from group: Shield Extender (33 of 33)
+# Modules from group: Shield Extender (25 of 25)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))
--- a/eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py
+++ b/eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py
@@ -4,5 +4,5 @@
 # Skill: Advanced Drone Interfacing
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Fighter Support Unit",
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Drone Control Unit",
                                     "maxGroupActive", skill.level)
--- a/eos/effects/ammofallofmultiplier.py
+++ b/eos/effects/ammofallofmultiplier.py
@@ -1,12 +1,12 @@
 # ammoFallofMultiplier
 #
 # Used by:
-# Charges from group: Advanced Artillery Ammo (8 of 8)
-# Charges from group: Advanced Autocannon Ammo (8 of 8)
-# Charges from group: Advanced Beam Laser Crystal (8 of 8)
-# Charges from group: Advanced Blaster Charge (8 of 8)
-# Charges from group: Advanced Pulse Laser Crystal (8 of 8)
-# Charges from group: Advanced Railgun Charge (8 of 8)
+# Charges from group: Advanced Artillery Ammo (6 of 6)
+# Charges from group: Advanced Autocannon Ammo (6 of 6)
+# Charges from group: Advanced Beam Laser Crystal (6 of 6)
+# Charges from group: Advanced Blaster Charge (6 of 6)
+# Charges from group: Advanced Pulse Laser Crystal (6 of 6)
+# Charges from group: Advanced Railgun Charge (6 of 6)
 type = "passive"
 def handler(fit, module, context):
    module.multiplyItemAttr("falloff", module.getModifiedChargeAttr("fallofMultiplier") or 1)
--- a/eos/effects/ammoinfluencecapneed.py
+++ b/eos/effects/ammoinfluencecapneed.py
@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (465 of 884)
+# Items from category: Charge (458 of 831)
 type = "passive"
 def handler(fit, module, context):
    # Dirty hack to work around cap charges setting cap booster
--- a/eos/effects/ammoinfluencerange.py
+++ b/eos/effects/ammoinfluencerange.py
@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (571 of 884)
+# Items from category: Charge (559 of 831)
 type = "passive"
 def handler(fit, module, context):
    module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))
--- a/eos/effects/ammotrackingmultiplier.py
+++ b/eos/effects/ammotrackingmultiplier.py
@@ -1,12 +1,12 @@
 # ammoTrackingMultiplier
 #
 # Used by:
-# Charges from group: Advanced Artillery Ammo (8 of 8)
-# Charges from group: Advanced Autocannon Ammo (8 of 8)
-# Charges from group: Advanced Beam Laser Crystal (8 of 8)
-# Charges from group: Advanced Blaster Charge (8 of 8)
-# Charges from group: Advanced Pulse Laser Crystal (8 of 8)
-# Charges from group: Advanced Railgun Charge (8 of 8)
+# Charges from group: Advanced Artillery Ammo (6 of 6)
+# Charges from group: Advanced Autocannon Ammo (6 of 6)
+# Charges from group: Advanced Beam Laser Crystal (6 of 6)
+# Charges from group: Advanced Blaster Charge (6 of 6)
+# Charges from group: Advanced Pulse Laser Crystal (6 of 6)
+# Charges from group: Advanced Railgun Charge (6 of 6)
 # Charges from group: Projectile Ammo (129 of 129)
 type = "passive"
 def handler(fit, module, context):
--- a/eos/effects/angelsetbonus.py
+++ b/eos/effects/angelsetbonus.py
@@ -5,7 +5,7 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(
+    fit.implants.filteredItemMultiply(
        lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and "implantSetAngel" in implant.itemModifiedAttributes,
        "signatureRadiusBonus",
        implant.getModifiedItemAttr("implantSetAngel"))
--- a/eos/effects/armorallrepairsystemsamountbonuspassive.py
+++ b/eos/effects/armorallrepairsystemsamountbonuspassive.py
@@ -2,7 +2,6 @@
 #
 # Used by:
 # Implants named like: Exile Booster (4 of 4)
-# Implant: Antipharmakon Kosybo
 type = "passive"
 def handler(fit, booster, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),
--- a/eos/effects/armordamageamountbonuscapitalarmorrepairers.py
+++ b/eos/effects/armordamageamountbonuscapitalarmorrepairers.py
@@ -6,4 +6,4 @@ type = "passive"
 def handler(fit, implant, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
                                  "armorDamageAmount", implant.getModifiedItemAttr("repairBonus"),
-                                  stackingPenalties=True)
+                                  stackingPenalties = True)
--- a/eos/effects/armorhpbonusadd.py
+++ b/eos/effects/armorhpbonusadd.py
@@ -1,7 +1,7 @@
 # armorHPBonusAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (48 of 48)
+# Modules from group: Armor Reinforcer (41 of 41)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))
--- a/eos/effects/armorreinforcermassadd.py
+++ b/eos/effects/armorreinforcermassadd.py
@@ -1,7 +1,7 @@
 # armorReinforcerMassAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (48 of 48)
+# Modules from group: Armor Reinforcer (41 of 41)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
--- a/eos/effects/armorrepair.py
+++ b/eos/effects/armorrepair.py
@@ -1,7 +1,7 @@
 # armorRepair
 #
 # Used by:
-# Modules from group: Armor Repair Unit (105 of 105)
+# Modules from group: Armor Repair Unit (100 of 100)
 runTime = "late"
 type = "active"
 def handler(fit, module, context):
--- a/eos/effects/armorrepairprojectorfalloffbonus.py
+++ b/eos/effects/armorrepairprojectorfalloffbonus.py
@@ -1,11 +0,0 @@
-# armorRepairProjectorFalloffBonus
-#
-# Used by:
-# Variations of ship: Navitas (2 of 2)
-# Ship: Augoror
-# Ship: Deacon
-# Ship: Exequror
-# Ship: Inquisitor
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
--- a/eos/effects/armorrepairprojectormaxrangebonus.py
+++ b/eos/effects/armorrepairprojectormaxrangebonus.py
@@ -1,11 +1,10 @@
 # armorRepairProjectorMaxRangeBonus
 #
 # Used by:
-# Variations of ship: Navitas (2 of 2)
 # Ship: Augoror
-# Ship: Deacon
 # Ship: Exequror
 # Ship: Inquisitor
+# Ship: Navitas
 type = "passive"
 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
--- a/eos/effects/armorwarfarearmorhpreplacer.py
+++ b/eos/effects/armorwarfarearmorhpreplacer.py
@@ -1,4 +1,4 @@
-# armorWarfareArmorHpReplacer
+# armorTankingGang2
 #
 # Used by:
 # Implant: Armored Warfare Mindlink
--- a/eos/effects/battlecruiserdronespeed.py
+++ b/eos/effects/battlecruiserdronespeed.py
@@ -1,9 +0,0 @@
-# battlecruiserDroneSpeed
-#
-# Used by:
-# Ship: Myrmidon
-# Ship: Prophecy
-type = "passive"
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", ship.getModifiedItemAttr("roleBonusCBC"))
--- a/eos/effects/battlecruisermetrange.py
+++ b/eos/effects/battlecruisermetrange.py
@@ -1,10 +0,0 @@
-# battlecruiserMETRange
-#
-# Used by:
-# Ships named like: Harbinger (2 of 2)
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))
--- a/eos/effects/battlecruisermhtrange.py
+++ b/eos/effects/battlecruisermhtrange.py
@@ -1,11 +0,0 @@
-# battlecruiserMHTRange
-#
-# Used by:
-# Ships named like: Brutix (2 of 2)
-# Ship: Ferox
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))
--- a/eos/effects/battlecruisermissilerange.py
+++ b/eos/effects/battlecruisermissilerange.py
@@ -1,9 +0,0 @@
-# battlecruiserMissileRange
-#
-# Used by:
-# Ships named like: Drake (2 of 2)
-# Ship: Cyclone
-type = "passive"
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", skill.getModifiedItemAttr("roleBonusCBC"))
--- a/eos/effects/battlecruisermptrange.py
+++ b/eos/effects/battlecruisermptrange.py
@@ -1,10 +0,0 @@
-# battlecruiserMPTRange
-#
-# Used by:
-# Ships named like: Hurricane (2 of 2)
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))
--- a/eos/effects/boosterarmorhppenalty.py
+++ b/eos/effects/boosterarmorhppenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 42)
+# Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
    fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty"))
--- a/eos/effects/boosterarmorrepairamountpenalty.py
+++ b/eos/effects/boosterarmorrepairamountpenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorRepairAmountPenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 42)
+# Implants from group: Booster (9 of 37)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",
--- a/eos/effects/boostermaxvelocitypenalty.py
+++ b/eos/effects/boostermaxvelocitypenalty.py
@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 42)
+# Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
    fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))
--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 42)
+# Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
    fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))
--- a/eos/effects/boosterturretoptimalrangepenalty.py
+++ b/eos/effects/boosterturretoptimalrangepenalty.py
@@ -1,7 +1,7 @@
 # boosterTurretOptimalRangePenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 42)
+# Implants from group: Booster (9 of 37)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
--- a/eos/effects/caldarisetbonus3.py
+++ b/eos/effects/caldarisetbonus3.py
@@ -5,5 +5,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
                                      "scanGravimetricStrengthPercent", implant.getModifiedItemAttr("implantSetCaldariNavy"))
--- a/eos/effects/caldarisetlgbonus.py
+++ b/eos/effects/caldarisetlgbonus.py
@@ -5,5 +5,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
                                      "scanGravimetricStrengthModifier", implant.getModifiedItemAttr("implantSetLGCaldariNavy"))
--- a/eos/effects/caldarishipecmburstoptimalrangecb3.py
+++ b/eos/effects/caldarishipecmburstoptimalrangecb3.py
@@ -4,5 +4,5 @@
 # Ship: Scorpion
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst",
                                  "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
--- a/eos/effects/caldarishipewcapacitorneedcf2.py
+++ b/eos/effects/caldarishipewcapacitorneedcf2.py
@@ -1,8 +1,7 @@
 # caldariShipEwCapacitorNeedCF2
 #
 # Used by:
-# Ship: Griffin
-# Ship: Kitsune
+# Variations of ship: Griffin (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
--- a/eos/effects/caldarishipewfalloffrangecb3.py
+++ b/eos/effects/caldarishipewfalloffrangecb3.py
@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
+                                  "falloff", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
--- a/eos/effects/caldarishipewfalloffrangecc2.py
+++ b/eos/effects/caldarishipewfalloffrangecc2.py
@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+                                  "falloff", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
--- a/eos/effects/capacitorcapacitymultiply.py
+++ b/eos/effects/capacitorcapacitymultiply.py
@@ -4,8 +4,10 @@
 # Modules from group: Capacitor Flux Coil (6 of 6)
 # Modules from group: Capacitor Power Relay (20 of 20)
 # Modules from group: Power Diagnostic System (23 of 23)
-# Modules from group: Propulsion Module (127 of 127)
+# Modules from group: Propulsion Module (114 of 114)
 # Modules from group: Reactor Control Unit (22 of 22)
+# Modules from group: Shield Flux Coil (11 of 11)
+# Modules from group: Shield Power Relay (11 of 11)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.multiplyItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacityMultiplier"))
--- a/eos/effects/capitallauncherskillcitadelemdamage.py
+++ b/eos/effects/capitallauncherskillcitadelemdamage.py
@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL Torpedoes
+# Skill: Citadel Torpedoes
 type = "passive"
 def handler(fit, container, context):
    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
                                    "emDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
--- a/eos/effects/capitallauncherskillcitadelexplosivedamage.py
+++ b/eos/effects/capitallauncherskillcitadelexplosivedamage.py
@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL Torpedoes
+# Skill: Citadel Torpedoes
 type = "passive"
 def handler(fit, container, context):
    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
--- a/eos/effects/capitallauncherskillcitadelkineticdamage.py
+++ b/eos/effects/capitallauncherskillcitadelkineticdamage.py
@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL Torpedoes
+# Skill: Citadel Torpedoes
 type = "passive"
 def handler(fit, container, context):
    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
--- a/eos/effects/capitallauncherskillcitadelthermaldamage.py
+++ b/eos/effects/capitallauncherskillcitadelthermaldamage.py
@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL Torpedoes
+# Skill: Citadel Torpedoes
 type = "passive"
 def handler(fit, container, context):
    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
--- a/eos/effects/capitallauncherskillcruisecitadelemdamage1.py
+++ b/eos/effects/capitallauncherskillcruisecitadelemdamage1.py
@@ -1,8 +1,8 @@
-# capitalLauncherSkillCruiseCitadelEmDamage1
+# 	capitalLauncherSkillCruiseCitadelEmDamage1
 #
 # Used by:
-# Skill: XL Cruise Missiles
+# Skill: Citadel Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
                                    "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
--- a/eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py
+++ b/eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py
@@ -1,8 +1,8 @@
 # capitalLauncherSkillCruiseCitadelExplosiveDamage1
 #
 # Used by:
-# Skill: XL Cruise Missiles
+# Skill: Citadel Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
                                    "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
--- a/eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py
+++ b/eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py
@@ -1,8 +1,8 @@
 # capitalLauncherSkillCruiseCitadelKineticDamage1
 #
 # Used by:
-# Skill: XL Cruise Missiles
+# Skill: Citadel Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
                                    "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
--- a/eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py
+++ b/eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py
@@ -1,8 +1,8 @@
 # capitalLauncherSkillCruiseCitadelThermalDamage1
 #
 # Used by:
-# Skill: XL Cruise Missiles
+# Skill: Citadel Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
                                    "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
--- a/eos/effects/carrieramarrarmorenergytransferrange3.py
+++ b/eos/effects/carrieramarrarmorenergytransferrange3.py
@@ -8,4 +8,4 @@ def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
                                  "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
+                                  "powerTransferRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
--- a/eos/effects/carrieramarrarmortransferfalloff3.py
+++ b/eos/effects/carrieramarrarmortransferfalloff3.py
@@ -1,8 +0,0 @@
-# carrierAmarrArmorTransferFalloff3
-#
-# Used by:
-# Ship: Aeon
-# Ship: Archon
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
--- a/eos/effects/carriercaldarishieldenergytransferrange3.py
+++ b/eos/effects/carriercaldarishieldenergytransferrange3.py
@@ -7,6 +7,6 @@
 type = "passive"
 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")
+                                  "powerTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")
--- a/eos/effects/carriercaldarishieldtransferfalloff3.py
+++ b/eos/effects/carriercaldarishieldtransferfalloff3.py
@@ -1,9 +0,0 @@
-# carrierCaldariShieldTransferFalloff3
-#
-# Used by:
-# Ship: Chimera
-# Ship: Revenant
-# Ship: Wyvern
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")
--- a/eos/effects/carriergallentearmorshieldtransferfalloff3.py
+++ b/eos/effects/carriergallentearmorshieldtransferfalloff3.py
@@ -1,8 +0,0 @@
-# carrierGallenteArmor&ShieldTransferFalloff3
-#
-# Used by:
-# Ship: Nyx
-# Ship: Thanatos
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
--- a/eos/effects/carriergallentearmorshieldtransferrange3.py
+++ b/eos/effects/carriergallentearmorshieldtransferrange3.py
@@ -6,6 +6,6 @@
 type = "passive"
 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
--- a/eos/effects/carrierminmatararmorshieldtransferfalloff3.py
+++ b/eos/effects/carrierminmatararmorshieldtransferfalloff3.py
@@ -1,8 +0,0 @@
-# carrierMinmatarArmor&ShieldTransferFalloff3
-#
-# Used by:
-# Ship: Hel
-# Ship: Nidhoggur
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
--- a/eos/effects/carrierminmatararmorshieldtransferrange3.py
+++ b/eos/effects/carrierminmatararmorshieldtransferrange3.py
@@ -6,6 +6,6 @@
 type = "passive"
 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
--- a/eos/effects/commandbonustdmultiplywithcommandbonushidden.py
+++ b/eos/effects/commandbonustdmultiplywithcommandbonushidden.py
@@ -7,14 +7,6 @@ gangBoost = "ewarStrTD"
 type = "active", "gang"
 def handler(fit, module, context):
    if "gang" not in context: return
-    for bonus in (
-        "missileVelocityBonus",
-        "explosionDelayBonus",
-        "aoeVelocityBonus",
-        "falloffBonus",
-        "maxRangeBonus",
-        "aoeCloudSizeBonus",
-        "trackingSpeedBonus"
-    ):
+    for bonus in ("maxRangeBonus", "falloffBonus", "trackingSpeedBonus"):
        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                      bonus, module.getModifiedItemAttr("commandBonusTD"))
--- a/eos/effects/commandbonustpmultiplywithcommandbonushidden.py
+++ b/eos/effects/commandbonustpmultiplywithcommandbonushidden.py
@@ -7,6 +7,6 @@ gangBoost = "ewarStrTP"
 type = "active", "gang"
 def handler(fit, module, context):
    if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
                                  "signatureRadiusBonus", module.getModifiedItemAttr("commandBonusTP"),
                                  stackingPenalties = True)
--- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
+++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
@@ -4,12 +4,12 @@
 # Ships from group: Black Ops (4 of 4)
 # Ships from group: Blockade Runner (4 of 4)
 # Ships from group: Covert Ops (5 of 5)
-# Ships from group: Expedition Frigate (2 of 2)
 # Ships from group: Force Recon Ship (6 of 6)
 # Ships from group: Stealth Bomber (4 of 4)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
 # Ship: Astero
+# Ship: Prospect
 type = "passive"
 def handler(fit, container, context):
    fit.modules.filteredItemForce(lambda mod: mod.item.requiresSkill("Cloaking"),
--- a/eos/effects/covertopscloakcpupercentbonus1.py
+++ b/eos/effects/covertopscloakcpupercentbonus1.py
@@ -5,5 +5,5 @@
 type = "passive"
 runTime = "early"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
                                  "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
--- a/eos/effects/covertopscloakcpupercentbonuspiratefaction.py
+++ b/eos/effects/covertopscloakcpupercentbonuspiratefaction.py
@@ -1,8 +1,8 @@
 # covertOpsCloakCPUPercentBonusPirateFaction
 #
 # Used by:
-# Ships from group: Expedition Frigate (2 of 2)
 # Ship: Astero
+# Ship: Prospect
 # Ship: Victorieux Luxury Yacht
 type = "passive"
 runTime = "early"
--- a/eos/effects/covertopsstealthbombertargettingdelaybonus.py
+++ b/eos/effects/covertopsstealthbombertargettingdelaybonus.py
@@ -4,7 +4,6 @@
 # Ships from group: Black Ops (4 of 4)
 # Ships from group: Stealth Bomber (4 of 4)
 # Ship: Chremoas
-# Ship: Endurance
 # Ship: Etana
 type = "passive"
 def handler(fit, ship, context):
--- a/eos/effects/crystalminingamountinfo2.py
+++ b/eos/effects/crystalminingamountinfo2.py
@@ -1,7 +0,0 @@
-# crystalMiningamountInfo2
-#
-# Used by:
-# Modules from group: Frequency Mining Laser (3 of 3)
-type = "passive"
-def handler(fit, module, context):
-    module.preAssignItemAttr("specialtyMiningAmount", module.getModifiedItemAttr("miningAmount"))
--- a/eos/effects/damagecontrol.py
+++ b/eos/effects/damagecontrol.py
@@ -1,9 +1,8 @@
 # damageControl
 #
 # Used by:
-# Variations of module: Damage Control I (16 of 16)
-# Module: Civilian Damage Control
-type = "passive"
+# Modules from group: Damage Control (14 of 14)
+type = "active"
 def handler(fit, module, context):
    for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
        for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
--- a/eos/effects/decreasetargetspeed.py
+++ b/eos/effects/decreasetargetspeed.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# decreaseTargetSpeed
+#
+# Used by:
+# Drones from group: Stasis Webifying Drone (3 of 3)
+# Modules from group: Stasis Web (19 of 19)
 type = "active", "projected"
 def handler(fit, module, context):
    if "projected" not in context:
--- a/eos/effects/drawbackcpuoutput.py
+++ b/eos/effects/drawbackcpuoutput.py
@@ -1,7 +1,7 @@
 # drawbackCPUOutput
 #
 # Used by:
-# Modules from group: Rig Drones (58 of 64)
+# Modules from group: Rig Drones (64 of 64)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("drawback"))
--- a/eos/effects/dronearmordamagebonuseffect.py
+++ b/eos/effects/dronearmordamagebonuseffect.py
@@ -1,8 +1,9 @@
 # droneArmorDamageBonusEffect
 #
 # Used by:
-# Ships from group: Logistics (5 of 5)
 # Ship: Exequror
+# Ship: Guardian
+# Ship: Oneiros
 # Ship: Scythe
 type = "passive"
 def handler(fit, ship, context):
--- a/eos/effects/dronedamagebonusonline.py
+++ b/eos/effects/dronedamagebonusonline.py
@@ -1,7 +1,7 @@
 # droneDamageBonusOnline
 #
 # Used by:
-# Modules from group: Drone Damage Modules (11 of 11)
+# Modules from group: Drone Damage Modules (10 of 10)
 type = "passive"
 def handler(fit, module, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
--- a/eos/effects/dronedamagebonusrequringdrones.py
+++ b/eos/effects/dronedamagebonusrequringdrones.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# droneDamageBonusRequringDrones
+#
+# Used by:
+# Skill: Drone Interfacing
 type = "passive"
 def handler(fit, skill, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
--- a/eos/effects/dronedmgbonus.py
+++ b/eos/effects/dronedmgbonus.py
@@ -1,7 +1,7 @@
 # droneDmgBonus
 #
 # Used by:
-# Skills from group: Drones (8 of 23)
+# Skills from group: Drones (8 of 21)
 # Skills named like: Drone Specialization (4 of 4)
 type = "passive"
 def handler(fit, skill, context):
--- a/eos/effects/dronedurabilityarmorhpbonus.py
+++ b/eos/effects/dronedurabilityarmorhpbonus.py
@@ -1,7 +1,7 @@
 # droneDurabilityArmorHPBonus
 #
 # Used by:
-# Modules named like: Drone Durability Enhancer (6 of 8)
+# Modules named like: Drone Durability Enhancer (8 of 8)
 type = "passive"
 def handler(fit, module, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
--- a/eos/effects/dronedurabilityhpbonus.py
+++ b/eos/effects/dronedurabilityhpbonus.py
@@ -1,7 +1,8 @@
 # droneDurabilityHPBonus
 #
 # Used by:
-# Modules named like: Drone Durability Enhancer (6 of 8)
+# Modules named like: Drone Durability Enhancer (8 of 8)
+# Skill: Drone Durability
 type = "passive"
 def handler(fit, container, context):
    level = container.level if "skill" in context else 1
--- a/eos/effects/dronedurabilityshieldcapbonus.py
+++ b/eos/effects/dronedurabilityshieldcapbonus.py
@@ -1,7 +1,7 @@
 # droneDurabilityShieldCapBonus
 #
 # Used by:
-# Modules named like: Drone Durability Enhancer (6 of 8)
+# Modules named like: Drone Durability Enhancer (8 of 8)
 type = "passive"
 def handler(fit, module, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
--- a/eos/effects/dronehullrepairbonuseffect.py
+++ b/eos/effects/dronehullrepairbonuseffect.py
@@ -1,9 +0,0 @@
-# droneHullRepairBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (5 of 5)
-# Ship: Exequror
-# Ship: Scythe
-type = "passive"
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone", "structureDamageAmount", src.getModifiedItemAttr("droneArmorDamageAmountBonus"))
--- a/eos/effects/dronemaxrangebonus.py
+++ b/eos/effects/dronemaxrangebonus.py
@@ -1,7 +1,8 @@
 # droneMaxRangeBonus
 #
 # Used by:
-# Modules named like: Drone Scope Chip (6 of 8)
+# Modules named like: Drone Scope Chip (8 of 8)
+# Skill: Drone Sharpshooting
 type = "passive"
 def handler(fit, container, context):
    level = container.level if "skill" in context else 1
--- a/eos/effects/dronemaxvelocitybonus.py
+++ b/eos/effects/dronemaxvelocitybonus.py
@@ -1,7 +1,8 @@
 # droneMaxVelocityBonus
 #
 # Used by:
-# Modules named like: Drone Speed Augmentor (6 of 8)
+# Modules named like: Drone Speed Augmentor (8 of 8)
+# Skill: Drone Navigation
 type = "passive"
 def handler(fit, container, context):
    level = container.level if "skill" in context else 1
--- a/eos/effects/droneshieldbonusbonuseffect.py
+++ b/eos/effects/droneshieldbonusbonuseffect.py
@@ -1,7 +1,7 @@
 # droneShieldBonusBonusEffect
 #
 # Used by:
-# Ships from group: Logistics (5 of 5)
+# Ships from group: Logistics (3 of 5)
 # Ship: Exequror
 # Ship: Scythe
 type = "passive"
--- a/eos/effects/dronetrackingcomputerbonus.py
+++ b/eos/effects/dronetrackingcomputerbonus.py
@@ -1,7 +1,7 @@
 # droneTrackingComputerBonus
 #
 # Used by:
-# Modules from group: Drone Tracking Modules (10 of 10)
+# Modules from group: Drone Tracking Modules (8 of 8)
 type = "active"
 def handler(fit, module, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
--- a/eos/effects/dronetrackingenhancerbonus.py
+++ b/eos/effects/dronetrackingenhancerbonus.py
@@ -1,7 +1,7 @@
 # droneTrackingEnhancerBonus
 #
 # Used by:
-# Modules from group: Drone Tracking Enhancer (10 of 10)
+# Modules from group: Drone Tracking Enhancer (9 of 9)
 type = "passive"
 def handler(fit, module, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
--- a/eos/effects/ecmburst.py
+++ b/eos/effects/ecmburst.py
@@ -1,7 +1,7 @@
 # ecmBurst
 #
 # Used by:
-# Modules from group: Burst Jammer (11 of 11)
+# Modules from group: ECM Burst (7 of 7)
 type = "active"
 def handler(fit, module, context):
    pass
--- a/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py
+++ b/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py
@@ -6,5 +6,5 @@ type = "passive"
 def handler(fit, ship, context):
    sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar")
    for type in sensorTypes:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer", "scan{0}StrengthBonus".format(type),
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst", "scan{0}StrengthBonus".format(type),
                                      ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
--- a/eos/effects/elitebonuscommanddestroyerarmored1.py
+++ b/eos/effects/elitebonuscommanddestroyerarmored1.py
@@ -1,8 +0,0 @@
-# eliteBonusCommandDestroyerArmored1
-#
-# Used by:
-# Ship: Magus
-# Ship: Pontifex
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
--- a/eos/effects/elitebonuscommanddestroyerinfo1.py
+++ b/eos/effects/elitebonuscommanddestroyerinfo1.py
@@ -1,8 +0,0 @@
-# eliteBonusCommandDestroyerInfo1
-#
-# Used by:
-# Ship: Pontifex
-# Ship: Stork
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
--- a/eos/effects/elitebonuscommanddestroyerinfohidden1.py
+++ b/eos/effects/elitebonuscommanddestroyerinfohidden1.py
@@ -1,8 +0,0 @@
-# eliteBonusCommandDestroyerInfoHidden1
-#
-# Used by:
-# Ship: Pontifex
-# Ship: Stork
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonusHidden", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
--- a/Show More
+++ b/Show More