diff --git a/.appveyor.yml b/.appveyor.yml
index 8c740b418..65d78d226 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -61,8 +61,6 @@ before_build:
   - ps: $env:PYFA_VERSION = (python ./scripts/dump_version.py)
   - ps: echo("pyfa version ")
   - ps: echo ($env:PYFA_VERSION)
-  - ps: python ./scripts/effect_rollup.py
-
 
 build_script:
   - ECHO "Build pyfa:"
@@ -121,7 +119,7 @@ artifacts:
   - path: pyfa*-win.exe
   #- path: pyfa_debug.zip
   #  name: Pyfa_debug
-  
+
 deploy:
   tag: $(pyfa_version)
   release: pyfa $(pyfa_version)
@@ -134,4 +132,4 @@ deploy:
     APPVEYOR_REPO_TAG: true        # deploy on tag push only
 #on_success:
 #  - TODO: upload the content of dist/*.whl to a public wheelhouse
-#
\ No newline at end of file
+#
diff --git a/.gitignore b/.gitignore
index 09b400aab..a9eb5e25c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,4 +123,3 @@ gitversion
 *.swp
 
 *.fsdbinary
-/eos/effects/all.py
diff --git a/.travis.yml b/.travis.yml
index 2aae5823c..9140c2f10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ before_install:
   - bash scripts/setup-osx.sh
 install:
   - export PYFA_VERSION="$(python3 scripts/dump_version.py)"
-  - python3 ./scripts/effect_rollup.py
   - bash scripts/package-osx.sh
 before_deploy:
   - export RELEASE_PKG_FILE=$(ls *.deb)
diff --git a/eos/config.py b/eos/config.py
index 641a00ba9..ce612880b 100644
--- a/eos/config.py
+++ b/eos/config.py
@@ -15,8 +15,6 @@ gamedata_date = ""
 gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "eve.db"))
 pyfalog.debug("Gamedata connection string: {0}", gamedata_connectionstring)
 
-use_all_effect_module = True
-
 if istravis is True or hasattr(sys, '_called_from_test'):
     # Running in Travis. Run saveddata database in memory.
     saveddata_connectionstring = 'sqlite:///:memory:'
diff --git a/eos/effects.py b/eos/effects.py
new file mode 100644
index 000000000..20506604d
--- /dev/null
+++ b/eos/effects.py
@@ -0,0 +1,22824 @@
+# ===============================================================================
+# 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/>.
+# ===============================================================================
+
+
+import eos.config
+from eos.const import FittingModuleState
+from eos.utils.spoolSupport import SpoolType, SpoolOptions, calculateSpoolup, resolveSpoolOptions
+
+
+class EffectDef:
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        pass
+
+
+class Effect4(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        amount = module.getModifiedItemAttr('shieldBonus')
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('shieldRepair', amount / speed)
+
+
+class Effect10(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set reload time to 1 second
+        module.reloadTime = 1000
+
+
+class Effect17(EffectDef):
+
+    grouped = True
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        miningDroneAmountPercent = container.getModifiedItemAttr('miningDroneAmountPercent')
+        if (miningDroneAmountPercent is None) or (miningDroneAmountPercent == 0):
+            pass
+        else:
+            container.multiplyItemAttr('miningAmount', miningDroneAmountPercent / 100)
+
+
+class Effect21(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('shieldCapacity', module.getModifiedItemAttr('capacityBonus'))
+
+
+class Effect25(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.increaseItemAttr('capacitorCapacity', ship.getModifiedItemAttr('capacitorBonus'))
+
+
+class Effect26(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        amount = module.getModifiedItemAttr('structureDamageAmount')
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('hullRepair', amount / speed)
+
+
+class Effect27(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        amount = module.getModifiedItemAttr('armorDamageAmount')
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        rps = amount / speed
+        fit.extraAttributes.increase('armorRepair', rps)
+        fit.extraAttributes.increase('armorRepairPreSpool', rps)
+        fit.extraAttributes.increase('armorRepairFullSpool', rps)
+
+
+class Effect34(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        rt = module.getModifiedItemAttr('reloadTime')
+        if not rt:
+            # Set reload time to 10 seconds
+            module.reloadTime = 10000
+        else:
+            module.reloadTime = rt
+
+
+class Effect38(EffectDef):
+
+    type = 'active'
+
+
+class Effect39(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' in context:
+            fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+
+
+class Effect48(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set reload time to 10 seconds
+        module.reloadTime = 10000
+        # Make so that reloads are always taken into account during clculations
+        module.forceReload = True
+
+        if module.charge is None:
+            return
+        capAmount = module.getModifiedChargeAttr('capacitorBonus') or 0
+        module.itemModifiedAttributes['capacitorNeed'] = -capAmount
+
+
+class Effect50(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('shieldRechargeRate', module.getModifiedItemAttr('shieldRechargeRateMultiplier') or 1)
+
+
+class Effect51(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('rechargeRate', module.getModifiedItemAttr('capacitorRechargeRateMultiplier'))
+
+
+class Effect55(EffectDef):
+
+    type = 'active'
+
+
+class Effect56(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
+        # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
+        fit.ship.multiplyItemAttr('powerOutput', module.getModifiedItemAttr('powerOutputMultiplier', None))
+
+
+class Effect57(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
+        # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
+        fit.ship.multiplyItemAttr('shieldCapacity', module.getModifiedItemAttr('shieldCapacityMultiplier', None))
+
+
+class Effect58(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
+        # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
+        fit.ship.multiplyItemAttr('capacitorCapacity', module.getModifiedItemAttr('capacitorCapacityMultiplier', None))
+
+
+class Effect59(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('capacity', module.getModifiedItemAttr('cargoCapacityMultiplier'))
+
+
+class Effect60(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('hp', module.getModifiedItemAttr('structureHPMultiplier'))
+
+
+class Effect61(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('agility', src.getModifiedItemAttr('agilityBonusAdd'))
+
+
+class Effect63(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('armorHP', module.getModifiedItemAttr('armorHPMultiplier'))
+
+
+class Effect67(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set reload time to 1 second
+        module.reloadTime = 1000
+
+
+class Effect89(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect91(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect92(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect93(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect95(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect96(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect101(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context):
+        # Set reload time to 10 seconds
+        src.reloadTime = 10000
+
+        if 'projected' in context:
+            if src.item.group.name == 'Missile Launcher Bomb':
+                # Bomb Launcher Cooldown Timer
+                moduleReactivationDelay = src.getModifiedItemAttr('moduleReactivationDelay')
+                speed = src.getModifiedItemAttr('speed')
+
+                # Void and Focused Void Bombs
+                neutAmount = src.getModifiedChargeAttr('energyNeutralizerAmount')
+
+                if moduleReactivationDelay and neutAmount and speed:
+                    fit.addDrain(src, speed + moduleReactivationDelay, neutAmount, 0)
+
+                # Lockbreaker Bombs
+                ecmStrengthBonus = src.getModifiedChargeAttr('scan{0}StrengthBonus'.format(fit.scanType))
+
+                if ecmStrengthBonus:
+                    strModifier = 1 - ecmStrengthBonus / fit.scanStrength
+                    fit.ecmProjectedStr *= strModifier
+
+
+class Effect118(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('maxLockedTargets', module.getModifiedItemAttr('maxLockedTargetsBonus'))
+
+
+class Effect157(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect159(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect160(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect161(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect162(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect172(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect173(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect174(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect212(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Electronics Upgrades'),
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+
+
+class Effect214(EffectDef):
+
+    type = 'passive', 'structure'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        amount = skill.getModifiedItemAttr('maxTargetBonus') * skill.level
+        fit.extraAttributes.increase('maxTargetsLockedFromSkills', amount)
+
+
+class Effect223(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('velocityBonus'))
+
+
+class Effect227(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus'))
+
+
+class Effect230(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'duration', container.getModifiedItemAttr('durationBonus') * level)
+
+
+class Effect235(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('warpCapacitorNeed', implant.getModifiedItemAttr('warpCapacitorNeedBonus'))
+
+
+class Effect242(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'speedFactor', implant.getModifiedItemAttr('speedFBonus'))
+
+
+class Effect244(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect271(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('armorHP', (container.getModifiedItemAttr('armorHpBonus') or 0) * level)
+
+
+class Effect272(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'duration', container.getModifiedItemAttr('durationSkillBonus') * level)
+
+
+class Effect273(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Upgrades'),
+                                      'power', container.getModifiedItemAttr('powerNeedBonus') * level)
+
+
+class Effect277(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.ship.increaseItemAttr('shieldUniformity', skill.getModifiedItemAttr('uniformityBonus') * skill.level)
+
+
+class Effect279(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect287(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect290(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level)
+
+
+class Effect298(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'falloff', container.getModifiedItemAttr('falloffBonus') * level)
+
+
+class Effect315(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        amount = skill.getModifiedItemAttr('maxActiveDroneBonus') * skill.level
+        fit.extraAttributes.increase('maxActiveDrones', amount)
+
+
+class Effect391(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'miningAmount', container.getModifiedItemAttr('miningAmountBonus') * level)
+
+
+class Effect392(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('hp', container.getModifiedItemAttr('hullHpBonus') * level)
+
+
+class Effect394(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        amount = container.getModifiedItemAttr('velocityBonus') or 0
+        fit.ship.boostItemAttr('maxVelocity', amount * level,
+                               stackingPenalties='skill' not in context and 'implant' not in context and 'booster' not in context)
+
+
+class Effect395(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('agility', container.getModifiedItemAttr('agilityBonus') * level,
+                               stackingPenalties='skill' not in context and 'implant' not in context)
+
+
+class Effect396(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Grid Upgrades'),
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+
+
+class Effect397(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('cpuOutput', container.getModifiedItemAttr('cpuOutputBonus2') * level)
+
+
+class Effect408(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect414(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'speed', container.getModifiedItemAttr('turretSpeeBonus') * level)
+
+
+class Effect446(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('shieldCapacity', container.getModifiedItemAttr('shieldCapacityBonus') * level)
+
+
+class Effect485(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('rechargeRate', container.getModifiedItemAttr('capRechargeBonus') * level)
+
+
+class Effect486(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('shieldRechargeRate', container.getModifiedItemAttr('rechargeratebonus') * level)
+
+
+class Effect490(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('powerOutput', container.getModifiedItemAttr('powerEngineeringOutputBonus') * level)
+
+
+class Effect494(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('warpCapacitorNeed', container.getModifiedItemAttr('warpCapacitorNeedBonus') * level,
+                               stackingPenalties='skill' not in context)
+
+
+class Effect504(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        amount = container.getModifiedItemAttr('droneRangeBonus') * level
+        fit.extraAttributes.increase('droneControlRange', amount)
+
+
+class Effect506(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+
+
+class Effect507(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('maxTargetRange', container.getModifiedItemAttr('maxTargetRangeBonus') * level)
+
+
+class Effect508(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect511(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect512(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect514(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect516(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect521(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect527(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusMI'), skill='Minmatar Industrial')
+
+
+class Effect529(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusAI'), skill='Amarr Industrial')
+
+
+class Effect536(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('cpuOutput', module.getModifiedItemAttr('cpuMultiplier'))
+
+
+class Effect542(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect549(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMB'),
+                                      skill='Minmatar Battleship')
+
+
+class Effect550(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGB'),
+                                      skill='Gallente Battleship')
+
+
+class Effect553(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect562(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect581(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+
+
+class Effect582(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'speed', skill.getModifiedItemAttr('rofBonus') * skill.level)
+
+
+class Effect584(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'damageMultiplier', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect587(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect588(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect589(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect590(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Pulse Weapons'),
+                                      'duration', container.getModifiedItemAttr('durationBonus') * level)
+
+
+class Effect596(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('maxRange', module.getModifiedChargeAttr('weaponRangeMultiplier'))
+
+
+class Effect598(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('speed', module.getModifiedChargeAttr('speedMultiplier') or 1)
+
+
+class Effect599(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('falloff', module.getModifiedChargeAttr('fallofMultiplier') or 1)
+
+
+class Effect600(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('trackingSpeed', module.getModifiedChargeAttr('trackingSpeedMultiplier'))
+
+
+class Effect602(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+
+
+class Effect604(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB2'), skill='Minmatar Battleship')
+
+
+class Effect607(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set flag which is used to determine if ship is cloaked or not
+        # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
+        # Doesn't apply to covops cloaks
+        fit.extraAttributes['cloaked'] = True
+        # Apply speed penalty
+        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'))
+
+
+class Effect623(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount',
+                                     container.getModifiedItemAttr('miningAmountBonus') * level)
+
+
+class Effect627(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('powerOutput', module.getModifiedItemAttr('powerIncrease'))
+
+
+class Effect657(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('agility',
+                               module.getModifiedItemAttr('agilityMultiplier'),
+                               stackingPenalties=True)
+
+
+class Effect660(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
+                                        'emDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect661(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
+                                        'explosiveDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect662(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
+                                        'thermalDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect668(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
+                                        'kineticDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect670(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+
+
+class Effect675(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Pulse Weapons'),
+                                      'cpu', skill.getModifiedItemAttr('cpuNeedBonus') * skill.level)
+
+
+class Effect677(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'cpu', container.getModifiedItemAttr('cpuNeedBonus') * level)
+
+
+class Effect699(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context or 'implant' in context or 'booster' in context else True
+        fit.ship.boostItemAttr('scanResolution', container.getModifiedItemAttr('scanResolutionBonus') * level,
+                               stackingPenalties=penalized)
+
+
+class Effect706(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpFactor', src.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+
+
+class Effect726(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        # TODO: investigate if we can live without such ifs or hardcoding
+        # Viator doesn't have GI bonus
+        if 'shipBonusGI' in fit.ship.item.attributes:
+            bonusAttr = 'shipBonusGI'
+        else:
+            bonusAttr = 'shipBonusGI2'
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr(bonusAttr), skill='Gallente Industrial')
+
+
+class Effect727(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusCI'), skill='Caldari Industrial')
+
+
+class Effect728(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('shipBonusMI'), skill='Minmatar Industrial')
+
+
+class Effect729(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        # TODO: investigate if we can live without such ifs or hardcoding
+        # Viator doesn't have GI bonus
+        if 'shipBonusGI' in fit.ship.item.attributes:
+            bonusAttr = 'shipBonusGI'
+        else:
+            bonusAttr = 'shipBonusGI2'
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr(bonusAttr), skill='Gallente Industrial')
+
+
+class Effect730(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusCI'), skill='Caldari Industrial')
+
+
+class Effect732(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusAI'), skill='Amarr Industrial')
+
+
+class Effect736(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacitorCapacity', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect744(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('CPU Management'),
+                                      'duration', container.getModifiedItemAttr('scanspeedBonus') * level)
+
+
+class Effect754(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect757(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect760(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect763(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                               '%sDamage' % dmgType,
+                                               container.getModifiedItemAttr('missileDamageMultiplierBonus'),
+                                               stackingPenalties=True)
+
+
+class Effect784(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context or 'implant' in context or 'booster' in context else True
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosionDelay', container.getModifiedItemAttr('maxFlightTimeBonus') * level,
+                                        stackingPenalties=penalized)
+
+
+class Effect804(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Dirty hack to work around cap charges setting cap booster
+        # injection amount to zero
+        rawAttr = module.item.getAttribute('capacitorNeed')
+        if rawAttr is not None and rawAttr >= 0:
+            module.boostItemAttr('capacitorNeed', module.getModifiedChargeAttr('capNeedBonus') or 0)
+
+
+class Effect836(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('capacity', module.getModifiedItemAttr('cargoCapacityBonus'))
+
+
+class Effect848(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'),
+                                      'cloakingTargetingDelay',
+                                      skill.getModifiedItemAttr('cloakingTargetingDelayBonus') * skill.level)
+
+
+class Effect854(EffectDef):
+
+    type = 'offline'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('scanResolution',
+                                  module.getModifiedItemAttr('scanResolutionMultiplier'),
+                                  stackingPenalties=True, penaltyGroup='cloakingScanResolutionMultiplier')
+
+
+class Effect856(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        penalized = False if 'skill' in context or 'implant' in context else True
+        fit.ship.boostItemAttr('baseWarpSpeed', container.getModifiedItemAttr('WarpSBonus'),
+                               stackingPenalties=penalized)
+
+
+class Effect874(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect882(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect887(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect889(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect891(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+
+
+class Effect892(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+
+
+class Effect896(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cloaking Device',
+                                         'cpu', container.getModifiedItemAttr('cloakingCpuNeedBonus'))
+
+
+class Effect898(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect899(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect900(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Light Drone Operation'),
+                                     'thermalDamage', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect907(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect909(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect912(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect918(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.extraAttributes.increase('maxActiveDrones', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect919(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect958(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect959(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'),
+                               skill='Amarr Cruiser')
+
+
+class Effect960(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'),
+                               skill='Amarr Cruiser')
+
+
+class Effect961(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusAC2'),
+                               skill='Amarr Cruiser')
+
+
+class Effect968(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMC2'),
+                                      skill='Minmatar Cruiser')
+
+
+class Effect980(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.extraAttributes['cloaked'] = True
+        # TODO: Implement
+
+
+class Effect989(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect991(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect996(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusGunship2'),
+                                      skill='Assault Frigates')
+
+
+class Effect998(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
+
+
+class Effect999(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('eliteBonusGunship2'),
+                                      skill='Assault Frigates')
+
+
+class Effect1001(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
+
+
+class Effect1003(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Pulse Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1004(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Beam Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1005(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Blaster Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1006(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Railgun Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1007(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Autocannon Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1008(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Artillery Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1009(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Pulse Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1010(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Beam Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1011(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Blaster Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1012(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Railgun Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1013(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Autocannon Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1014(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Artillery Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1015(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Pulse Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1016(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Beam Laser Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1017(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Blaster Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1018(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Railgun Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1019(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Autocannon Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1020(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Artillery Specialization'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1021(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusGunship2'),
+                                      skill='Assault Frigates')
+
+
+class Effect1024(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect1025(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect1030(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1033(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
+
+
+class Effect1034(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
+
+
+class Effect1035(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
+
+
+class Effect1036(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
+
+
+class Effect1046(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect1047(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect1048(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect1049(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect1056(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1057(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1058(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1060(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1061(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1062(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1063(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1080(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1081(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosionDelay', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                        skill='Heavy Assault Cruisers')
+
+
+class Effect1082(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'explosionDelay', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                        skill='Heavy Assault Cruisers')
+
+
+class Effect1084(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.extraAttributes.increase('droneControlRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                     skill='Heavy Assault Cruisers')
+
+
+class Effect1087(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect1099(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect1176(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'speedFactor', container.getModifiedItemAttr('speedFBonus') * level)
+
+
+class Effect1179(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusGunship2'),
+                                      skill='Assault Frigates')
+
+
+class Effect1181(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'capacitorNeed', ship.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect1182(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect1183(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'capacitorNeed', ship.getModifiedItemAttr('eliteBonusLogistics2'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect1184(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect1185(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('signatureRadius', implant.getModifiedItemAttr('signatureRadiusBonus'))
+
+
+class Effect1190(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                      'duration', container.getModifiedItemAttr('iceHarvestCycleBonus') * level)
+
+
+class Effect1200(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('specialtyMiningAmount',
+                                module.getModifiedChargeAttr('specialisationAsteroidYieldMultiplier'))
+        # module.multiplyItemAttr('miningAmount', module.getModifiedChargeAttr('specialisationAsteroidYieldMultiplier'))
+
+
+class Effect1212(EffectDef):
+
+    runTime = 'late'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.preAssignItemAttr('specialtyMiningAmount', module.getModifiedItemAttr('miningAmount'))
+
+
+class Effect1215(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect1218(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1219(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAB'),
+                                      skill='Amarr Battleship')
+
+
+class Effect1220(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect1221(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect1222(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect1228(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect1230(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1232(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1233(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1234(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1239(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1240(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect1255(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'durationBonus', implant.getModifiedItemAttr('implantSetBloodraider'))
+
+
+class Effect1256(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'),
+                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+
+
+class Effect1261(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'velocityBonus', implant.getModifiedItemAttr('implantSetSerpentis'))
+
+
+class Effect1264(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusInterceptor2'),
+                                      skill='Interceptors')
+
+
+class Effect1268(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusInterceptor2'),
+                                      skill='Interceptors')
+
+
+class Effect1281(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        penalized = 'implant' not in context
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', container.getModifiedItemAttr('repairBonus'),
+                                      stackingPenalties=penalized)
+
+
+class Effect1318(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        groups = ('ECM', 'Burst Jammer')
+        level = container.level if 'skill' in context else 1
+        for scanType in ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                          'scan{0}StrengthBonus'.format(scanType),
+                                          container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level,
+                                          stackingPenalties=False if 'skill' in context else True)
+
+
+class Effect1360(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Sensor Linking'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1361(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1370(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Target Painting'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1372(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1395(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', container.getModifiedItemAttr('shieldBoostMultiplier'))
+
+
+class Effect1397(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'shieldBoostMultiplier', implant.getModifiedItemAttr('implantSetGuristas'))
+
+
+class Effect1409(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'),
+                                      'duration', container.getModifiedItemAttr('durationBonus') * level)
+
+
+class Effect1410(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+
+        level = container.level if 'skill' in context else 1
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect1412(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect1434(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for sensorType in ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Electronic Warfare'),
+                                          'scan{0}StrengthBonus'.format(sensorType),
+                                          ship.getModifiedItemAttr('shipBonusCB'), stackingPenalties=True,
+                                          skill='Caldari Battleship')
+
+
+class Effect1441(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+
+
+class Effect1442(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect1443(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect1445(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Sensor Linking'),
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                      stackingPenalties='skill' not in context)
+
+
+class Effect1446(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                      stackingPenalties='skill' not in context)
+
+
+class Effect1448(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                      stackingPenalties='skill' not in context)
+
+
+class Effect1449(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Sensor Linking'),
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+
+
+class Effect1450(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+
+
+class Effect1451(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+
+
+class Effect1452(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'maxRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                      stackingPenalties='skill' not in context and 'implant' not in context)
+
+
+class Effect1453(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'falloffEffectiveness', skill.getModifiedItemAttr('falloffBonus') * skill.level)
+
+
+class Effect1472(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalize = False if 'skill' in context or 'implant' in context else True
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeCloudSize', container.getModifiedItemAttr('aoeCloudSizeBonus') * level,
+                                        stackingPenalties=penalize)
+
+
+class Effect1500(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'capacitorNeed', container.getModifiedItemAttr('shieldBoostCapacitorBonus') * level)
+
+
+class Effect1550(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus',
+                                      skill.getModifiedItemAttr('scanSkillTargetPaintStrengthBonus') * skill.level)
+
+
+class Effect1551(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMF2'),
+                                      skill='Minmatar Frigate')
+
+
+class Effect1577(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(
+            lambda implant: 'signatureRadiusBonus' in implant.itemModifiedAttributes and
+                            'implantSetAngel' in implant.itemModifiedAttributes,
+            'signatureRadiusBonus',
+            implant.getModifiedItemAttr('implantSetAngel'))
+
+
+class Effect1579(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'armorHpBonus', implant.getModifiedItemAttr('implantSetSansha') or 1)
+
+
+class Effect1581(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.ship.boostItemAttr('jumpDriveRange', skill.getModifiedItemAttr('jumpDriveRangeBonus') * skill.level)
+
+
+class Effect1585(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1586(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1587(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'),
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1588(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect1590(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalize = False if 'skill' in context or 'implant' in context else True
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeVelocity', container.getModifiedItemAttr('aoeVelocityBonus') * level,
+                                        stackingPenalties=penalize)
+
+
+class Effect1592(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
+                                        'emDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect1593(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect1594(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect1595(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        mod = src.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'emDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+
+
+class Effect1596(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        mod = src.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+
+
+class Effect1597(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        mod = src.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+
+
+class Effect1615(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        skillName = 'Advanced Spaceship Command'
+        skill = fit.character.getSkill(skillName)
+        fit.ship.boostItemAttr('agility', skill.getModifiedItemAttr('agilityBonus'), skill=skillName)
+
+
+class Effect1616(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        if fit.ship.item.requiresSkill('Capital Ships'):
+            fit.ship.boostItemAttr('agility', skill.getModifiedItemAttr('agilityBonus') * skill.level)
+
+
+class Effect1617(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.multiplyItemAttr('agility', src.getModifiedItemAttr('advancedCapitalAgility'), stackingPenalties=True)
+
+
+class Effect1634(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
+                                      'capacitorNeed', container.getModifiedItemAttr('shieldBoostCapacitorBonus') * level)
+
+
+class Effect1635(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
+                                      'duration', container.getModifiedItemAttr('durationSkillBonus') * level,
+                                      stackingPenalties='skill' not in context)
+
+
+class Effect1638(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Gunnery') or mod.item.requiresSkill('Missile Launcher Operation'),
+            'power', skill.getModifiedItemAttr('powerNeedBonus') * skill.level)
+
+
+class Effect1643(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('mindlinkBonus'))
+
+
+class Effect1644(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('mindlinkBonus'))
+
+
+class Effect1645(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('mindlinkBonus'))
+
+
+class Effect1646(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('mindlinkBonus'))
+
+
+class Effect1650(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        amount = -skill.getModifiedItemAttr('consumptionQuantityBonus')
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
+                                         'consumptionQuantity', amount * skill.level)
+
+
+class Effect1657(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        mod = src.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', src.getModifiedItemAttr('damageMultiplierBonus') * mod)
+
+
+class Effect1668(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusA2'), skill='Amarr Freighter')
+
+
+class Effect1669(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusC2'), skill='Caldari Freighter')
+
+
+class Effect1670(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusG2'), skill='Gallente Freighter')
+
+
+class Effect1671(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacity', ship.getModifiedItemAttr('freighterBonusM2'), skill='Minmatar Freighter')
+
+
+class Effect1672(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusA1'), skill='Amarr Freighter')
+
+
+class Effect1673(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusC1'), skill='Caldari Freighter')
+
+
+class Effect1674(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusG1'), skill='Gallente Freighter')
+
+
+class Effect1675(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('freighterBonusM1'), skill='Minmatar Freighter')
+
+
+class Effect1720(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Operation') or mod.item.requiresSkill('Capital Shield Operation'),
+            'shieldBonus', module.getModifiedItemAttr('shieldBoostMultiplier'),
+            stackingPenalties=True)
+
+
+class Effect1722(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.ship.boostItemAttr('jumpDriveCapacitorNeed',
+                               skill.getModifiedItemAttr('jumpDriveCapacitorNeedBonus') * skill.level)
+
+
+class Effect1730(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill(skill),
+                                     'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect1738(EffectDef):
+
+    type = 'active'
+
+
+class Effect1763(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', container.getModifiedItemAttr('rofBonus') * level)
+
+
+class Effect1764(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context or 'implant' in context else True
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', container.getModifiedItemAttr('speedFactor') * level,
+                                        stackingPenalties=penalized)
+
+
+class Effect1773(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect1804(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect1805(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusAF'),
+                               skill='Amarr Frigate')
+
+
+class Effect1806(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusAF'),
+                               skill='Amarr Frigate')
+
+
+class Effect1807(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusAF'),
+                               skill='Amarr Frigate')
+
+
+class Effect1812(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect1813(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'),
+                               skill='Caldari Cruiser')
+
+
+class Effect1814(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'),
+                               skill='Caldari Cruiser')
+
+
+class Effect1815(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusCC2'),
+                               skill='Caldari Cruiser')
+
+
+class Effect1816(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect1817(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonusCF'),
+                               skill='Caldari Frigate')
+
+
+class Effect1819(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonusCF'),
+                               skill='Caldari Frigate')
+
+
+class Effect1820(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusCF'),
+                               skill='Caldari Frigate')
+
+
+class Effect1848(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('mindlinkBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
+                                      src.getModifiedItemAttr('mindlinkBonus'))
+
+
+class Effect1851(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill),
+                                      'speed', skill.getModifiedItemAttr('rofBonus') * skill.level)
+
+
+class Effect1862(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect1863(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect1864(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusCF2'),
+                                        skill='Caldari Frigate')
+
+
+class Effect1882(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'miningAmount', module.getModifiedItemAttr('miningAmountBonus'))
+
+
+class Effect1885(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise',
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect1886(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect1896(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                      'duration', ship.getModifiedItemAttr('eliteBonusBarge2'), skill='Exhumers')
+
+
+class Effect1910(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect1911(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanGravimetricStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect1912(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanMagnetometricStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect1913(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanRadarStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect1914(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanLadarStrengthBonus', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect1921(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+
+
+class Effect1922(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+
+
+class Effect1959(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'))
+
+
+class Effect1964(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect1969(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect1996(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect2000(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        amount = module.getModifiedItemAttr('droneRangeBonus')
+        fit.extraAttributes.increase('droneControlRange', amount)
+
+
+class Effect2008(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cynosural Field Generator',
+                                      'duration', ship.getModifiedItemAttr('durationBonus'))
+
+
+class Effect2013(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxVelocity', container.getModifiedItemAttr('droneMaxVelocityBonus') * level, stackingPenalties=True)
+
+
+class Effect2014(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        stacking = False if 'skill' in context else True
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxRange',
+                                     container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                     stackingPenalties=stacking)
+
+
+class Effect2015(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity', module.getModifiedItemAttr('hullHpBonus'))
+
+
+class Effect2016(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP', module.getModifiedItemAttr('hullHpBonus'))
+
+
+class Effect2017(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp', container.getModifiedItemAttr('hullHpBonus') * level)
+
+
+class Effect2019(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
+                                     'shieldBonus', container.getModifiedItemAttr('damageHP') * level)
+
+
+class Effect2020(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
+                                     'armorDamageAmount', container.getModifiedItemAttr('damageHP') * level,
+                                     stackingPenalties=True)
+
+
+class Effect2029(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusAdd'))
+
+
+class Effect2041(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('armor%sDamageResonance' % type.capitalize(),
+                                   module.getModifiedItemAttr('%sDamageResistanceBonus' % type),
+                                   stackingPenalties=True)
+
+
+class Effect2052(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('shield%sDamageResonance' % type.capitalize(),
+                                   module.getModifiedItemAttr('%sDamageResistanceBonus' % type),
+                                   stackingPenalties=True)
+
+
+class Effect2053(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
+                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2054(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
+                                      'explosiveDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2055(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
+                                      'kineticDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2056(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Shield Resistance Amplifier',
+                                      'thermalDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2105(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
+                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2106(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
+                                      'explosiveDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2107(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
+                                      'kineticDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2108(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Coating',
+                                      'thermalDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2109(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
+                                      'emDamageResistanceBonus', skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2110(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
+                                      'explosiveDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2111(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
+                                      'kineticDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2112(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Plating Energized',
+                                      'thermalDamageResistanceBonus',
+                                      skill.getModifiedItemAttr('hardeningBonus') * skill.level)
+
+
+class Effect2130(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect2131(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect2132(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect2133(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus2'))
+
+
+class Effect2134(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Shield Booster', 'maxRange',
+                                      ship.getModifiedItemAttr('maxRangeBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Shield Booster', 'maxRange',
+                                      ship.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect2135(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Armor Repairer', 'maxRange',
+                                      src.getModifiedItemAttr('maxRangeBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Armor Repairer', 'maxRange',
+                                      src.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect2143(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMC2'),
+                                      skill='Minmatar Cruiser')
+
+
+class Effect2155(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
+                                      skill='Command Ships')
+
+
+class Effect2156(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+
+
+class Effect2157(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
+                                      skill='Command Ships')
+
+
+class Effect2158(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+
+
+class Effect2160(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+
+
+class Effect2161(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
+                                      skill='Command Ships')
+
+
+class Effect2179(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         type, ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect2181(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         type, ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect2186(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         type, ship.getModifiedItemAttr('shipBonusGB2'), skill='Gallente Battleship')
+
+
+class Effect2187(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGB2'),
+                                     skill='Gallente Battleship')
+
+
+class Effect2188(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect2189(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect2200(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Light Missiles') or mod.charge.requiresSkill('Rockets'),
+            'kineticDamage', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+
+
+class Effect2201(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+
+
+class Effect2215(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect2232(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            fit.ship.boostItemAttr('scan%sStrength' % type,
+                                   module.getModifiedItemAttr('scan%sStrengthPercent' % type),
+                                   stackingPenalties=True)
+
+
+class Effect2249(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'miningAmount', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect2250(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect2251(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('maxGangModules'))
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupOnline',
+                                         src.getModifiedItemAttr('maxGangModules'))
+
+
+class Effect2252(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemForce(lambda mod: mod.item.requiresSkill('Cloaking'),
+                                      'moduleReactivationDelay',
+                                      container.getModifiedItemAttr('covertOpsAndReconOpsCloakModuleDelay'))
+
+
+class Effect2253(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemForce(lambda mod: mod.item.group.name == 'Cloaking Device',
+                                      'cloakingTargetingDelay',
+                                      ship.getModifiedItemAttr('covertOpsStealthBomberTargettingDelay'))
+
+
+class Effect2255(EffectDef):
+
+    type = 'active'
+
+
+class Effect2298(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        for type in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            sensorType = 'scan{0}Strength'.format(type)
+            sensorBoost = 'scan{0}StrengthPercent'.format(type)
+            if sensorBoost in implant.item.attributes:
+                fit.ship.boostItemAttr(sensorType, implant.getModifiedItemAttr(sensorBoost))
+
+
+class Effect2302(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
+            for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
+                bonus = '%s%sDamageResonance' % (attrPrefix, damageType)
+                bonus = '%s%s' % (bonus[0].lower(), bonus[1:])
+                booster = '%s%sDamageResonance' % (layer, damageType)
+                fit.ship.multiplyItemAttr(bonus, module.getModifiedItemAttr(booster),
+                                          stackingPenalties=True, penaltyGroup='preMul')
+
+
+class Effect2305(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('eliteBonusReconShip2'),
+                                      skill='Recon Ships')
+
+
+class Effect2354(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect2355(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect2356(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Capacitor Emission Systems'),
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+
+
+class Effect2402(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
+        for dmgType in damageTypes:
+            dmgAttr = '{0}Damage'.format(dmgType)
+            fit.modules.filteredItemBoost(
+                lambda mod: mod.item.group.name == 'Super Weapon' and dmgAttr in mod.itemModifiedAttributes,
+                dmgAttr, skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect2422(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('implantBonusVelocity'))
+
+
+class Effect2432(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.ship.boostItemAttr('capacitorCapacity', container.getModifiedItemAttr('capacitorCapacityBonus') * level)
+
+
+class Effect2444(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'cpu', module.getModifiedItemAttr('cpuPenaltyPercent'))
+
+
+class Effect2445(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                      'cpu', module.getModifiedItemAttr('cpuPenaltyPercent'))
+
+
+class Effect2456(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Upgrades'),
+                                      'cpuPenaltyPercent',
+                                      container.getModifiedItemAttr('miningUpgradeCPUReductionBonus') * level)
+
+
+class Effect2465(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('Em', 'Explosive', 'Kinetic', 'Thermal'):
+            fit.ship.boostItemAttr('armor{0}DamageResonance'.format(type), ship.getModifiedItemAttr('shipBonusAB'),
+                                   skill='Amarr Battleship')
+
+
+class Effect2479(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                      'duration', module.getModifiedItemAttr('iceHarvestCycleBonus'))
+
+
+class Effect2485(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('armorHP', implant.getModifiedItemAttr('armorHpBonus2'))
+
+
+class Effect2488(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.boostItemAttr('maxVelocity', implant.getModifiedItemAttr('velocityBonus2'))
+
+
+class Effect2489(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusMC'),
+                                      skill='Minmatar Cruiser')
+
+
+class Effect2490(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect2491(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
+                                      'ecmBurstRange', container.getModifiedItemAttr('rangeSkillBonus') * level,
+                                      stackingPenalties=False if 'skill' in context else True)
+
+
+class Effect2492(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect2503(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB2'),
+                                      skill='Gallente Battleship')
+
+
+class Effect2504(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect2561(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                                        skill='Assault Frigates')
+
+
+class Effect2589(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        for i in range(5):
+            attr = 'boosterEffectChance{0}'.format(i + 1)
+            fit.boosters.filteredItemBoost(lambda booster: attr in booster.itemModifiedAttributes,
+                                           attr, container.getModifiedItemAttr('boosterChanceBonus') * level)
+
+
+class Effect2602(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
+                               skill='Caldari Battleship')
+
+
+class Effect2603(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
+                               skill='Caldari Battleship')
+
+
+class Effect2604(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
+                               skill='Caldari Battleship')
+
+
+class Effect2605(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonus2CB'),
+                               skill='Caldari Battleship')
+
+
+class Effect2611(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                                      skill='Assault Frigates')
+
+
+class Effect2644(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'), stackingPenalties=True)
+
+
+class Effect2645(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionMultiplier'),
+                                  stackingPenalties=True)
+
+
+class Effect2646(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True)
+
+
+class Effect2647(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect2648(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect2649(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Light',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect2670(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True)
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True)
+
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            fit.ship.boostItemAttr(
+                'scan{}Strength'.format(scanType),
+                module.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
+                stackingPenalties=True
+            )
+
+
+class Effect2688(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'))
+
+
+class Effect2689(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'))
+
+
+class Effect2690(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'cpu', module.getModifiedItemAttr('cpuNeedBonus'))
+
+
+class Effect2691(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'cpu', module.getModifiedItemAttr('cpuNeedBonus'))
+
+
+class Effect2693(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2694(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2695(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                      'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2696(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2697(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2698(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                      'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2706(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'power', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2707(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'power', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2708(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                      'power', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2712(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2713(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('cpuOutput', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2714(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'cpu', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2716(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('drawback'), stackingPenalties=True)
+
+
+class Effect2717(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('drawback'),
+                               stackingPenalties=True)
+
+
+class Effect2718(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('shieldCapacity', module.getModifiedItemAttr('drawback'))
+
+
+class Effect2726(EffectDef):
+
+    type = 'active'
+
+
+class Effect2727(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
+                                         'maxGroupActive', skill.level)
+
+
+class Effect2734(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('Gravimetric', 'Ladar', 'Radar', 'Magnetometric'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                          'scan{0}StrengthBonus'.format(type),
+                                          ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect2735(EffectDef):
+
+    attr = 'boosterArmorHPPenalty'
+    displayName = 'Armor Capacity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.ship.boostItemAttr('armorHP', booster.getModifiedItemAttr(attr))
+
+
+class Effect2736(EffectDef):
+
+    attr = 'boosterArmorRepairAmountPenalty'
+    displayName = 'Armor Repair Amount'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Repair Unit',
+                                      'armorDamageAmount', booster.getModifiedItemAttr(attr))
+
+
+class Effect2737(EffectDef):
+
+    attr = 'boosterShieldCapacityPenalty'
+    displayName = 'Shield Capacity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.ship.boostItemAttr('shieldCapacity', booster.getModifiedItemAttr(attr))
+
+
+class Effect2739(EffectDef):
+
+    attr = 'boosterTurretOptimalRangePenalty'
+    displayName = 'Turret Optimal Range'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'maxRange', booster.getModifiedItemAttr(attr))
+
+
+class Effect2741(EffectDef):
+
+    attr = 'boosterTurretFalloffPenalty'
+    displayName = 'Turret Falloff'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'falloff', booster.getModifiedItemAttr(attr))
+
+
+class Effect2745(EffectDef):
+
+    attr = 'boosterCapacitorCapacityPenalty'
+    displayName = 'Cap Capacity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.ship.boostItemAttr('capacitorCapacity', booster.getModifiedItemAttr(attr))
+
+
+class Effect2746(EffectDef):
+
+    attr = 'boosterMaxVelocityPenalty'
+    displayName = 'Velocity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.ship.boostItemAttr('maxVelocity', booster.getModifiedItemAttr(attr))
+
+
+class Effect2747(EffectDef):
+
+    attr = 'boosterTurretTrackingPenalty'
+    displayName = 'Turret Tracking'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'trackingSpeed', booster.getModifiedItemAttr(attr))
+
+
+class Effect2748(EffectDef):
+
+    attr = 'boosterMissileVelocityPenalty'
+    displayName = 'Missile Velocity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', booster.getModifiedItemAttr(attr))
+
+
+class Effect2749(EffectDef):
+
+    attr = 'boosterAOEVelocityPenalty'
+    displayName = 'Missile Explosion Velocity'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeVelocity', booster.getModifiedItemAttr(attr))
+
+
+class Effect2756(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('Gravimetric', 'Magnetometric', 'Ladar', 'Radar'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                          'scan{0}StrengthBonus'.format(type), ship.getModifiedItemAttr('shipBonusCC'),
+                                          skill='Caldari Cruiser')
+
+
+class Effect2757(EffectDef):
+
+    type = 'active'
+
+
+class Effect2760(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        attrs = ('boosterArmorHPPenalty', 'boosterArmorRepairAmountPenalty')
+        for attr in attrs:
+            fit.boosters.filteredItemBoost(lambda booster: True, attr,
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+
+
+class Effect2763(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        attrs = ('boosterShieldBoostAmountPenalty', 'boosterShieldCapacityPenalty', 'shieldBoostMultiplier')
+        for attr in attrs:
+            # shieldBoostMultiplier can be positive (Blue Pill) and negative value (other boosters)
+            # We're interested in decreasing only side-effects
+            fit.boosters.filteredItemBoost(lambda booster: booster.getModifiedItemAttr(attr) < 0,
+                                           attr, container.getModifiedItemAttr('boosterAttributeModifier') * level)
+
+
+class Effect2766(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        attrs = ('boosterCapacitorCapacityPenalty', 'boosterMaxVelocityPenalty')
+        for attr in attrs:
+            fit.boosters.filteredItemBoost(lambda booster: True, attr,
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+
+
+class Effect2776(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        attrs = ('boosterAOEVelocityPenalty', 'boosterMissileAOECloudPenalty', 'boosterMissileVelocityPenalty')
+        for attr in attrs:
+            fit.boosters.filteredItemBoost(lambda booster: True, attr,
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+
+
+class Effect2778(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        attrs = ('boosterTurretFalloffPenalty', 'boosterTurretOptimalRangePenalty', 'boosterTurretTrackingPenalty')
+        for attr in attrs:
+            fit.boosters.filteredItemBoost(lambda booster: True, attr,
+                                           container.getModifiedItemAttr('boosterAttributeModifier') * level)
+
+
+class Effect2791(EffectDef):
+
+    attr = 'boosterMissileAOECloudPenalty'
+    displayName = 'Missile Explosion Radius'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeCloudSize', booster.getModifiedItemAttr(attr))
+
+
+class Effect2792(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('armor' + type.capitalize() + 'DamageResonance',
+                                   module.getModifiedItemAttr(type + 'DamageResistanceBonus') or 0,
+                                   stackingPenalties=True)
+
+
+class Effect2794(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                         'accessDifficultyBonus', container.getModifiedItemAttr('accessDifficultyBonus'),
+                                         position='post')
+
+
+class Effect2795(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('shield' + type.capitalize() + 'DamageResonance',
+                                   module.getModifiedItemAttr(type + 'DamageResistanceBonus') or 0,
+                                   stackingPenalties=True)
+
+
+class Effect2796(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('mass', module.getModifiedItemAttr('massBonusPercentage'), stackingPenalties=True)
+
+
+class Effect2797(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2798(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2799(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2801(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2802(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2803(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2804(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect2805(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAB2'),
+                                      skill='Amarr Battleship')
+
+
+class Effect2809(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect2810(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'explosionDelay', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                        skill='Heavy Assault Cruisers')
+
+
+class Effect2812(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Jammer',
+                                      'ecmBurstRange', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+
+
+class Effect2837(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('armorHP', module.getModifiedItemAttr('armorHPBonusAdd'))
+
+
+class Effect2847(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'trackingSpeed', container.getModifiedItemAttr('trackingSpeedBonus') * level)
+
+
+class Effect2848(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemIncrease(lambda module: module.item.requiresSkill('Archaeology'),
+                                         'accessDifficultyBonus',
+                                         container.getModifiedItemAttr('accessDifficultyBonusModifier'), position='post')
+
+
+class Effect2849(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemIncrease(lambda c: c.item.requiresSkill('Hacking'),
+                                         'accessDifficultyBonus',
+                                         container.getModifiedItemAttr('accessDifficultyBonusModifier'), position='post')
+
+
+class Effect2850(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'duration', module.getModifiedItemAttr('durationBonus'))
+
+
+class Effect2851(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                               '%sDamage' % dmgType,
+                                               container.getModifiedItemAttr('missileDamageMultiplierBonus'),
+                                               stackingPenalties=True)
+
+
+class Effect2853(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill('Cloaking'),
+                                      'cloakingTargetingDelay', module.getModifiedItemAttr('cloakingTargetingDelayBonus'))
+
+
+class Effect2857(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'))
+
+
+class Effect2865(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('implantBonusVelocity'),
+                               stackingPenalties=True)
+
+
+class Effect2866(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.boosters.filteredItemBoost(lambda bst: True, 'boosterDuration',
+                                       container.getModifiedItemAttr('durationBonus') * level)
+
+
+class Effect2867(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'damageMultiplier', module.getModifiedItemAttr('damageMultiplierBonus'),
+                                     stackingPenalties=True)
+
+
+class Effect2868(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
+                                      'armorDamageAmount', implant.getModifiedItemAttr('repairBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect2872(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Defender Missiles'),
+                                           'maxVelocity', container.getModifiedItemAttr('missileVelocityBonus'))
+
+
+class Effect2881(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2882(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2883(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2884(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2885(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gas Cloud Harvesting'),
+                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+
+
+class Effect2887(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2888(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2889(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2890(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2891(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2892(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2893(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2894(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2899(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2900(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2901(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2902(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2903(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2904(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2905(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2906(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2907(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'emDamage', implant.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2908(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosiveDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2909(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'kineticDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2910(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'thermalDamage', container.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect2911(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Data Miners',
+                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+
+
+class Effect2967(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        amount = -skill.getModifiedItemAttr('consumptionQuantityBonus')
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
+                                         'consumptionQuantity', amount * skill.level)
+
+
+class Effect2977(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Hull Repair Systems'),
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+
+
+class Effect2980(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Hull Repair Systems'),
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+
+
+class Effect2982(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        # We need to make sure that the attribute exists, otherwise we add attributes that don't belong.  See #927
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
+                                                  mod.item.getAttribute('duration'),
+                                      'duration',
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
+                                                  mod.item.getAttribute('durationECMJammerBurstProjector'),
+                                      'durationECMJammerBurstProjector',
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
+                                                  mod.item.getAttribute('durationTargetIlluminationBurstProjector'),
+                                      'durationTargetIlluminationBurstProjector',
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
+                                                  mod.item.getAttribute('durationSensorDampeningBurstProjector'),
+                                      'durationSensorDampeningBurstProjector',
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation') and
+                                                  mod.item.getAttribute('durationWeaponDisruptionBurstProjector'),
+                                      'durationWeaponDisruptionBurstProjector',
+                                      skill.getModifiedItemAttr('projECMDurationBonus') * skill.level)
+
+
+class Effect3001(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('speed', module.getModifiedItemAttr('overloadRofBonus'))
+
+
+class Effect3002(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus') or 0)
+
+
+class Effect3024(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'),
+                                        skill='Covert Ops')
+
+
+class Effect3025(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('damageMultiplier', module.getModifiedItemAttr('overloadDamageModifier'))
+
+
+class Effect3026(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                        'kineticDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'),
+                                        skill='Covert Ops')
+
+
+class Effect3027(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                        'thermalDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'),
+                                        skill='Covert Ops')
+
+
+class Effect3028(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                        'emDamage', ship.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+
+
+class Effect3029(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('emDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+
+
+class Effect3030(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('thermalDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+
+
+class Effect3031(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('explosiveDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+
+
+class Effect3032(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('kineticDamageResistanceBonus', module.getModifiedItemAttr('overloadHardeningBonus'))
+
+
+class Effect3035(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            module.boostItemAttr('%sDamageResistanceBonus' % type,
+                                 module.getModifiedItemAttr('overloadHardeningBonus'))
+
+
+class Effect3036(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Bomb',
+                                      'moduleReactivationDelay', skill.getModifiedItemAttr('reactivationDelayBonus') * skill.level)
+
+
+class Effect3046(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'), stackingPenalties=True)
+
+
+class Effect3047(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('hp', module.getModifiedItemAttr('structureHPMultiplier'))
+
+
+class Effect3061(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'heatDamage', module.getModifiedItemAttr('heatDamageBonus'))
+
+
+class Effect3169(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'cpu',
+                                      src.getModifiedItemAttr('shieldTransportCpuNeedBonus'))
+
+
+class Effect3172(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        # This is actually level-less bonus, anyway you have to train cruisers 5
+        # and will get 100% (20%/lvl as stated by description)
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
+                                     'armorDamageAmount', ship.getModifiedItemAttr('droneArmorDamageAmountBonus'))
+
+
+class Effect3173(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        # This is actually level-less bonus, anyway you have to train cruisers 5
+        # and will get 100% (20%/lvl as stated by description)
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
+                                     'shieldBonus', ship.getModifiedItemAttr('droneShieldBonusBonus'))
+
+
+class Effect3174(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxRange', module.getModifiedItemAttr('overloadRangeBonus'),
+                             stackingPenalties=True)
+
+
+class Effect3175(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('speedFactor', module.getModifiedItemAttr('overloadSpeedFactorBonus'),
+                             stackingPenalties=True)
+
+
+class Effect3182(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' not in context:
+            for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+                module.boostItemAttr('scan{0}StrengthBonus'.format(scanType),
+                                     module.getModifiedItemAttr('overloadECMStrengthBonus'),
+                                     stackingPenalties=True)
+
+
+class Effect3196(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: 'heatDamage' in mod.item.attributes, 'heatDamage',
+                                      skill.getModifiedItemAttr('thermodynamicsHeatDamage') * skill.level)
+
+
+class Effect3200(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus'))
+        module.boostItemAttr('armorDamageAmount', module.getModifiedItemAttr('overloadArmorDamageAmount'),
+                             stackingPenalties=True)
+
+
+class Effect3201(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('duration', module.getModifiedItemAttr('overloadSelfDurationBonus'))
+        module.boostItemAttr('shieldBonus', module.getModifiedItemAttr('overloadShieldBonus'), stackingPenalties=True)
+
+
+class Effect3212(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('FoF Missiles'),
+                                        'aoeCloudSize', container.getModifiedItemAttr('aoeCloudSizeBonus') * level)
+
+
+class Effect3234(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect3235(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect3236(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect3237(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect3241(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                               skill='Assault Frigates')
+
+
+class Effect3242(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                               skill='Assault Frigates')
+
+
+class Effect3243(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                               skill='Assault Frigates')
+
+
+class Effect3244(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('eliteBonusGunship1'),
+                               skill='Assault Frigates')
+
+
+class Effect3249(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect3264(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        amount = -skill.getModifiedItemAttr('consumptionQuantityBonus')
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
+                                         'consumptionQuantity', amount * skill.level)
+
+
+class Effect3267(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Industrial Reconfiguration'),
+                                      'consumptionQuantity', ship.getModifiedItemAttr('shipBonusORECapital1'),
+                                      skill='Capital Industrial Ships')
+
+
+class Effect3297(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonusAB'),
+                                      skill='Amarr Battleship')
+
+
+class Effect3298(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonusAC'),
+                                      skill='Amarr Cruiser')
+
+
+class Effect3299(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonusAF'),
+                                      skill='Amarr Frigate')
+
+
+class Effect3313(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.ship.boostItemAttr('maxJumpClones', skill.getModifiedItemAttr('maxJumpClonesBonus') * skill.level)
+
+
+class Effect3331(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+
+
+class Effect3335(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect3336(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'),
+                               skill='Minmatar Cruiser')
+
+
+class Effect3339(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'),
+                               skill='Minmatar Cruiser')
+
+
+class Effect3340(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusMC2'),
+                               skill='Minmatar Cruiser')
+
+
+class Effect3343(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                      skill='Heavy Interdiction Cruisers')
+
+
+class Effect3355(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                        skill='Heavy Interdiction Cruisers')
+
+
+class Effect3356(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                        skill='Heavy Interdiction Cruisers')
+
+
+class Effect3357(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                        skill='Heavy Interdiction Cruisers')
+
+
+class Effect3366(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect3367(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect3369(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect3370(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect3371(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'capacitorNeed', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect3374(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('signatureRadius', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
+                               skill='Electronic Attack Ships')
+
+
+class Effect3379(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'capacitorNeed', implant.getModifiedItemAttr('capNeedBonus'))
+
+
+class Effect3380(EffectDef):
+
+    runTime = 'early'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+
+        if 'projected' in context:
+            fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+            if module.charge is not None and module.charge.ID == 45010:
+                for mod in fit.modules:
+                    if not mod.isEmpty and mod.item.requiresSkill('High Speed Maneuvering') and mod.state > FittingModuleState.ONLINE:
+                        mod.state = FittingModuleState.ONLINE
+                    if not mod.isEmpty and mod.item.requiresSkill('Micro Jump Drive Operation') and mod.state > FittingModuleState.ONLINE:
+                        mod.state = FittingModuleState.ONLINE
+        else:
+            if module.charge is None:
+                fit.ship.boostItemAttr('mass', module.getModifiedItemAttr('massBonusPercentage'))
+                fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'))
+                fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                              'speedBoostFactor', module.getModifiedItemAttr('speedBoostFactorBonus'))
+                fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                          'speedFactor', module.getModifiedItemAttr('speedFactorBonus'))
+
+            fit.ship.forceItemAttr('disallowAssistance', 1)
+
+
+class Effect3392(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+
+
+class Effect3403(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        if fit.extraAttributes['cloaked']:
+            fit.ship.multiplyItemAttr('maxVelocity', ship.getModifiedItemAttr('eliteBonusBlackOps2'), skill='Black Ops')
+
+
+class Effect3406(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+
+
+class Effect3415(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect3416(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect3417(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect3424(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusViolators1'), skill='Marauders')
+
+
+class Effect3425(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusViolators1'), skill='Marauders')
+
+
+class Effect3427(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusViolatorsRole2'))
+
+
+class Effect3439(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('eliteBonusViolators1'),
+                                      skill='Marauders')
+
+
+class Effect3447(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect3466(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('rechargeRate', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
+                               skill='Electronic Attack Ships')
+
+
+class Effect3467(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('capacitorCapacity', ship.getModifiedItemAttr('eliteBonusElectronicAttackShip2'),
+                               skill='Electronic Attack Ships')
+
+
+class Effect3468(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Disrupt Field Generator',
+                                      'warpScrambleRange', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors2'),
+                                      skill='Heavy Interdiction Cruisers')
+
+
+class Effect3473(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
+                                      'maxTractorVelocity', ship.getModifiedItemAttr('eliteBonusViolatorsRole3'))
+
+
+class Effect3478(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect3480(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect3483(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect3484(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect3487(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect3489(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect3493(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cargo Scanner',
+                                      'cargoScanRange', ship.getModifiedItemAttr('cargoScannerRangeBonus'))
+
+
+class Effect3494(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Survey Scanner',
+                                      'surveyScanRange', ship.getModifiedItemAttr('surveyScannerRangeBonus'))
+
+
+class Effect3495(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        groups = ('Stasis Web', 'Warp Scrambler')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'capacitorNeed', ship.getModifiedItemAttr('eliteBonusInterceptorRole'))
+
+
+class Effect3496(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'agilityBonus', implant.getModifiedItemAttr('implantSetThukker'))
+
+
+class Effect3498(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'scanStrengthBonus', implant.getModifiedItemAttr('implantSetSisters'))
+
+
+class Effect3499(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'boosterAttributeModifier',
+                                                 implant.getModifiedItemAttr('implantSetSyndicate'))
+
+
+class Effect3513(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'rangeSkillBonus', implant.getModifiedItemAttr('implantSetMordus'))
+
+
+class Effect3514(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusInterceptor2'), skill='Interceptors')
+
+
+class Effect3519(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'),
+                                      'cpu', skill.getModifiedItemAttr('cpuNeedBonus') * skill.level)
+
+
+class Effect3520(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'),
+                                      'power', skill.getModifiedItemAttr('powerNeedBonus') * skill.level)
+
+
+class Effect3526(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cynosural Field Generator',
+                                      'consumptionQuantity',
+                                      container.getModifiedItemAttr('consumptionQuantityBonusPercentage') * level)
+
+
+class Effect3530(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+
+
+class Effect3532(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.ship.boostItemAttr('jumpDriveConsumptionAmount',
+                               skill.getModifiedItemAttr('consumptionQuantityBonusPercentage') * skill.level)
+
+
+class Effect3561(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
+                                      'trackingSpeedBonus',
+                                      container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+
+
+class Effect3568(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'maxRangeBonus', ship.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect3569(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'maxRangeBonus', ship.getModifiedItemAttr('eliteBonusLogistics2'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect3570(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'trackingSpeedBonus', ship.getModifiedItemAttr('eliteBonusLogistics2'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect3571(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'trackingSpeedBonus', ship.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect3586(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context else True
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'scanResolutionBonus',
+                                      container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level,
+                                      stackingPenalties=penalized)
+
+
+class Effect3587(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxTargetRangeBonus', ship.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect3588(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxTargetRangeBonus', ship.getModifiedItemAttr('shipBonusGF2'),
+                                      skill='Gallente Frigate')
+
+
+class Effect3589(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'scanResolutionBonus', ship.getModifiedItemAttr('shipBonusGF2'),
+                                      skill='Gallente Frigate')
+
+
+class Effect3590(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'scanResolutionBonus', ship.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect3591(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxTargetRangeBonus',
+                                      container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+
+
+class Effect3592(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('hp', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'), skill='Jump Freighters')
+
+
+class Effect3593(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('jumpDriveConsumptionAmount', ship.getModifiedItemAttr('eliteBonusJumpFreighter2'),
+                               skill='Jump Freighters')
+
+
+class Effect3597(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('scanResolutionBonus', module.getModifiedChargeAttr('scanResolutionBonusBonus'))
+
+
+class Effect3598(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxTargetRangeBonus', module.getModifiedChargeAttr('maxTargetRangeBonusBonus'))
+
+
+class Effect3599(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('trackingSpeedBonus', module.getModifiedChargeAttr('trackingSpeedBonusBonus'))
+
+
+class Effect3600(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxRangeBonus', module.getModifiedChargeAttr('maxRangeBonusBonus'))
+
+
+class Effect3601(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.forceItemAttr('disallowInEmpireSpace', module.getModifiedChargeAttr('disallowInEmpireSpace'))
+
+
+class Effect3602(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('duration', module.getModifiedChargeAttr('durationBonus'))
+
+
+class Effect3617(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('signatureRadiusBonus', module.getModifiedChargeAttr('signatureRadiusBonusBonus'))
+
+
+class Effect3618(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('massBonusPercentage', module.getModifiedChargeAttr('massBonusPercentageBonus'))
+
+
+class Effect3619(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('speedBoostFactorBonus', module.getModifiedChargeAttr('speedBoostFactorBonusBonus'))
+
+
+class Effect3620(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('speedFactorBonus', module.getModifiedChargeAttr('speedFactorBonusBonus'))
+
+
+class Effect3648(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('warpScrambleRange', module.getModifiedChargeAttr('warpScrambleRangeBonus'))
+
+
+class Effect3649(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusViolators1'),
+                                      skill='Marauders')
+
+
+class Effect3650(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+
+
+class Effect3651(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+
+
+class Effect3652(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Weapon Disruptor',
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+
+
+class Effect3653(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Burst Projectors',
+                                      'maxRange', implant.getModifiedItemAttr('rangeSkillBonus'))
+
+
+class Effect3655(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect3656(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect3657(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True)
+
+
+class Effect3659(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True)
+
+
+class Effect3660(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('maxLockedTargets', module.getModifiedItemAttr('maxLockedTargetsBonus'))
+
+
+class Effect3668(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mining Laser',
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect3669(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Frequency Mining Laser',
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect3670(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Strip Miner',
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect3671(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
+                                      'maxRange', implant.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect3672(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'maxRangeBonus', implant.getModifiedItemAttr('implantSetORE'))
+
+
+class Effect3677(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect3678(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldCapacity', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'),
+                               skill='Jump Freighters')
+
+
+class Effect3679(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorHP', ship.getModifiedItemAttr('eliteBonusJumpFreighter1'), skill='Jump Freighters')
+
+
+class Effect3680(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusC1'), skill='Caldari Freighter')
+
+
+class Effect3681(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusM1'), skill='Minmatar Freighter')
+
+
+class Effect3682(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusG1'), skill='Gallente Freighter')
+
+
+class Effect3683(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusA1'), skill='Amarr Freighter')
+
+
+class Effect3686(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('falloffBonus', module.getModifiedChargeAttr('falloffBonusBonus'))
+
+
+class Effect3703(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        groups = ('Missile Launcher Rapid Light', 'Missile Launcher Heavy', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect3705(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect3706(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect3726(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('agility', module.getModifiedItemAttr('agilityBonus'), stackingPenalties=True)
+
+
+class Effect3727(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('implantBonusVelocity'),
+                               stackingPenalties=True)
+
+
+class Effect3739(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam', 'maxRange',
+                                      src.getModifiedItemAttr('roleBonusTractorBeamRange'))
+
+
+class Effect3740(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam', 'maxTractorVelocity',
+                                      ship.getModifiedItemAttr('roleBonusTractorBeamVelocity'))
+
+
+class Effect3742(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('specialOreHoldCapacity',
+                               src.getModifiedItemAttr('shipBonusICS1'),
+                               skill='Industrial Command Ships')
+
+        fit.ship.boostItemAttr('capacity',
+                               src.getModifiedItemAttr('shipBonusICS1'),
+                               skill='Industrial Command Ships')
+
+
+class Effect3744(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('shipBonusICS2'), skill='Industrial Command Ships')
+
+
+class Effect3745(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Survey Scanner', 'surveyScanRange',
+                                      src.getModifiedItemAttr('roleBonusSurveyScannerRange'))
+
+
+class Effect3765(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
+                                         'power', ship.getModifiedItemAttr('stealthBomberLauncherPower'))
+
+
+class Effect3766(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('eliteBonusInterceptor'),
+                                      skill='Interceptors')
+
+
+class Effect3767(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                        skill='Command Ships')
+
+
+class Effect3771(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('armorHP', module.getModifiedItemAttr('armorHPBonusAdd') or 0)
+
+
+class Effect3773(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('turretSlotsLeft', module.getModifiedItemAttr('turretHardPointModifier'))
+        fit.ship.increaseItemAttr('launcherSlotsLeft', module.getModifiedItemAttr('launcherHardPointModifier'))
+
+
+class Effect3774(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('hiSlots', module.getModifiedItemAttr('hiSlotModifier'))
+        fit.ship.increaseItemAttr('medSlots', module.getModifiedItemAttr('medSlotModifier'))
+        fit.ship.increaseItemAttr('lowSlots', module.getModifiedItemAttr('lowSlotModifier'))
+
+
+class Effect3782(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('powerOutput', module.getModifiedItemAttr('powerOutput'))
+
+
+class Effect3783(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('cpuOutput', module.getModifiedItemAttr('cpuOutput'))
+
+
+class Effect3797(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('droneBandwidth', module.getModifiedItemAttr('droneBandwidth'))
+
+
+class Effect3799(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('droneCapacity', module.getModifiedItemAttr('droneCapacity'))
+
+
+class Effect3807(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRange'))
+
+
+class Effect3808(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadius'))
+
+
+class Effect3810(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, subsystem, context):
+        fit.ship.increaseItemAttr('capacity', subsystem.getModifiedItemAttr('cargoCapacityAdd') or 0)
+
+
+class Effect3811(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('capacitorCapacity', module.getModifiedItemAttr('capacitorCapacity') or 0)
+
+
+class Effect3831(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('shieldCapacity', module.getModifiedItemAttr('shieldCapacity'))
+
+
+class Effect3857(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('subsystemBonusAmarrPropulsion'),
+                               skill='Amarr Propulsion Systems')
+
+
+class Effect3859(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion'),
+                               skill='Caldari Propulsion Systems')
+
+
+class Effect3860(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('subsystemBonusMinmatarPropulsion'),
+                               skill='Minmatar Propulsion Systems')
+
+
+class Effect3861(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('subsystemBonusMinmatarPropulsion'),
+                                      skill='Minmatar Propulsion Systems')
+
+
+class Effect3863(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('subsystemBonusCaldariPropulsion'),
+                                      skill='Caldari Propulsion Systems')
+
+
+class Effect3864(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('subsystemBonusAmarrPropulsion'),
+                                      skill='Amarr Propulsion Systems')
+
+
+class Effect3865(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion2'),
+                               skill='Amarr Propulsion Systems')
+
+
+class Effect3866(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion2'),
+                               skill='Caldari Propulsion Systems')
+
+
+class Effect3867(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusGallentePropulsion2'),
+                               skill='Gallente Propulsion Systems')
+
+
+class Effect3868(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion2'),
+                               skill='Minmatar Propulsion Systems')
+
+
+class Effect3869(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion2'),
+                                      skill='Minmatar Propulsion Systems')
+
+
+class Effect3872(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion2'),
+                                      skill='Amarr Propulsion Systems')
+
+
+class Effect3875(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'capacitorNeed', module.getModifiedItemAttr('subsystemBonusGallentePropulsion'),
+                                      skill='Gallente Propulsion Systems')
+
+
+class Effect3893(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanLadarStrength', src.getModifiedItemAttr('subsystemBonusMinmatarCore'),
+                               skill='Minmatar Core Systems')
+
+
+class Effect3895(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanMagnetometricStrength', src.getModifiedItemAttr('subsystemBonusGallenteCore'),
+                               skill='Gallente Core Systems')
+
+
+class Effect3897(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanGravimetricStrength', src.getModifiedItemAttr('subsystemBonusCaldariCore'), skill='Caldari Core Systems')
+
+
+class Effect3900(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanRadarStrength', src.getModifiedItemAttr('subsystemBonusAmarrCore'),
+                               skill='Amarr Core Systems')
+
+
+class Effect3959(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', module.getModifiedItemAttr('subsystemBonusAmarrDefensive'),
+                                      skill='Amarr Defensive Systems')
+
+
+class Effect3961(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', module.getModifiedItemAttr('subsystemBonusGallenteDefensive'),
+                                      skill='Gallente Defensive Systems')
+
+
+class Effect3962(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
+                                      skill='Minmatar Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
+                                      skill='Minmatar Defensive Systems')
+
+
+class Effect3964(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', module.getModifiedItemAttr('subsystemBonusCaldariDefensive'),
+                                      skill='Caldari Defensive Systems')
+
+
+class Effect3976(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('shieldCapacity', module.getModifiedItemAttr('subsystemBonusCaldariDefensive'),
+                               skill='Caldari Defensive Systems')
+
+
+class Effect3979(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
+                               skill='Minmatar Defensive Systems')
+        fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive'),
+                               skill='Minmatar Defensive Systems')
+
+
+class Effect3980(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('subsystemBonusGallenteDefensive'),
+                               skill='Gallente Defensive Systems')
+
+
+class Effect3982(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('armorHP', module.getModifiedItemAttr('subsystemBonusAmarrDefensive'),
+                               skill='Amarr Defensive Systems')
+
+
+class Effect3992(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('shieldCapacity', beacon.getModifiedItemAttr('shieldCapacityMultiplier'))
+
+
+class Effect3993(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('maxTargetRange', beacon.getModifiedItemAttr('maxTargetRangeMultiplier'),
+                                  stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect3995(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('signatureRadius', beacon.getModifiedItemAttr('signatureRadiusMultiplier'),
+                                  stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect3996(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', beacon.getModifiedItemAttr('armorEmDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect3997(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance',
+                               beacon.getModifiedItemAttr('armorExplosiveDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect3998(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance',
+                               beacon.getModifiedItemAttr('armorKineticDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect3999(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance',
+                               beacon.getModifiedItemAttr('armorThermalDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect4002(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'maxVelocity', beacon.getModifiedItemAttr('missileVelocityMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4003(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('maxVelocity', beacon.getModifiedItemAttr('maxVelocityMultiplier'),
+                                  stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4016(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                         'damageMultiplier', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect4017(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'thermalDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4018(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'emDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4019(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'explosiveDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4020(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'kineticDamage', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4021(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill('Drones'),
+                                        'damageMultiplier', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                        stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4022(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                         'trackingSpeed', module.getModifiedItemAttr('trackingSpeedMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4023(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'aoeVelocity', beacon.getModifiedItemAttr('aoeVelocityMultiplier'))
+
+
+class Effect4033(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'heatDamage' in mod.itemModifiedAttributes,
+                                         'heatDamage', module.getModifiedItemAttr('heatDamageMultiplier'))
+
+
+class Effect4034(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadArmorDamageAmount' in mod.itemModifiedAttributes,
+                                         'overloadArmorDamageAmount', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4035(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadDamageModifier' in mod.itemModifiedAttributes,
+                                         'overloadDamageModifier', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4036(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadDurationBonus' in mod.itemModifiedAttributes,
+                                         'overloadDurationBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4037(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadECCMStrenghtBonus' in mod.itemModifiedAttributes,
+                                         'overloadECCMStrenghtBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4038(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadECMStrenghtBonus' in mod.itemModifiedAttributes,
+                                         'overloadECMStrenghtBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4039(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadHardeningBonus' in mod.itemModifiedAttributes,
+                                         'overloadHardeningBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4040(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadRangeBonus' in mod.itemModifiedAttributes,
+                                         'overloadRangeBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4041(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadRofBonus' in mod.itemModifiedAttributes,
+                                         'overloadRofBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4042(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadSelfDurationBonus' in mod.itemModifiedAttributes,
+                                         'overloadSelfDurationBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4043(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadShieldBonus' in mod.itemModifiedAttributes,
+                                         'overloadShieldBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4044(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: 'overloadSpeedFactorBonus' in mod.itemModifiedAttributes,
+                                         'overloadSpeedFactorBonus', module.getModifiedItemAttr('overloadBonusMultiplier'))
+
+
+class Effect4045(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                         'empFieldRange', module.getModifiedItemAttr('empFieldRangeMultiplier'))
+
+
+class Effect4046(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                         'emDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+
+
+class Effect4047(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                         'thermalDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+
+
+class Effect4048(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                         'kineticDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+
+
+class Effect4049(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                         'explosiveDamage', module.getModifiedItemAttr('smartbombDamageMultiplier'))
+
+
+class Effect4054(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                         'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect4055(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                         'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect4056(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                         'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect4057(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                           'emDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4058(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                           'explosiveDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4059(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                           'kineticDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4060(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                           'thermalDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4061(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                           'thermalDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4062(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                           'emDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4063(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                           'explosiveDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4086(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Repair Systems') or
+                                                     mod.item.requiresSkill('Capital Repair Systems'),
+                                         'armorDamageAmount', module.getModifiedItemAttr('armorDamageAmountMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4088(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                         'armorDamageAmount',
+                                         module.getModifiedItemAttr('armorDamageAmountMultiplierRemote'),
+                                         stackingPenalties=True)
+
+
+class Effect4089(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                         'shieldBonus', module.getModifiedItemAttr('shieldBonusMultiplierRemote'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4090(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('capacitorCapacity', beacon.getModifiedItemAttr('capacitorCapacityMultiplierSystem'))
+
+
+class Effect4091(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('rechargeRate', beacon.getModifiedItemAttr('rechargeRateMultiplier'))
+
+
+class Effect4093(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', module.getModifiedItemAttr('subsystemBonusAmarrOffensive'),
+                                      skill='Amarr Offensive Systems')
+
+
+class Effect4104(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', module.getModifiedItemAttr('subsystemBonusCaldariOffensive'),
+                                      skill='Caldari Offensive Systems')
+
+
+class Effect4106(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', module.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                      skill='Gallente Offensive Systems')
+
+
+class Effect4114(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4115(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'maxRange', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4122(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+
+
+class Effect4135(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', beacon.getModifiedItemAttr('shieldEmDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect4136(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance',
+                               beacon.getModifiedItemAttr('shieldExplosiveDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect4137(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance',
+                               beacon.getModifiedItemAttr('shieldKineticDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect4138(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance',
+                               beacon.getModifiedItemAttr('shieldThermalDamageResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect4152(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      module.getModifiedItemAttr('subsystemBonusAmarrCore'),
+                                      skill='Amarr Core Systems')
+
+
+class Effect4153(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      module.getModifiedItemAttr('subsystemBonusCaldariCore'),
+                                      skill='Caldari Core Systems')
+
+
+class Effect4154(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      module.getModifiedItemAttr('subsystemBonusGallenteCore'),
+                                      skill='Gallente Core Systems')
+
+
+class Effect4155(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      module.getModifiedItemAttr('subsystemBonusMinmatarCore'),
+                                      skill='Minmatar Core Systems')
+
+
+class Effect4158(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('capacitorCapacity', src.getModifiedItemAttr('subsystemBonusCaldariCore'),
+                               skill='Caldari Core Systems')
+
+
+class Effect4159(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('capacitorCapacity', src.getModifiedItemAttr('subsystemBonusAmarrCore'), skill='Amarr Core Systems')
+
+
+class Effect4161(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseMaxScanDeviation',
+                                        container.getModifiedItemAttr('maxScanDeviationModifier') * level)
+
+
+class Effect4162(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        penalized = False if 'skill' in context or 'implant' in context else True
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', container.getModifiedItemAttr('scanStrengthBonus') * level,
+                                        stackingPenalties=penalized)
+
+
+class Effect4165(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonusCF2'),
+                                        skill='Caldari Frigate')
+
+
+class Effect4166(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonusMF2'),
+                                        skill='Minmatar Frigate')
+
+
+class Effect4167(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonusGF2'),
+                                        skill='Gallente Frigate')
+
+
+class Effect4168(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
+                                        'baseSensorStrength', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
+                                        skill='Covert Ops')
+
+
+class Effect4187(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserAmarr1'),
+                                      skill='Amarr Strategic Cruiser')
+
+
+class Effect4188(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserCaldari1'),
+                                      skill='Caldari Strategic Cruiser')
+
+
+class Effect4189(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserGallente1'),
+                                      skill='Gallente Strategic Cruiser')
+
+
+class Effect4190(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserMinmatar1'),
+                                      skill='Minmatar Strategic Cruiser')
+
+
+class Effect4215(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'capacitorNeed', module.getModifiedItemAttr('subsystemBonusAmarrOffensive2'),
+                                      skill='Amarr Offensive Systems')
+
+
+class Effect4216(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'powerTransferAmount',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
+
+
+class Effect4217(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'energyNeutralizerAmount',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
+
+
+class Effect4248(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'kineticDamage', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
+                                        skill='Caldari Offensive Systems')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
+                                        skill='Caldari Offensive Systems')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'kineticDamage', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
+                                        skill='Caldari Offensive Systems')
+
+
+class Effect4250(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'armorHP', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                     skill='Gallente Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'hp', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                     skill='Gallente Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'damageMultiplier', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                     skill='Gallente Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'shieldCapacity', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'),
+                                     skill='Gallente Offensive Systems')
+
+
+class Effect4251(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive2'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4256(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive2'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4264(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('rechargeRate', src.getModifiedItemAttr('subsystemBonusMinmatarCore'),
+                               skill='Minmatar Core Systems')
+
+
+class Effect4265(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('rechargeRate', src.getModifiedItemAttr('subsystemBonusGallenteCore'),
+                               skill='Gallente Core Systems')
+
+
+class Effect4269(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('subsystemBonusAmarrCore3'),
+                               skill='Amarr Core Systems')
+
+
+class Effect4270(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('subsystemBonusMinmatarCore3'),
+                               skill='Minmatar Core Systems')
+
+
+class Effect4271(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+
+
+class Effect4272(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusGallenteCore2'),
+                               skill='Gallente Core Systems')
+
+
+class Effect4273(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'maxRange',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteCore2'), skill='Gallente Core Systems')
+
+
+class Effect4274(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'), skill='Minmatar Core Systems')
+
+
+class Effect4275(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion2'),
+                               skill='Caldari Propulsion Systems')
+
+
+class Effect4277(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusGallentePropulsion'),
+                               skill='Gallente Propulsion Systems')
+
+
+class Effect4278(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusGallentePropulsion2'),
+                               skill='Gallente Propulsion Systems')
+
+
+class Effect4280(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('agility', beacon.getModifiedItemAttr('agilityMultiplier'), stackingPenalties=True)
+
+
+class Effect4282(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', module.getModifiedItemAttr('subsystemBonusGallenteOffensive2'),
+                                      skill='Gallente Offensive Systems')
+
+
+class Effect4283(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', module.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
+                                      skill='Caldari Offensive Systems')
+
+
+class Effect4286(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+
+
+class Effect4288(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'), skill='Gallente Offensive Systems')
+
+
+class Effect4290(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'capacitorNeed', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive2'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4292(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'capacitorNeed', src.getModifiedItemAttr('subsystemBonusCaldariOffensive2'),
+                                      skill='Caldari Offensive Systems')
+
+
+class Effect4321(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanLadarStrengthBonus',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanRadarStrengthBonus',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'maxRange',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanGravimetricStrengthBonus',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scanMagnetometricStrengthBonus',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore2'), skill='Caldari Core Systems')
+
+
+class Effect4327(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'hp', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'armorHP', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'shieldCapacity', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'damageMultiplier', src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+
+
+class Effect4330(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', module.getModifiedItemAttr('subsystemBonusAmarrOffensive3'),
+                                      skill='Amarr Offensive Systems')
+
+
+class Effect4331(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles') or mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', src.getModifiedItemAttr('subsystemBonusCaldariOffensive3'),
+                                        skill='Caldari Offensive Systems')
+
+
+class Effect4342(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'),
+                               skill='Minmatar Core Systems')
+
+
+class Effect4343(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('maxTargetRange', src.getModifiedItemAttr('subsystemBonusAmarrCore2'),
+                               skill='Amarr Core Systems')
+
+
+class Effect4347(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', module.getModifiedItemAttr('subsystemBonusGallenteOffensive3'),
+                                      skill='Gallente Offensive Systems')
+
+
+class Effect4351(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'trackingSpeed', module.getModifiedItemAttr('subsystemBonusMinmatarOffensive3'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect4358(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'maxRange', module.getModifiedItemAttr('ecmRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect4360(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+
+
+class Effect4362(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                        'emDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', src.getModifiedItemAttr('subsystemBonusAmarrOffensive2'), skill='Amarr Offensive Systems')
+
+
+class Effect4366(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect4369(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.forceItemAttr('warpBubbleImmune', module.getModifiedItemAttr('warpBubbleImmuneModifier'))
+
+
+class Effect4370(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusCC2'),
+                                      skill='Caldari Cruiser')
+
+
+class Effect4372(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusCB3'),
+                                      skill='Caldari Battleship')
+
+
+class Effect4373(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusAmarrOffensive'), skill='Amarr Offensive Systems')
+
+
+class Effect4377(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4378(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect4379(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect4380(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect4384(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusReconShip1'),
+                                        skill='Recon Ships')
+
+
+class Effect4385(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusReconShip1'),
+                                        skill='Recon Ships')
+
+
+class Effect4393(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'thermalDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
+                                        skill='Covert Ops')
+
+
+class Effect4394(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'emDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'), skill='Covert Ops')
+
+
+class Effect4395(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
+                                        skill='Covert Ops')
+
+
+class Effect4396(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'kineticDamage', ship.getModifiedItemAttr('eliteBonusCovertOps2'),
+                                        skill='Covert Ops')
+
+
+class Effect4397(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect4398(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect4399(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect4400(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect4413(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect4415(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect4416(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect4417(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect4451(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.increaseItemAttr('scanRadarStrength', implant.getModifiedItemAttr('scanRadarStrengthModifier'))
+
+
+class Effect4452(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.increaseItemAttr('scanLadarStrength', implant.getModifiedItemAttr('scanLadarStrengthModifier'))
+
+
+class Effect4453(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.increaseItemAttr('scanGravimetricStrength', implant.getModifiedItemAttr('scanGravimetricStrengthModifier'))
+
+
+class Effect4454(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.ship.increaseItemAttr('scanMagnetometricStrength',
+                                  implant.getModifiedItemAttr('scanMagnetometricStrengthModifier'))
+
+
+class Effect4456(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanMagnetometricStrengthPercent',
+                                                 implant.getModifiedItemAttr('implantSetFederationNavy'))
+
+
+class Effect4457(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanRadarStrengthPercent',
+                                                 implant.getModifiedItemAttr('implantSetImperialNavy'))
+
+
+class Effect4458(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanLadarStrengthPercent',
+                                                 implant.getModifiedItemAttr('implantSetRepublicFleet'))
+
+
+class Effect4459(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanGravimetricStrengthPercent',
+                                                 implant.getModifiedItemAttr('implantSetCaldariNavy'))
+
+
+class Effect4460(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanRadarStrengthModifier',
+                                                 implant.getModifiedItemAttr('implantSetLGImperialNavy'))
+
+
+class Effect4461(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanMagnetometricStrengthModifier',
+                                                 implant.getModifiedItemAttr('implantSetLGFederationNavy'))
+
+
+class Effect4462(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanGravimetricStrengthModifier',
+                                                 implant.getModifiedItemAttr('implantSetLGCaldariNavy'))
+
+
+class Effect4463(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill('Cybernetics'),
+                                                 'scanLadarStrengthModifier',
+                                                 implant.getModifiedItemAttr('implantSetLGRepublicFleet'))
+
+
+class Effect4464(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusMF'), stackingPenalties=True, skill='Minmatar Frigate')
+
+
+class Effect4471(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect4472(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+
+
+class Effect4473(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('shipBonusATC1'))
+
+
+class Effect4474(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATC2'))
+
+
+class Effect4475(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusATC2'))
+
+
+class Effect4476(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4477(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4478(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Propulsion Module',
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusATF1'))
+
+
+class Effect4479(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Survey Probe',
+                                        'explosionDelay', ship.getModifiedItemAttr('eliteBonusCovertOps3'),
+                                        skill='Covert Ops')
+
+
+class Effect4482(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect4484(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect4485(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect4489(EffectDef):
+
+    type = 'active'
+
+
+class Effect4490(EffectDef):
+
+    type = 'active'
+
+
+class Effect4491(EffectDef):
+
+    type = 'active'
+
+
+class Effect4492(EffectDef):
+
+    type = 'active'
+
+
+class Effect4510(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect4512(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect4513(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'speedFactor', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect4515(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect4516(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect4527(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                      'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect4555(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
+                                        'emDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect4556(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
+                                        'explosiveDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect4557(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
+                                        'kineticDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect4558(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'),
+                                        'thermalDamage', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect4559(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for attr in ('maxRange', 'falloff', 'trackingSpeed'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          attr, module.getModifiedItemAttr('%sBonus' % attr),
+                                          stackingPenalties=True)
+
+
+class Effect4575(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.extraAttributes['siege'] = True
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+        fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'))
+        fit.ship.multiplyItemAttr('scanResolution',
+                                  src.getModifiedItemAttr('scanResolutionMultiplier'),
+                                  stackingPenalties=True)
+
+        #  Remote Shield Repper Bonuses
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'duration',
+                                      src.getModifiedItemAttr('industrialCoreRemoteLogisticsDurationBonus'),
+                                      )
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'maxRange',
+                                      src.getModifiedItemAttr('industrialCoreRemoteLogisticsRangeBonus'),
+                                      stackingPenalties=True
+                                      )
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'capacitorNeed',
+                                      src.getModifiedItemAttr('industrialCoreRemoteLogisticsDurationBonus')
+                                      )
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'falloffEffectiveness',
+                                      src.getModifiedItemAttr('industrialCoreRemoteLogisticsRangeBonus'),
+                                      stackingPenalties=True
+                                      )
+
+        #  Local Shield Repper Bonuses
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
+                                      'duration',
+                                      src.getModifiedItemAttr('industrialCoreLocalLogisticsDurationBonus'),
+                                      )
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
+                                      'shieldBonus',
+                                      src.getModifiedItemAttr('industrialCoreLocalLogisticsAmountBonus'),
+                                      stackingPenalties=True
+                                      )
+
+        # Mining Burst Bonuses
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
+                                      'warfareBuff1Value',
+                                      src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'),
+                                      )
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
+                                      'warfareBuff2Value',
+                                      src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'),
+                                      )
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
+                                      'warfareBuff3Value',
+                                      src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'),
+                                      )
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'),
+                                      'warfareBuff4Value',
+                                      src.getModifiedItemAttr('industrialCoreBonusMiningBurstStrength'),
+                                      )
+
+        #  Command Burst Range Bonus
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'),
+                                      'maxRange',
+                                      src.getModifiedItemAttr('industrialCoreBonusCommandBurstRange'),
+                                      stackingPenalties=True
+                                      )
+
+        # Drone Bonuses
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Ice Harvesting Drone Operation'),
+                                     'duration',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneIceHarvesting'),
+                                     )
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneMining'),
+                                     )
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxVelocity',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneVelocity'),
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'),
+                                     stackingPenalties=True
+                                     )
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'),
+                                     )
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'),
+                                     )
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp',
+                                     src.getModifiedItemAttr('industrialCoreBonusDroneDamageHP'),
+                                     )
+
+        #  Todo: remote impedance (no reps, etc)
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
+        fit.ship.increaseItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
+        fit.ship.increaseItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
+
+
+class Effect4576(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'falloffBonus', ship.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect4577(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Tracking Computer',
+                                      'falloffBonus', ship.getModifiedItemAttr('eliteBonusLogistics2'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect4579(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Stasis Webifying Drone',
+                                     'speedFactor', module.getModifiedItemAttr('webSpeedFactorBonus'))
+
+
+class Effect4619(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4620(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4621(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusATF1'))
+
+
+class Effect4622(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4623(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4624(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusATC2'))
+
+
+class Effect4625(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusATC2'))
+
+
+class Effect4626(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect4635(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
+        for damageType in damageTypes:
+            fit.modules.filteredChargeBoost(
+                lambda mod: mod.charge.requiresSkill('Cruise Missiles') or mod.charge.requiresSkill('Torpedoes'),
+                '{0}Damage'.format(damageType), ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect4636(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Cruise Missiles') or mod.charge.requiresSkill('Torpedoes'),
+            'aoeVelocity', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect4637(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Cruise Missiles') or mod.charge.requiresSkill('Torpedoes'),
+            'maxVelocity', ship.getModifiedItemAttr('shipBonusCB3'), skill='Caldari Battleship')
+
+
+class Effect4640(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('Em', 'Explosive', 'Kinetic', 'Thermal')
+        for damageType in damageTypes:
+            fit.ship.boostItemAttr('armor{0}DamageResonance'.format(damageType), ship.getModifiedItemAttr('shipBonusAC2'),
+                                   skill='Amarr Cruiser')
+
+
+class Effect4643(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
+        for damageType in damageTypes:
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                            '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusAC'),
+                                            skill='Amarr Cruiser')
+
+
+class Effect4645(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        groups = ('Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault', 'Missile Launcher Heavy')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                      skill='Heavy Assault Cruisers')
+
+
+class Effect4648(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        sensorTypes = ('Gravimetric', 'Ladar', 'Magnetometric', 'Radar')
+        for type in sensorTypes:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'scan{0}StrengthBonus'.format(type),
+                                          ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+
+
+class Effect4649(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        affectedGroups = ('Missile Launcher Cruise', 'Missile Launcher Torpedo')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in affectedGroups,
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect4667(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusOreIndustrial1'),
+                                      skill='ORE Industrial')
+
+
+class Effect4668(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
+                                      'duration', ship.getModifiedItemAttr('shipBonusOreIndustrial1'),
+                                      skill='ORE Industrial')
+
+
+class Effect4669(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
+                                      'maxTractorVelocity', ship.getModifiedItemAttr('shipBonusOreIndustrial2'),
+                                      skill='ORE Industrial')
+
+
+class Effect4670(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Tractor Beam',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusOreIndustrial2'),
+                                      skill='ORE Industrial')
+
+
+class Effect4728(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        damages = ('em', 'thermal', 'kinetic', 'explosive')
+        for damage in damages:
+            # Nerf missile damage
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                            '{0}Damage'.format(damage),
+                                            beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+            # Nerf smartbomb damage
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Smart Bomb',
+                                          '{0}Damage'.format(damage),
+                                          beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+            # Nerf armor resistances
+            fit.ship.boostItemAttr('armor{0}DamageResonance'.format(damage.capitalize()),
+                                   beacon.getModifiedItemAttr('armor{0}DamageResistanceBonus'.format(damage.capitalize())))
+            # Nerf shield resistances
+            fit.ship.boostItemAttr('shield{0}DamageResonance'.format(damage.capitalize()),
+                                   beacon.getModifiedItemAttr('shield{0}DamageResistanceBonus'.format(damage.capitalize())))
+        # Nerf drone damage output
+        fit.drones.filteredItemBoost(lambda drone: True,
+                                     'damageMultiplier', beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+        # Nerf turret damage output
+        fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill('Gunnery'),
+                                      'damageMultiplier', beacon.getModifiedItemAttr('systemEffectDamageReduction'))
+
+
+class Effect4760(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion'),
+                               skill='Caldari Propulsion Systems')
+
+
+class Effect4775(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('shipBonus2AF'),
+                                      skill='Amarr Frigate')
+
+
+class Effect4782(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4789(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusATF1'))
+
+
+class Effect4793(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
+                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'))
+
+
+class Effect4794(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Light',
+                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'))
+
+
+class Effect4795(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
+                                      'speed', ship.getModifiedItemAttr('shipBonusATC1'))
+
+
+class Effect4799(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    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),
+                                          ship.getModifiedItemAttr('eliteBonusBlackOps1'), skill='Black Ops')
+
+
+class Effect4804(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill(skill), 'accessDifficultyBonus',
+                                         skill.getModifiedItemAttr('accessDifficultyBonusAbsolutePercent') * skill.level)
+
+
+class Effect4809(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanGravimetricStrengthBonus', module.getModifiedItemAttr('ecmStrengthBonusPercent'),
+                                      stackingPenalties=True)
+
+
+class Effect4810(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanLadarStrengthBonus', module.getModifiedItemAttr('ecmStrengthBonusPercent'),
+                                      stackingPenalties=True)
+
+
+class Effect4811(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanMagnetometricStrengthBonus',
+                                      module.getModifiedItemAttr('ecmStrengthBonusPercent'),
+                                      stackingPenalties=True)
+
+
+class Effect4812(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                      'scanRadarStrengthBonus', module.getModifiedItemAttr('ecmStrengthBonusPercent'),
+                                      stackingPenalties=True)
+
+
+class Effect4814(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'consumptionQuantity',
+                                      skill.getModifiedItemAttr('consumptionQuantityBonusPercent') * skill.level)
+
+
+class Effect4817(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Salvager',
+                                      'duration', implant.getModifiedItemAttr('durationBonus'))
+
+
+class Effect4820(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
+
+
+class Effect4821(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
+
+
+class Effect4822(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                         'power', ship.getModifiedItemAttr('bcLargeTurretPower'))
+
+
+class Effect4823(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
+
+
+class Effect4824(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
+
+
+class Effect4825(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                         'cpu', ship.getModifiedItemAttr('bcLargeTurretCPU'))
+
+
+class Effect4826(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                         'capacitorNeed', ship.getModifiedItemAttr('bcLargeTurretCap'))
+
+
+class Effect4827(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                         'capacitorNeed', ship.getModifiedItemAttr('bcLargeTurretCap'))
+
+
+class Effect4867(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'powerEngineeringOutputBonus',
+                                                 implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect4868(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'capacitorCapacityBonus',
+                                                 implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect4869(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'cpuOutputBonus2', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect4871(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'capRechargeBonus', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect4896(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4897(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4898(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect4901(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect4902(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('MWDSignatureRadiusBonus'))
+
+
+class Effect4906(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill('Fighters'),
+                                        'damageMultiplier', beacon.getModifiedItemAttr('damageMultiplierMultiplier'),
+                                        stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4911(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('shieldRechargeRate', module.getModifiedItemAttr('shieldRechargeRateMultiplier'))
+
+
+class Effect4921(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonusPercent'))
+
+
+class Effect4923(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'),
+                                      'duration', skill.getModifiedItemAttr('durationBonus') * skill.level)
+
+
+class Effect4928(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # pyfalog = Logger(__name__)
+
+        damagePattern = fit.damagePattern
+        # pyfalog.debug('==============================')
+
+        static_adaptive_behavior = eos.config.settings['useStaticAdaptiveArmorHardener']
+
+        if (damagePattern.emAmount == damagePattern.thermalAmount == damagePattern.kineticAmount == damagePattern.explosiveAmount) and static_adaptive_behavior:
+            # pyfalog.debug('Setting adaptivearmorhardener resists to uniform profile.')
+            for attr in ('armorEmDamageResonance', 'armorThermalDamageResonance', 'armorKineticDamageResonance', 'armorExplosiveDamageResonance'):
+                fit.ship.multiplyItemAttr(attr, module.getModifiedItemAttr(attr), stackingPenalties=True, penaltyGroup='preMul')
+            return
+
+        # Skip if there is no damage pattern. Example: projected ships or fleet boosters
+        if damagePattern:
+
+            # Populate a tuple with the damage profile modified by current armor resists.
+            baseDamageTaken = (
+                damagePattern.emAmount * fit.ship.getModifiedItemAttr('armorEmDamageResonance'),
+                damagePattern.thermalAmount * fit.ship.getModifiedItemAttr('armorThermalDamageResonance'),
+                damagePattern.kineticAmount * fit.ship.getModifiedItemAttr('armorKineticDamageResonance'),
+                damagePattern.explosiveAmount * fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'),
+            )
+            # pyfalog.debug('Damage Adjusted for Armor Resists: %f/%f/%f/%f' % (baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3]))
+
+            resistanceShiftAmount = module.getModifiedItemAttr(
+                'resistanceShiftAmount') / 100  # The attribute is in percent and we want a fraction
+            RAHResistance = [
+                module.getModifiedItemAttr('armorEmDamageResonance'),
+                module.getModifiedItemAttr('armorThermalDamageResonance'),
+                module.getModifiedItemAttr('armorKineticDamageResonance'),
+                module.getModifiedItemAttr('armorExplosiveDamageResonance'),
+            ]
+
+            # Simulate RAH cycles until the RAH either stops changing or enters a loop.
+            # The number of iterations is limited to prevent an infinite loop if something goes wrong.
+            cycleList = []
+            loopStart = -20
+            for num in range(50):
+                # pyfalog.debug('Starting cycle %d.' % num)
+                # The strange order is to emulate the ingame sorting when different types have taken the same amount of damage.
+                # This doesn't take into account stacking penalties. In a few cases fitting a Damage Control causes an inaccurate result.
+                damagePattern_tuples = [
+                    (0, baseDamageTaken[0] * RAHResistance[0], RAHResistance[0]),
+                    (3, baseDamageTaken[3] * RAHResistance[3], RAHResistance[3]),
+                    (2, baseDamageTaken[2] * RAHResistance[2], RAHResistance[2]),
+                    (1, baseDamageTaken[1] * RAHResistance[1], RAHResistance[1]),
+                ]
+
+                # Sort the tuple to drop the highest damage value to the bottom
+                sortedDamagePattern_tuples = sorted(damagePattern_tuples, key=lambda damagePattern: damagePattern[1])
+
+                if sortedDamagePattern_tuples[2][1] == 0:
+                    # One damage type: the top damage type takes from the other three
+                    # Since the resistances not taking damage will end up going to the type taking damage we just do the whole thing at once.
+                    change0 = 1 - sortedDamagePattern_tuples[0][2]
+                    change1 = 1 - sortedDamagePattern_tuples[1][2]
+                    change2 = 1 - sortedDamagePattern_tuples[2][2]
+                    change3 = -(change0 + change1 + change2)
+                elif sortedDamagePattern_tuples[1][1] == 0:
+                    # Two damage types: the top two damage types take from the other two
+                    # Since the resistances not taking damage will end up going equally to the types taking damage we just do the whole thing at once.
+                    change0 = 1 - sortedDamagePattern_tuples[0][2]
+                    change1 = 1 - sortedDamagePattern_tuples[1][2]
+                    change2 = -(change0 + change1) / 2
+                    change3 = -(change0 + change1) / 2
+                else:
+                    # Three or four damage types: the top two damage types take from the other two
+                    change0 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[0][2])
+                    change1 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[1][2])
+                    change2 = -(change0 + change1) / 2
+                    change3 = -(change0 + change1) / 2
+
+                RAHResistance[sortedDamagePattern_tuples[0][0]] = sortedDamagePattern_tuples[0][2] + change0
+                RAHResistance[sortedDamagePattern_tuples[1][0]] = sortedDamagePattern_tuples[1][2] + change1
+                RAHResistance[sortedDamagePattern_tuples[2][0]] = sortedDamagePattern_tuples[2][2] + change2
+                RAHResistance[sortedDamagePattern_tuples[3][0]] = sortedDamagePattern_tuples[3][2] + change3
+                # pyfalog.debug('Resistances shifted to %f/%f/%f/%f' % ( RAHResistance[0], RAHResistance[1], RAHResistance[2], RAHResistance[3]))
+
+                # See if the current RAH profile has been encountered before, indicating a loop.
+                for i, val in enumerate(cycleList):
+                    tolerance = 1e-06
+                    if abs(RAHResistance[0] - val[0]) <= tolerance and \
+                                abs(RAHResistance[1] - val[1]) <= tolerance and \
+                                abs(RAHResistance[2] - val[2]) <= tolerance and \
+                                abs(RAHResistance[3] - val[3]) <= tolerance:
+                        loopStart = i
+                        # pyfalog.debug('Loop found: %d-%d' % (loopStart, num))
+                        break
+                if loopStart >= 0:
+                    break
+
+                cycleList.append(list(RAHResistance))
+
+            # if loopStart < 0:
+                # pyfalog.error('Reactive Armor Hardener failed to find equilibrium. Damage profile after armor: {0}/{1}/{2}/{3}'.format(
+                #             baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3]))
+
+            # Average the profiles in the RAH loop, or the last 20 if it didn't find a loop.
+            loopCycles = cycleList[loopStart:]
+            numCycles = len(loopCycles)
+            average = [0, 0, 0, 0]
+            for cycle in loopCycles:
+                for i in range(4):
+                    average[i] += cycle[i]
+
+            for i in range(4):
+                average[i] = round(average[i] / numCycles, 3)
+
+            # Set the new resistances
+            # pyfalog.debug('Setting new resist profile: %f/%f/%f/%f' % ( average[0], average[1], average[2],average[3]))
+            for i, attr in enumerate((
+                    'armorEmDamageResonance', 'armorThermalDamageResonance', 'armorKineticDamageResonance',
+                    'armorExplosiveDamageResonance')):
+                module.increaseItemAttr(attr, average[i] - module.getModifiedItemAttr(attr))
+                fit.ship.multiplyItemAttr(attr, average[i], stackingPenalties=True, penaltyGroup='preMul')
+
+
+class Effect4934(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGF2'),
+                                      skill='Gallente Frigate')
+
+
+class Effect4936(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        amount = module.getModifiedItemAttr('shieldBonus')
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('shieldRepair', amount / speed)
+
+
+class Effect4941(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect4942(EffectDef):
+
+    type = 'active'
+
+
+class Effect4945(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Breaker',
+                                      'duration', skill.getModifiedItemAttr('durationBonus') * skill.level)
+
+
+class Effect4946(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Breaker',
+                                      'capacitorNeed', skill.getModifiedItemAttr('capNeedBonus') * skill.level)
+
+
+class Effect4950(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect4951(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Operation') or mod.item.requiresSkill('Capital Shield Operation'),
+            'shieldBonus', container.getModifiedItemAttr('shieldBoostMultiplier'))
+
+
+class Effect4961(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Shield Operation') or
+                                                     mod.item.requiresSkill('Capital Shield Operation'),
+                                         'shieldBonus', module.getModifiedItemAttr('shieldBonusMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect4967(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Operation') or mod.item.requiresSkill('Capital Shield Operation'),
+            'duration', module.getModifiedItemAttr('durationSkillBonus'))
+
+
+class Effect4970(EffectDef):
+
+    attr = 'boosterShieldBoostAmountPenalty'
+    displayName = 'Shield Boost'
+    type = 'boosterSideEffect'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'), 'shieldBonus',
+                                      src.getModifiedItemAttr('boosterShieldBoostAmountPenalty'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'), 'shieldBonus',
+                                      src.getModifiedItemAttr('boosterShieldBoostAmountPenalty'))
+
+
+class Effect4972(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Light',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect4973(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rocket',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect4974(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('eliteBonusViolators2'), skill='Marauders')
+
+
+class Effect4975(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusATF2'))
+
+
+class Effect4976(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Resistance Shift Hardener', 'duration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Resistance Phasing'), 'duration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect4989(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeCloudSize', implant.getModifiedItemAttr('aoeCloudSizeBonus'))
+
+
+class Effect4990(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('rookieSETCapBonus'))
+
+
+class Effect4991(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSETDamageBonus'))
+
+
+class Effect4994(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+
+
+class Effect4995(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+
+
+class Effect4996(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+
+
+class Effect4997(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('rookieArmorResistanceBonus'))
+
+
+class Effect4999(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('rookieSHTOptimalBonus'))
+
+
+class Effect5000(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('rookieMissileKinDamageBonus'))
+
+
+class Effect5008(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+
+
+class Effect5009(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+
+
+class Effect5011(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+
+
+class Effect5012(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('rookieShieldResistBonus'))
+
+
+class Effect5013(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSHTDamageBonus'))
+
+
+class Effect5014(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('rookieDroneBonus'))
+
+
+class Effect5015(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxTargetRangeBonus', ship.getModifiedItemAttr('rookieDampStrengthBonus'))
+
+
+class Effect5016(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'scanResolutionBonus', ship.getModifiedItemAttr('rookieDampStrengthBonus'))
+
+
+class Effect5017(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('rookieArmorRepBonus'))
+
+
+class Effect5018(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('maxVelocity', ship.getModifiedItemAttr('rookieShipVelocityBonus'))
+
+
+class Effect5019(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('rookieTargetPainterStrengthBonus'))
+
+
+class Effect5020(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('rookieSPTDamageBonus'))
+
+
+class Effect5021(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('rookieShieldBoostBonus'))
+
+
+class Effect5028(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('Gravimetric', 'Ladar', 'Radar', 'Magnetometric'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM',
+                                          'scan{0}StrengthBonus'.format(type),
+                                          ship.getModifiedItemAttr('rookieECMStrengthBonus'))
+
+
+class Effect5029(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount',
+                                     src.getModifiedItemAttr('roleBonusDroneMiningYield'),
+                                     )
+
+
+class Effect5030(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount', container.getModifiedItemAttr('rookieDroneBonus'))
+
+
+class Effect5035(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for type in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         type, ship.getModifiedItemAttr('rookieDroneBonus'))
+
+
+class Effect5036(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect5045(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect5048(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusGF'), skill='Amarr Frigate')
+
+
+class Effect5051(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Salvaging'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect5055(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                         'duration', ship.getModifiedItemAttr('iceHarvestCycleBonus'))
+
+
+class Effect5058(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Mining'),
+                                         'miningAmount', module.getModifiedItemAttr('miningAmountMultiplier'))
+
+
+class Effect5059(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'),
+                                      'duration', container.getModifiedItemAttr('shipBonusORE3'), skill='Mining Barge')
+
+
+class Effect5066(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Target Painting'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect5067(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('specialOreHoldCapacity', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
+
+
+class Effect5068(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldCapacity', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
+
+
+class Effect5069(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Mercoxit Processing'),
+                                        'specialisationAsteroidYieldMultiplier',
+                                        module.getModifiedItemAttr('miningAmountBonus'))
+
+
+class Effect5079(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5080(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect5081(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True)
+
+
+class Effect5087(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for layer in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         layer, ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5090(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect5103(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect5104(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5105(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect5106(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect5107(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5108(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusGF2'),
+                                      skill='Gallente Frigate')
+
+
+class Effect5109(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect5110(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect5111(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5119(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Scanner Probe',
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonus2AF'),
+                                        skill='Amarr Frigate')
+
+
+class Effect5121(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('energyTransferAmountBonus'))
+
+
+class Effect5122(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+
+
+class Effect5123(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5124(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect5125(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect5126(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5127(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect5128(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5129(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter',
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMC'),
+                                      skill='Minmatar Cruiser')
+
+
+class Effect5131(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'speed', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect5132(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect5133(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect5136(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5139(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'miningAmount', module.getModifiedItemAttr('shipBonusOREfrig1'),
+                                      skill='Mining Frigate')
+
+
+class Effect5142(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
+                                         'miningAmount', module.getModifiedItemAttr('miningAmountMultiplier'))
+
+
+class Effect5153(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5156(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Gas Cloud Harvester',
+                                      'duration', module.getModifiedItemAttr('shipBonusOREfrig2'), skill='Mining Frigate')
+
+
+class Effect5162(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Resistance Shift Hardener', 'capacitorNeed',
+                                      src.getModifiedItemAttr('capNeedBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Resistance Phasing'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('capNeedBonus') * lvl)
+
+
+class Effect5165(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxVelocity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5168(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.drones.filteredItemIncrease(lambda drone: drone.item.requiresSkill('Salvage Drone Operation'),
+                                        'accessDifficultyBonus',
+                                        container.getModifiedItemAttr('accessDifficultyBonus') * container.level)
+
+
+class Effect5180(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.ship.boostItemAttr('scanGravimetricStrength',
+                               container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+
+
+class Effect5181(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.ship.boostItemAttr('scanLadarStrength', container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+
+
+class Effect5182(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.ship.boostItemAttr('scanMagnetometricStrength',
+                               container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+
+
+class Effect5183(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.ship.boostItemAttr('scanRadarStrength', container.getModifiedItemAttr('sensorStrengthBonus') * container.level)
+
+
+class Effect5185(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('shipBonus2AF'),
+                                      skill='Amarr Frigate')
+
+
+class Effect5187(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Sensor Dampener',
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusGC'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect5188(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Hybrid Weapon',
+                                      'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect5189(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect5190(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Projectile Weapon',
+                                      'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect5201(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Armor Reinforcer',
+                                      'massAddition', container.getModifiedItemAttr('massPenaltyReduction') * level)
+
+
+class Effect5205(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSETTracking'))
+
+
+class Effect5206(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('rookieSETOptimal'))
+
+
+class Effect5207(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', ship.getModifiedItemAttr('rookieNosDrain'))
+
+
+class Effect5208(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', ship.getModifiedItemAttr('rookieNeutDrain'))
+
+
+class Effect5209(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'speedFactor', ship.getModifiedItemAttr('rookieWebAmount'))
+
+
+class Effect5212(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda mod: True,
+                                     'maxVelocity', ship.getModifiedItemAttr('rookieDroneMWDspeed'))
+
+
+class Effect5213(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'maxVelocity', ship.getModifiedItemAttr('rookieRocketVelocity'))
+
+
+class Effect5214(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('rookieLightMissileVelocity'))
+
+
+class Effect5215(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSHTTracking'))
+
+
+class Effect5216(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('rookieSHTFalloff'))
+
+
+class Effect5217(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('rookieSPTTracking'))
+
+
+class Effect5218(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('rookieSPTFalloff'))
+
+
+class Effect5219(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('rookieSPTOptimal'))
+
+
+class Effect5220(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5221(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5222(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5223(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5224(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5225(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5226(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5227(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5228(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5229(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', container.getModifiedItemAttr('shipBonusRole8'))
+
+
+class Effect5230(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for damageType in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('shield' + damageType.capitalize() + 'DamageResonance',
+                                   module.getModifiedItemAttr(damageType + 'DamageResistanceBonus'),
+                                   stackingPenalties=True)
+
+
+class Effect5231(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for damageType in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.ship.boostItemAttr('armor%sDamageResonance' % damageType.capitalize(),
+                                   module.getModifiedItemAttr('%sDamageResistanceBonus' % damageType),
+                                   stackingPenalties=True)
+
+
+class Effect5234(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'explosiveDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5237(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'kineticDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5240(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'thermalDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5243(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'emDamage', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5259(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cloaking Device',
+                                      'cpu', ship.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect5260(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'),
+                                      'cpu', ship.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+
+
+class Effect5261(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.increaseItemAttr('cpu', module.getModifiedItemAttr('covertCloakCPUAdd') or 0)
+
+
+class Effect5262(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Cloaking'),
+                                         'covertCloakCPUAdd', module.getModifiedItemAttr('covertCloakCPUPenalty'))
+
+
+class Effect5263(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Cynosural Field Theory'),
+                                         'covertCloakCPUAdd', module.getModifiedItemAttr('covertCloakCPUPenalty'))
+
+
+class Effect5264(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.increaseItemAttr('cpu', module.getModifiedItemAttr('warfareLinkCPUAdd') or 0)
+
+
+class Effect5265(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'),
+                                         'warfareLinkCPUAdd', module.getModifiedItemAttr('warfareLinkCPUPenalty'))
+
+
+class Effect5266(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cloaking Device',
+                                      'cpu', ship.getModifiedItemAttr('eliteIndustrialCovertCloakBonus'),
+                                      skill='Transport Ships')
+
+
+class Effect5267(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'power', module.getModifiedItemAttr('drawback'))
+
+
+class Effect5268(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
+                                      'power', module.getModifiedItemAttr('drawback'))
+
+
+class Effect5275(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if module.charge and module.charge.name == 'Nanite Repair Paste':
+            multiplier = 3
+        else:
+            multiplier = 1
+
+        amount = module.getModifiedItemAttr('armorDamageAmount') * multiplier
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        rps = amount / speed
+        fit.extraAttributes.increase('armorRepair', rps)
+        fit.extraAttributes.increase('armorRepairPreSpool', rps)
+        fit.extraAttributes.increase('armorRepairFullSpool', rps)
+
+
+class Effect5293(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect5294(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+
+
+class Effect5295(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect5300(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect5303(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+
+
+class Effect5304(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+
+
+class Effect5305(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCD1'),
+                                        skill='Caldari Destroyer')
+
+
+class Effect5306(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCD1'),
+                                        skill='Caldari Destroyer')
+
+
+class Effect5307(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+
+
+class Effect5308(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+
+
+class Effect5309(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+
+
+class Effect5310(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGD2'), skill='Gallente Destroyer')
+
+
+class Effect5311(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+
+
+class Effect5316(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+
+
+class Effect5317(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMD1'),
+                                      skill='Minmatar Destroyer')
+
+
+class Effect5318(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMD2'), skill='Minmatar Destroyer')
+
+
+class Effect5319(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusMD1'),
+                                        skill='Minmatar Destroyer')
+
+
+class Effect5320(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusMD1'),
+                                        skill='Minmatar Destroyer')
+
+
+class Effect5321(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('shipBonusMD2'),
+                                      skill='Minmatar Destroyer')
+
+
+class Effect5322(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
+                               skill='Amarr Battlecruiser')
+
+
+class Effect5323(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
+                               skill='Amarr Battlecruiser')
+
+
+class Effect5324(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
+                               skill='Amarr Battlecruiser')
+
+
+class Effect5325(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusABC1'),
+                               skill='Amarr Battlecruiser')
+
+
+class Effect5326(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusABC2'),
+                                     skill='Amarr Battlecruiser')
+
+
+class Effect5331(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for layer in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         layer, ship.getModifiedItemAttr('shipBonusABC2'), skill='Amarr Battlecruiser')
+
+
+class Effect5332(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusABC1'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5333(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusABC2'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5334(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCBC1'), skill='Caldari Battlecruiser')
+
+
+class Effect5335(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
+                               skill='Caldari Battlecruiser')
+
+
+class Effect5336(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
+                               skill='Caldari Battlecruiser')
+
+
+class Effect5337(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
+                               skill='Caldari Battlecruiser')
+
+
+class Effect5338(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', ship.getModifiedItemAttr('shipBonusCBC2'),
+                               skill='Caldari Battlecruiser')
+
+
+class Effect5339(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCBC1'),
+                                        skill='Caldari Battlecruiser')
+
+
+class Effect5340(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCBC1'),
+                                        skill='Caldari Battlecruiser')
+
+
+class Effect5341(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGBC1'),
+                                      skill='Gallente Battlecruiser')
+
+
+class Effect5342(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGBC2'),
+                                      skill='Gallente Battlecruiser')
+
+
+class Effect5343(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGBC1'),
+                                     skill='Gallente Battlecruiser')
+
+
+class Effect5348(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for layer in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                         layer, ship.getModifiedItemAttr('shipBonusGBC1'), skill='Gallente Battlecruiser')
+
+
+class Effect5349(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+
+
+class Effect5350(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+
+
+class Effect5351(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMBC1'),
+                                      skill='Minmatar Battlecruiser')
+
+
+class Effect5352(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMBC1'),
+                                      skill='Minmatar Battlecruiser')
+
+
+class Effect5353(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+
+
+class Effect5354(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusABC1'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5355(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusABC2'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5356(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusCBC1'), skill='Caldari Battlecruiser')
+
+
+class Effect5357(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCBC2'),
+                                      skill='Caldari Battlecruiser')
+
+
+class Effect5358(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGBC1'),
+                                      skill='Gallente Battlecruiser')
+
+
+class Effect5359(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusGBC2'),
+                                      skill='Gallente Battlecruiser')
+
+
+class Effect5360(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusMBC1'), skill='Minmatar Battlecruiser')
+
+
+class Effect5361(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMBC2'), skill='Minmatar Battlecruiser')
+
+
+class Effect5364(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, booster, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Capital Repair Systems'),
+            'armorDamageAmount', booster.getModifiedItemAttr('armorDamageAmountBonus') or 0)
+
+
+class Effect5365(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('eliteBonusViolators2'),
+                                      skill='Marauders')
+
+
+class Effect5366(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusATC2'))
+
+
+class Effect5367(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGB2'),
+                                      skill='Gallente Battleship')
+
+
+class Effect5378(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCBC1'),
+                                        skill='Caldari Battlecruiser')
+
+
+class Effect5379(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCBC1'),
+                                        skill='Caldari Battlecruiser')
+
+
+class Effect5380(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGBC2'),
+                                      skill='Gallente Battlecruiser')
+
+
+class Effect5381(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusABC1'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5382(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect5383(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect5384(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect5385(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect5386(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5387(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5388(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5389(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5390(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxVelocity', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5397(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseMaxScanDeviation',
+                                        module.getModifiedItemAttr('maxScanDeviationModifierModule'),
+                                        stackingPenalties=True)
+
+
+class Effect5398(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'),
+                                      'duration', module.getModifiedItemAttr('scanDurationBonus'))
+
+
+class Effect5399(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', module.getModifiedItemAttr('scanStrengthBonusModule'),
+                                        stackingPenalties=True)
+
+
+class Effect5402(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusABC2'),
+                                        skill='Amarr Battlecruiser')
+
+
+class Effect5403(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusABC2'),
+                                        skill='Amarr Battlecruiser')
+
+
+class Effect5410(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusABC2'),
+                                      skill='Amarr Battlecruiser')
+
+
+class Effect5411(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+
+
+class Effect5417(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5418(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5419(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5420(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5424(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect5427(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect5428(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxRange', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect5429(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusMB2'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5430(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('shipBonusMB2'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5431(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5433(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Hacking'),
+                                         'virusCoherence', container.getModifiedItemAttr('virusCoherenceBonus') * level)
+
+
+class Effect5437(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Archaeology'),
+                                         'virusCoherence', container.getModifiedItemAttr('virusCoherenceBonus') * level)
+
+
+class Effect5440(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                           'kineticDamage', beacon.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5444(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5445(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5456(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise',
+                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5457(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
+                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5459(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Hacking'), 'virusStrength', src.getModifiedItemAttr('virusStrengthBonus'))
+
+
+class Effect5460(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemIncrease(
+            lambda mod: (mod.item.requiresSkill('Hacking') or mod.item.requiresSkill('Archaeology')),
+            'virusStrength', container.getModifiedItemAttr('virusStrengthBonus') * level)
+
+
+class Effect5461(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('shieldRechargeRate', module.getModifiedItemAttr('rechargeratebonus') or 0)
+
+
+class Effect5468(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusCI2'), skill='Caldari Industrial')
+
+
+class Effect5469(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusMI2'), skill='Minmatar Industrial')
+
+
+class Effect5470(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusGI2'), skill='Gallente Industrial')
+
+
+class Effect5471(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('shipBonusAI2'), skill='Amarr Industrial')
+
+
+class Effect5476(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('specialOreHoldCapacity', ship.getModifiedItemAttr('shipBonusGI2'),
+                               skill='Gallente Industrial')
+
+
+class Effect5477(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('specialAmmoHoldCapacity', ship.getModifiedItemAttr('shipBonusMI2'),
+                               skill='Minmatar Industrial')
+
+
+class Effect5478(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('specialPlanetaryCommoditiesHoldCapacity', ship.getModifiedItemAttr('shipBonusGI2'),
+                               skill='Gallente Industrial')
+
+
+class Effect5479(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('specialMineralHoldCapacity', ship.getModifiedItemAttr('shipBonusGI2'),
+                               skill='Gallente Industrial')
+
+
+class Effect5480(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'implantBonusVelocity', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect5482(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'agilityBonus', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect5483(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'shieldCapacityBonus', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect5484(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Special Edition Implant',
+                                                 'armorHpBonus2', implant.getModifiedItemAttr('implantSetChristmas'))
+
+
+class Effect5485(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect5486(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusMBC2'),
+                                      skill='Minmatar Battlecruiser')
+
+
+class Effect5496(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy Assault',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+
+
+class Effect5497(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Heavy',
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+
+
+class Effect5498(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'aoeVelocity', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                        skill='Command Ships')
+
+
+class Effect5499(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                        skill='Command Ships')
+
+
+class Effect5500(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'aoeCloudSize', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                        skill='Command Ships')
+
+
+class Effect5501(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                      skill='Command Ships')
+
+
+class Effect5502(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('eliteBonusCommandShips1'),
+                                      skill='Command Ships')
+
+
+class Effect5503(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                     skill='Command Ships')
+
+
+class Effect5504(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'maxVelocity', ship.getModifiedItemAttr('eliteBonusCommandShips2'),
+                                     skill='Command Ships')
+
+
+class Effect5505(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'speed', ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships')
+
+
+class Effect5514(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
+        for damageType in damageTypes:
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                            '{0}Damage'.format(damageType),
+                                            ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+
+
+class Effect5521(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
+        for damageType in damageTypes:
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                            '{0}Damage'.format(damageType),
+                                            ship.getModifiedItemAttr('eliteBonusCommandShips2'), skill='Command Ships')
+
+
+class Effect5539(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5540(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5541(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5542(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect5552(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                        skill='Heavy Assault Cruisers')
+
+
+class Effect5553(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'maxVelocity', ship.getModifiedItemAttr('eliteBonusHeavyGunship1'),
+                                        skill='Heavy Assault Cruisers')
+
+
+class Effect5554(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGC2'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect5555(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'maxVelocity', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5556(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5557(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                     skill='Heavy Assault Cruisers')
+
+
+class Effect5558(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'trackingSpeed', ship.getModifiedItemAttr('eliteBonusHeavyGunship2'),
+                                     skill='Heavy Assault Cruisers')
+
+
+class Effect5559(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect5560(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Micro Jump Drive',
+                                      'moduleReactivationDelay', ship.getModifiedItemAttr('roleBonusMarauder'))
+
+
+class Effect5564(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusCaldariOffensive'), skill='Caldari Offensive Systems')
+
+
+class Effect5568(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusGallenteOffensive'), skill='Gallente Offensive Systems')
+
+
+class Effect5570(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'),
+                                      'war'
+                                      'fareBuff1Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'buffDuration', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive'), skill='Minmatar Offensive Systems')
+
+
+class Effect5572(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+
+
+class Effect5573(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+
+
+class Effect5574(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+
+
+class Effect5575(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandShips3'), skill='Command Ships')
+
+
+class Effect5607(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'),
+                                      'capacitorNeed', container.getModifiedItemAttr('capNeedBonus') * level)
+
+
+class Effect5610(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect5611(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusGB2'), skill='Gallente Battleship')
+
+
+class Effect5618(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy',
+                                      'speed', ship.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect5619(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy',
+                                      'speed', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5620(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy',
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5621(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise',
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5622(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
+                                      'speed', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5628(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5629(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5630(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5631(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5632(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5633(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5634(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5635(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5636(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusMB'), skill='Minmatar Battleship')
+
+
+class Effect5637(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5638(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5639(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusMB'),
+                                        skill='Minmatar Battleship')
+
+
+class Effect5644(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5647(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'),
+                                      'cpu', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5650(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('Em', 'Explosive', 'Kinetic', 'Thermal')
+        for damageType in damageTypes:
+            fit.ship.boostItemAttr('armor{0}DamageResonance'.format(damageType), ship.getModifiedItemAttr('shipBonusAF'),
+                                   skill='Amarr Frigate')
+
+
+class Effect5657(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        damageTypes = ('Em', 'Explosive', 'Kinetic', 'Thermal')
+        for damageType in damageTypes:
+            fit.ship.boostItemAttr('shield{0}DamageResonance'.format(damageType),
+                                   ship.getModifiedItemAttr('eliteBonusInterceptor2'), skill='Interceptors')
+
+
+class Effect5673(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusInterceptor2'),
+                                      skill='Interceptors')
+
+
+class Effect5676(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCD2'), skill='Caldari Destroyer')
+
+
+class Effect5688(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', ship.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+
+
+class Effect5695(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('Em', 'Thermal', 'Explosive', 'Kinetic'):
+            fit.ship.boostItemAttr('armor%sDamageResonance' % damageType,
+                                   ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+
+
+class Effect5717(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, implant, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == 'Cyberimplant',
+                                                 'WarpSBonus', implant.getModifiedItemAttr('implantSetWarpSpeed'))
+
+
+class Effect5721(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5722(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGD1'), skill='Gallente Destroyer')
+
+
+class Effect5723(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'signatureRadiusBonus', ship.getModifiedItemAttr('eliteBonusInterdictors2'),
+                                      skill='Interdictors')
+
+
+class Effect5724(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5725(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5726(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5733(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect5734(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'kineticDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect5735(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect5736(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'thermalDamage', ship.getModifiedItemAttr('eliteBonusViolatorsRole1'))
+
+
+class Effect5737(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5738(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole8'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'falloffEffectiveness', ship.getModifiedItemAttr('shipBonusRole8'))
+
+
+class Effect5754(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxRangeBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+        module.boostItemAttr('falloffBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+        module.boostItemAttr('trackingSpeedBonus', module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+
+
+class Effect5757(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxTargetRangeBonus', module.getModifiedItemAttr('overloadSensorModuleStrengthBonus'))
+        module.boostItemAttr('scanResolutionBonus', module.getModifiedItemAttr('overloadSensorModuleStrengthBonus'),
+                             stackingPenalties=True)
+
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            module.boostItemAttr(
+                'scan{}StrengthPercent'.format(scanType),
+                module.getModifiedItemAttr('overloadSensorModuleStrengthBonus'),
+                stackingPenalties=True
+            )
+
+
+class Effect5758(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('signatureRadiusBonus', module.getModifiedItemAttr('overloadPainterStrengthBonus') or 0)
+
+
+class Effect5769(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone',
+                                     'structureDamageAmount', container.getModifiedItemAttr('damageHP') * level)
+
+
+class Effect5778(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect5779(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'falloff', ship.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect5793(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        for attr in ('maxRangeBonus', 'falloffBonus'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
+                                          attr, container.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+
+
+class Effect5802(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect5803(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5804(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5805(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5806(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5807(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5808(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5809(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5810(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5811(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusGB2'),
+                                        skill='Gallente Battleship')
+
+
+class Effect5812(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusGB2'),
+                                        skill='Gallente Battleship')
+
+
+class Effect5813(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5814(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5815(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect5816(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5817(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5818(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5819(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5820(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'speedFactor', module.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect5821(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5822(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5823(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5824(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect5825(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect5826(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect5827(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate')
+
+
+class Effect5829(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'duration', ship.getModifiedItemAttr('shipBonusORE3'), skill='Mining Barge')
+
+
+class Effect5832(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Mining') or mod.item.requiresSkill('Ice Harvesting'),
+            'maxRange', ship.getModifiedItemAttr('shipBonusORE2'), skill='Mining Barge')
+
+
+class Effect5839(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
+            fit.ship.boostItemAttr('shield{}DamageResonance'.format(damageType.capitalize()),
+                                   ship.getModifiedItemAttr('eliteBonusBarge1'), skill='Exhumers')
+
+
+class Effect5840(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'duration', ship.getModifiedItemAttr('eliteBonusBarge2'), skill='Exhumers')
+
+
+class Effect5852(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'),
+                                      'miningAmount', module.getModifiedItemAttr('eliteBonusExpedition1'),
+                                      skill='Expedition Frigates')
+
+
+class Effect5853(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('signatureRadius', ship.getModifiedItemAttr('eliteBonusExpedition2'),
+                               skill='Expedition Frigates')
+
+
+class Effect5862(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'emDamage', ship.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect5863(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'kineticDamage', ship.getModifiedItemAttr('shipBonusCB'),
+                                        skill='Caldari Battleship')
+
+
+class Effect5864(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'thermalDamage', ship.getModifiedItemAttr('shipBonusCB'),
+                                        skill='Caldari Battleship')
+
+
+class Effect5865(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', ship.getModifiedItemAttr('shipBonusCB'),
+                                        skill='Caldari Battleship')
+
+
+class Effect5866(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler',
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusGB'), skill='Gallente Battleship')
+
+
+class Effect5867(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosionDelay', ship.getModifiedItemAttr('shipBonusRole8'))
+
+
+class Effect5868(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('capacity', module.getModifiedItemAttr('drawback'))
+
+
+class Effect5869(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', ship.getModifiedItemAttr('eliteBonusIndustrial1'),
+                               skill='Transport Ships')
+
+
+class Effect5870(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusCI2'), skill='Caldari Industrial')
+
+
+class Effect5871(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', ship.getModifiedItemAttr('shipBonusMI2'), skill='Minmatar Industrial')
+
+
+class Effect5872(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusAI2'),
+                                      skill='Amarr Industrial')
+
+
+class Effect5873(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGI2'),
+                                      skill='Gallente Industrial')
+
+
+class Effect5874(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('fleetHangarCapacity', ship.getModifiedItemAttr('eliteBonusIndustrial1'),
+                               skill='Transport Ships')
+
+
+class Effect5881(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
+            fit.ship.boostItemAttr('shield{}DamageResonance'.format(damageType.capitalize()),
+                                   ship.getModifiedItemAttr('eliteBonusIndustrial2'), skill='Transport Ships')
+
+
+class Effect5888(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
+            fit.ship.boostItemAttr('armor{}DamageResonance'.format(damageType.capitalize()),
+                                   ship.getModifiedItemAttr('eliteBonusIndustrial2'), skill='Transport Ships')
+
+
+class Effect5889(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'),
+                                      'overloadSpeedFactorBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5890(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'overloadSpeedFactorBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5891(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'),
+                                      'overloadHardeningBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5892(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'),
+                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5893(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Tactical Shield Manipulation'),
+                                      'overloadHardeningBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5896(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'overloadShieldBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5899(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadArmorDamageAmount', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'))
+
+
+class Effect5900(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('warpSpeedMultiplier', module.getModifiedItemAttr('warpSpeedAdd'))
+
+
+class Effect5901(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Reinforced Bulkhead',
+                                      'cpu', ship.getModifiedItemAttr('cpuNeedBonus'))
+
+
+class Effect5911(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('jumpDriveConsumptionAmount',
+                               module.getModifiedItemAttr('consumptionQuantityBonusPercentage'), stackingPenalties=True)
+
+
+class Effect5912(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                         'powerTransferAmount', beacon.getModifiedItemAttr('energyTransferAmountBonus'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5913(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.multiplyItemAttr('armorHP', beacon.getModifiedItemAttr('armorHPMultiplier'))
+
+
+class Effect5914(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                         'energyNeutralizerAmount',
+                                         beacon.getModifiedItemAttr('energyWarfareStrengthMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5915(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                         'powerTransferAmount',
+                                         beacon.getModifiedItemAttr('energyWarfareStrengthMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5916(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'explosiveDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5917(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'kineticDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5918(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'thermalDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5919(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'emDamage', beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5920(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                           'aoeCloudSize', beacon.getModifiedItemAttr('aoeCloudSizeMultiplier'))
+
+
+class Effect5921(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Target Painting'),
+                                         'signatureRadiusBonus',
+                                         beacon.getModifiedItemAttr('targetPainterStrengthMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5922(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Stasis Web',
+                                         'speedFactor', beacon.getModifiedItemAttr('stasisWebStrengthMultiplier'),
+                                         stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5923(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'energyNeutralizerAmount',
+                                           beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5924(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'scanGravimetricStrengthBonus',
+                                           beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5925(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'scanLadarStrengthBonus',
+                                           beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5926(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'scanMagnetometricStrengthBonus',
+                                           beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5927(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Bomb Deployment'),
+                                           'scanRadarStrengthBonus',
+                                           beacon.getModifiedItemAttr('smartbombDamageMultiplier'),
+                                           stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5929(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.drones.filteredItemMultiply(lambda drone: True,
+                                        'trackingSpeed', beacon.getModifiedItemAttr('trackingSpeedMultiplier'),
+                                        stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect5934(EffectDef):
+
+    runTime = 'early'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' not in context:
+            return
+
+        fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+
+        # this is such a dirty hack
+        for mod in fit.modules:
+            if not mod.isEmpty and mod.state > FittingModuleState.ONLINE and (
+                    mod.item.requiresSkill('Micro Jump Drive Operation') or
+                    mod.item.requiresSkill('High Speed Maneuvering')
+            ):
+                mod.state = FittingModuleState.ONLINE
+            if not mod.isEmpty and mod.item.requiresSkill('Micro Jump Drive Operation') and mod.state > FittingModuleState.ONLINE:
+                mod.state = FittingModuleState.ONLINE
+
+
+class Effect5938(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+            'aoeCloudSize', ship.getModifiedItemAttr('shipBonusCF2'), skill='Caldari Frigate')
+
+
+class Effect5939(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rocket',
+                                      'speed', ship.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect5940(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'speed', ship.getModifiedItemAttr('eliteBonusInterdictors1'), skill='Interdictors')
+
+
+class Effect5944(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect5945(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set flag which is used to determine if ship is cloaked or not
+        # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
+        # Doesn't apply to covops cloaks
+        fit.extraAttributes['cloaked'] = True
+        # Apply speed penalty
+        fit.ship.multiplyItemAttr('maxVelocity', module.getModifiedItemAttr('maxVelocityModifier'))
+
+
+class Effect5951(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', module.getModifiedItemAttr('drawback'), stackingPenalties=True)
+
+
+class Effect5956(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect5957(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                      skill='Heavy Interdiction Cruisers')
+
+
+class Effect5958(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect5959(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusHeavyInterdictors1'),
+                                      skill='Heavy Interdiction Cruisers')
+
+
+class Effect5994(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
+            tgtAttr = '{}DamageResonance'.format(dmgType)
+            fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr('resistanceKillerHull'))
+
+
+class Effect5995(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for layer in ('armor', 'shield'):
+            for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
+                tgtAttr = '{}{}DamageResonance'.format(layer, dmgType.capitalize())
+                fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr('resistanceKiller'))
+
+
+class Effect5998(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        # todo: stacking?
+        fit.ship.boostItemAttr('agility', ship.getModifiedItemAttr('freighterBonusO2'), skill='ORE Freighter',
+                               stackingPenalties=True)
+
+
+class Effect6001(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('shipMaintenanceBayCapacity', ship.getModifiedItemAttr('freighterBonusO1'),
+                               skill='ORE Freighter')
+
+
+class Effect6006(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusTacticalDestroyerAmarr1'),
+                                      skill='Amarr Tactical Destroyer')
+
+
+class Effect6007(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerAmarr2'),
+                                      skill='Amarr Tactical Destroyer')
+
+
+class Effect6008(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusTacticalDestroyerAmarr3'),
+                                      skill='Amarr Tactical Destroyer')
+
+
+class Effect6009(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Astrometrics'), 'cpu', src.getModifiedItemAttr('roleBonusT3ProbeCPU'))
+
+
+class Effect6010(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr(
+            'maxTargetRange',
+            1 / module.getModifiedItemAttr('modeMaxTargetRangePostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6011(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+            'maxRange',
+            1 / module.getModifiedItemAttr('modeMaxRangePostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6012(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            fit.ship.multiplyItemAttr(
+                'scan{}Strength'.format(scanType),
+                1 / (module.getModifiedItemAttr('mode{}StrengthPostDiv'.format(scanType)) or 1),
+                stackingPenalties=True,
+                penaltyGroup='postDiv'
+            )
+
+
+class Effect6014(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('signatureRadius', 1 / module.getModifiedItemAttr('modeSignatureRadiusPostDiv'),
+                                  stackingPenalties=True, penaltyGroup='postDiv')
+
+
+class Effect6015(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for srcResType, tgtResType in (
+                ('Em', 'Em'),
+                ('Explosive', 'Explosive'),
+                ('Kinetic', 'Kinetic'),
+                ('Thermic', 'Thermal')
+        ):
+            fit.ship.multiplyItemAttr(
+                'armor{0}DamageResonance'.format(tgtResType),
+                1 / module.getModifiedItemAttr('mode{0}ResistancePostDiv'.format(srcResType)),
+                stackingPenalties=True,
+                penaltyGroup='postDiv'
+            )
+
+
+class Effect6016(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr(
+            'agility',
+            1 / module.getModifiedItemAttr('modeAgilityPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6017(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr(
+            'maxVelocity',
+            1 / module.getModifiedItemAttr('modeVelocityPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6020(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6021(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6025(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect6027(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('eliteBonusReconShip1'),
+                                      skill='Recon Ships')
+
+
+class Effect6032(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter',
+                                      'power', ship.getModifiedItemAttr('powerTransferPowerNeedBonus'))
+
+
+class Effect6036(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusTacticalDestroyerMinmatar3'),
+                                      skill='Minmatar Tactical Destroyer')
+
+
+class Effect6037(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusTacticalDestroyerMinmatar1'),
+                                      skill='Minmatar Tactical Destroyer')
+
+
+class Effect6038(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusTacticalDestroyerMinmatar2'),
+                                      skill='Minmatar Tactical Destroyer')
+
+
+class Effect6039(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+            'trackingSpeed',
+            1 / module.getModifiedItemAttr('modeTrackingPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6040(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+            'signatureRadiusBonus',
+            1 / module.getModifiedItemAttr('modeMWDSigPenaltyPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6041(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for srcResType, tgtResType in (
+                ('Em', 'Em'),
+                ('Explosive', 'Explosive'),
+                ('Kinetic', 'Kinetic'),
+                ('Thermic', 'Thermal')
+        ):
+            fit.ship.multiplyItemAttr(
+                'shield{0}DamageResonance'.format(tgtResType),
+                1 / module.getModifiedItemAttr('mode{0}ResistancePostDiv'.format(srcResType)),
+                stackingPenalties=True,
+                penaltyGroup='postDiv'
+            )
+
+
+class Effect6045(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+
+
+class Effect6046(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+
+
+class Effect6047(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+
+
+class Effect6048(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Sentry Drone Interfacing'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser')
+
+
+class Effect6051(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6052(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6053(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'damageMultiplier', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6054(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6055(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6056(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Heavy Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6057(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6058(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6059(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Medium Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6060(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'hp', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6061(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'armorHP', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6062(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Light Drone Operation'),
+                                     'shieldCapacity', ship.getModifiedItemAttr('shipBonusGC2'), skill='Gallente Cruiser')
+
+
+class Effect6063(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.forceItemAttr('disallowAssistance', module.getModifiedItemAttr('disallowAssistance'))
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            fit.ship.boostItemAttr(
+                'scan{}Strength'.format(scanType),
+                module.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
+                stackingPenalties=True
+            )
+
+
+class Effect6076(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeMultiply(
+            lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+            'maxVelocity',
+            1 / module.getModifiedItemAttr('modeMaxRangePostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6077(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusTacticalDestroyerCaldari3'),
+                                      skill='Caldari Tactical Destroyer')
+
+
+class Effect6083(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
+            fit.modules.filteredChargeBoost(
+                lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+                '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect6085(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerCaldari1'),
+                                      skill='Caldari Tactical Destroyer')
+
+
+class Effect6088(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                            '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusMC2'),
+                                            skill='Minmatar Cruiser')
+
+
+class Effect6093(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                            '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusMC2'),
+                                            skill='Minmatar Cruiser')
+
+
+class Effect6096(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        for damageType in ('em', 'explosive', 'kinetic', 'thermal'):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                            '{0}Damage'.format(damageType), ship.getModifiedItemAttr('shipBonusMC2'),
+                                            skill='Minmatar Cruiser')
+
+
+class Effect6098(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'),
+                                      'reloadTime', ship.getModifiedItemAttr('shipBonusTacticalDestroyerCaldari2'),
+                                      skill='Caldari Tactical Destroyer')
+
+
+class Effect6104(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Infomorph Psychology'),
+                                         'duration', ship.getModifiedItemAttr('entosisDurationMultiplier') or 1)
+
+
+class Effect6110(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', module.getModifiedItemAttr('missileVelocityBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6111(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosionDelay', module.getModifiedItemAttr('explosionDelayBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6112(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeCloudSize', module.getModifiedItemAttr('aoeCloudSizeBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6113(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'aoeVelocity', module.getModifiedItemAttr('aoeVelocityBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6128(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('aoeCloudSizeBonus', module.getModifiedChargeAttr('aoeCloudSizeBonusBonus'))
+
+
+class Effect6129(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('aoeVelocityBonus', module.getModifiedChargeAttr('aoeVelocityBonusBonus'))
+
+
+class Effect6130(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('missileVelocityBonus', module.getModifiedChargeAttr('missileVelocityBonusBonus'))
+
+
+class Effect6131(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('explosionDelayBonus', module.getModifiedChargeAttr('explosionDelayBonusBonus'))
+
+
+class Effect6135(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, container, context):
+        for srcAttr, tgtAttr in (
+                ('aoeCloudSizeBonus', 'aoeCloudSize'),
+                ('aoeVelocityBonus', 'aoeVelocity'),
+                ('missileVelocityBonus', 'maxVelocity'),
+                ('explosionDelayBonus', 'explosionDelay'),
+        ):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                            tgtAttr, container.getModifiedItemAttr(srcAttr),
+                                            stackingPenalties=True)
+
+
+class Effect6144(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for tgtAttr in (
+                'aoeCloudSizeBonus',
+                'explosionDelayBonus',
+                'missileVelocityBonus',
+                'maxVelocityModifier',
+                'aoeVelocityBonus'
+        ):
+            module.boostItemAttr(tgtAttr, module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+
+
+class Effect6148(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'heatDamage',
+                                      ship.getModifiedItemAttr('shipBonusTacticalDestroyerGallente3'),
+                                      skill='Gallente Tactical Destroyer')
+
+
+class Effect6149(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerGallente1'),
+                                      skill='Gallente Tactical Destroyer')
+
+
+class Effect6150(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusTacticalDestroyerGallente2'),
+                                      skill='Gallente Tactical Destroyer')
+
+
+class Effect6151(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for srcResType, tgtResType in (
+                ('Em', 'em'),
+                ('Explosive', 'explosive'),
+                ('Kinetic', 'kinetic'),
+                ('Thermic', 'thermal')
+        ):
+            fit.ship.multiplyItemAttr(
+                '{0}DamageResonance'.format(tgtResType),
+                1 / module.getModifiedItemAttr('mode{0}ResistancePostDiv'.format(srcResType))
+            )
+
+
+class Effect6152(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+            'maxRange',
+            1 / module.getModifiedItemAttr('modeMaxRangePostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6153(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+            'capacitorNeed',
+            1 / module.getModifiedItemAttr('modeMWDCapPostDiv')
+        )
+
+
+class Effect6154(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('High Speed Maneuvering'),
+            'speedFactor',
+            1 / module.getModifiedItemAttr('modeMWDVelocityPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6155(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Repair Systems'),
+            'duration',
+            1 / module.getModifiedItemAttr('modeArmorRepDurationPostDiv')
+        )
+
+
+class Effect6163(EffectDef):
+
+    runtime = 'late'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.extraAttributes['speedLimit'] = src.getModifiedItemAttr('speedLimit')
+
+
+class Effect6164(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, beacon, context):
+        fit.ship.boostItemAttr('maxVelocity', beacon.getModifiedItemAttr('maxVelocityMultiplier'), stackingPenalties=True)
+
+
+class Effect6166(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
+                                      'speedFactorBonus', ship.getModifiedItemAttr('shipBonusAT'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
+                                      'speedBoostFactorBonus', ship.getModifiedItemAttr('shipBonusAT'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Propulsion Jamming'),
+                                      'massBonusPercentage', ship.getModifiedItemAttr('shipBonusAT'))
+
+
+class Effect6170(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Infomorph Psychology'),
+                                         'entosisCPUAdd', ship.getModifiedItemAttr('entosisCPUPenalty'))
+
+
+class Effect6171(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.increaseItemAttr('cpu', module.getModifiedItemAttr('entosisCPUAdd'))
+
+
+class Effect6172(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    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'))
+
+
+class Effect6173(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    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'))
+
+
+class Effect6174(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    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'))
+
+
+class Effect6175(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'maxVelocity', skill.getModifiedItemAttr('roleBonusCBC'))
+
+
+class Effect6176(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'maxVelocity', ship.getModifiedItemAttr('roleBonusCBC'))
+
+
+class Effect6177(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusCBC2'),
+                                      skill='Caldari Battlecruiser')
+
+
+class Effect6178(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusMBC2'),
+                                      skill='Minmatar Battlecruiser')
+
+
+class Effect6184(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        if 'projected' in context:
+            amount = src.getModifiedItemAttr('powerTransferAmount')
+            duration = src.getModifiedItemAttr('duration')
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.addDrain(src, duration, -amount, 0)
+
+
+class Effect6185(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' not in context:
+            return
+        bonus = module.getModifiedItemAttr('structureDamageAmount')
+        duration = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('hullRepair', bonus / duration)
+
+
+class Effect6186(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, **kwargs):
+        if 'projected' in context:
+            bonus = container.getModifiedItemAttr('shieldBonus')
+            duration = container.getModifiedItemAttr('duration') / 1000.0
+            fit.extraAttributes.increase('shieldRepair', bonus / duration, **kwargs)
+
+
+class Effect6187(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        if 'projected' in context and ((hasattr(src, 'state') and src.state >= FittingModuleState.ACTIVE) or
+                                       hasattr(src, 'amountActive')):
+            amount = src.getModifiedItemAttr('energyNeutralizerAmount')
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            time = src.getModifiedItemAttr('duration')
+
+            fit.addDrain(src, time, amount, 0)
+
+
+class Effect6188(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, **kwargs):
+        if 'projected' in context:
+            bonus = container.getModifiedItemAttr('armorDamageAmount')
+            duration = container.getModifiedItemAttr('duration') / 1000.0
+            rps = bonus / duration
+            fit.extraAttributes.increase('armorRepair', rps)
+            fit.extraAttributes.increase('armorRepairPreSpool', rps)
+            fit.extraAttributes.increase('armorRepairFullSpool', rps)
+
+
+class Effect6195(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
+                               skill='Expedition Frigates')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
+                               skill='Expedition Frigates')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
+                               skill='Expedition Frigates')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('eliteBonusExpedition1'),
+                               skill='Expedition Frigates')
+
+
+class Effect6196(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'duration',
+                                      src.getModifiedItemAttr('eliteBonusExpedition2'), skill='Expedition Frigates')
+
+
+class Effect6197(EffectDef):
+
+    runTime = 'late'
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        amount = src.getModifiedItemAttr('powerTransferAmount')
+        time = src.getModifiedItemAttr('duration')
+
+        if 'effect' in kwargs and 'projected' in context:
+            from eos.modifiedAttributeDict import ModifiedAttributeDict
+            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+        if 'projected' in context:
+            fit.addDrain(src, time, amount, 0)
+        elif 'module' in context:
+            src.itemModifiedAttributes.force('capacitorNeed', -amount)
+
+
+class Effect6201(EffectDef):
+
+    type = 'active'
+
+
+class Effect6208(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonusPercent'),
+                               stackingPenalties=True)
+
+
+class Effect6214(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'power',
+                                      src.getModifiedItemAttr('roleBonusCD'))
+
+
+class Effect6216(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        amount = 0
+        if 'projected' in context:
+            if (hasattr(src, 'state') and src.state >= FittingModuleState.ACTIVE) or hasattr(src, 'amountActive'):
+                amount = src.getModifiedItemAttr('energyNeutralizerAmount')
+
+                if 'effect' in kwargs:
+                    from eos.modifiedAttributeDict import ModifiedAttributeDict
+                    amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+                time = src.getModifiedItemAttr('duration')
+
+                fit.addDrain(src, time, amount, 0)
+
+
+class Effect6222(EffectDef):
+
+    runTime = 'early'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' in context:
+            fit.ship.increaseItemAttr('warpScrambleStatus', module.getModifiedItemAttr('warpScrambleStrength'))
+            if module.charge is not None and module.charge.ID == 47336:
+                for mod in fit.modules:
+                    if not mod.isEmpty and mod.item.requiresSkill('High Speed Maneuvering') and mod.state > FittingModuleState.ONLINE:
+                        mod.state = FittingModuleState.ONLINE
+                    if not mod.isEmpty and mod.item.requiresSkill('Micro Jump Drive Operation') and mod.state > FittingModuleState.ONLINE:
+                        mod.state = FittingModuleState.ONLINE
+
+
+class Effect6230(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect6232(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+
+
+class Effect6233(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6234(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect6237(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+
+
+class Effect6238(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6239(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'duration',
+                                      src.getModifiedItemAttr('shipBonusOREfrig2'), skill='Mining Frigate')
+
+
+class Effect6241(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect6242(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+
+
+class Effect6245(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+
+
+class Effect6246(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAD1'), skill='Amarr Destroyer')
+
+
+class Effect6253(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect6256(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect6257(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAB'), skill='Amarr Battleship')
+
+
+class Effect6260(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAB2'), skill='Amarr Battleship')
+
+
+class Effect6267(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect6272(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusElectronicAttackShip3'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect6273(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusElectronicAttackShip1'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect6278(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusElectronicAttackShip3'),
+                                      skill='Electronic Attack Ships')
+
+
+class Effect6281(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect6285(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonus3AF'), skill='Amarr Frigate')
+
+
+class Effect6287(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect6291(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonus3AF'), skill='Amarr Frigate')
+
+
+class Effect6294(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect6299(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAC3'), skill='Amarr Cruiser')
+
+
+class Effect6300(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect6301(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusAC2'), skill='Amarr Cruiser')
+
+
+class Effect6305(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusAC3'), skill='Amarr Cruiser')
+
+
+class Effect6307(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
+
+
+class Effect6308(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
+
+
+class Effect6309(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusMD1'), skill='Minmatar Destroyer')
+
+
+class Effect6310(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', src.getModifiedItemAttr('shipBonusMD1'),
+                                        skill='Minmatar Destroyer')
+
+
+class Effect6315(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+
+
+class Effect6316(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+
+
+class Effect6317(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'), 'duration',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer2'), skill='Command Destroyers')
+
+
+class Effect6318(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
+                               skill='Minmatar Destroyer')
+
+
+class Effect6319(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
+                               skill='Minmatar Destroyer')
+
+
+class Effect6320(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
+                               skill='Minmatar Destroyer')
+
+
+class Effect6321(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusMD2'),
+                               skill='Minmatar Destroyer')
+
+
+class Effect6322(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, *args, **kwargs):
+        src.boostItemAttr('scanGravimetricStrengthBonus', src.getModifiedChargeAttr('scanGravimetricStrengthBonusBonus'))
+
+
+class Effect6323(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, *args, **kwargs):
+        src.boostItemAttr('scanLadarStrengthBonus', src.getModifiedChargeAttr('scanLadarStrengthBonusBonus'))
+
+
+class Effect6324(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, *args, **kwargs):
+        src.boostItemAttr('scanMagnetometricStrengthBonus', src.getModifiedChargeAttr('scanMagnetometricStrengthBonusBonus'))
+
+
+class Effect6325(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, *args, **kwargs):
+        src.boostItemAttr('scanRadarStrengthBonus', src.getModifiedChargeAttr('scanRadarStrengthBonusBonus'))
+
+
+class Effect6326(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+
+
+class Effect6327(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+
+
+class Effect6328(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusCD1'), skill='Caldari Destroyer')
+
+
+class Effect6329(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                        'explosiveDamage', src.getModifiedItemAttr('shipBonusCD1'),
+                                        skill='Caldari Destroyer')
+
+
+class Effect6330(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
+                               skill='Caldari Destroyer')
+
+
+class Effect6331(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
+                               skill='Caldari Destroyer')
+
+
+class Effect6332(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
+                               skill='Caldari Destroyer')
+
+
+class Effect6333(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusCD2'),
+                               skill='Caldari Destroyer')
+
+
+class Effect6334(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+
+
+class Effect6335(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusAD2'),
+                               skill='Amarr Destroyer')
+
+
+class Effect6336(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusAD2'),
+                               skill='Amarr Destroyer')
+
+
+class Effect6337(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusAD2'), skill='Amarr Destroyer')
+
+
+class Effect6338(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusAD2'),
+                               skill='Amarr Destroyer')
+
+
+class Effect6339(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('eliteBonusCommandDestroyer1'), skill='Command Destroyers')
+
+
+class Effect6340(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
+                               skill='Gallente Destroyer')
+
+
+class Effect6341(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
+                               skill='Gallente Destroyer')
+
+
+class Effect6342(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
+                               skill='Gallente Destroyer')
+
+
+class Effect6343(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusGD2'),
+                               skill='Gallente Destroyer')
+
+
+class Effect6350(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Light Missiles') or mod.charge.requiresSkill('Rockets'), 'kineticDamage',
+            src.getModifiedItemAttr('shipBonus3CF'), skill='Caldari Frigate')
+
+
+class Effect6351(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusCC3'), skill='Caldari Cruiser')
+
+
+class Effect6352(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('roleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'maxRange',
+                                      src.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6353(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'cpu',
+                                      src.getModifiedItemAttr('roleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6354(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'trackingSpeedBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'explosionDelayBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'maxRangeBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'falloffBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'missileVelocityBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeVelocityBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeCloudSizeBonus',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect6355(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'capacitorNeed',
+                                      src.getModifiedItemAttr('roleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'cpu', src.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6356(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('roleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'maxRange',
+                                      src.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6357(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Navigation'), 'maxRange',
+                                      src.getModifiedItemAttr('shipBonusGF2'), skill='Gallente Frigate')
+
+
+class Effect6358(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Navigation'),
+                                         'warpScrambleStrength', ship.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6359(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'aoeVelocity',
+                                        src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect6360(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusMF2'), skill='Minmatar Frigate')
+
+
+class Effect6361(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonus3MF'), skill='Minmatar Frigate')
+
+
+class Effect6362(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange',
+                                      src.getModifiedItemAttr('roleBonus'))
+
+
+class Effect6368(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Shield Booster', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('falloffBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Shield Booster',
+                                      'falloffEffectiveness', src.getModifiedItemAttr('falloffBonus'))
+
+
+class Effect6369(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect6370(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect6371(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'falloffEffectiveness', src.getModifiedItemAttr('shipBonusGC'),
+                                      skill='Gallente Cruiser')
+
+
+class Effect6372(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'falloffEffectiveness', src.getModifiedItemAttr('shipBonusAC2'),
+                                      skill='Amarr Cruiser')
+
+
+class Effect6373(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Armor Repairer', 'falloffEffectiveness',
+                                      src.getModifiedItemAttr('falloffBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Ancillary Remote Armor Repairer',
+                                      'falloffEffectiveness', src.getModifiedItemAttr('falloffBonus'))
+
+
+class Effect6374(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == 'Logistic Drone', 'structureDamageAmount',
+                                     src.getModifiedItemAttr('droneArmorDamageAmountBonus'))
+
+
+class Effect6377(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'duration',
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+
+
+class Effect6378(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'duration',
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('eliteBonusLogiFrig1'), skill='Logistics Frigates')
+
+
+class Effect6379(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('eliteBonusLogiFrig2'), skill='Logistics Frigates')
+
+
+class Effect6380(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('eliteBonusLogiFrig2'), skill='Logistics Frigates')
+
+
+class Effect6381(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('signatureRadius', src.getModifiedItemAttr('eliteBonusLogiFrig2'),
+                               skill='Logistics Frigates')
+
+
+class Effect6384(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for tgtAttr in (
+                'aoeCloudSizeBonus',
+                'explosionDelayBonus',
+                'missileVelocityBonus',
+                'aoeVelocityBonus'
+        ):
+            module.boostItemAttr(tgtAttr, module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus'))
+
+
+class Effect6385(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemForce(lambda mod: mod.item.group.name == 'Cloaking Device',
+                                      'maxVelocityModifier', src.getModifiedItemAttr('velocityPenaltyReduction'))
+
+
+class Effect6386(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        level = src.level if 'skill' in context else 1
+        for attr in (
+                'explosionDelayBonus',
+                'aoeVelocityBonus',
+                'aoeCloudSizeBonus',
+                'missileVelocityBonus'
+        ):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'),
+                                          attr, src.getModifiedItemAttr('scanSkillEwStrengthBonus') * level)
+
+
+class Effect6395(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'missileVelocityBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeVelocityBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'maxRangeBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'explosionDelayBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'aoeCloudSizeBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'trackingSpeedBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Weapon Disruption'), 'falloffBonus',
+                                      src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect6396(EffectDef):
+
+    type = 'passive', 'structure'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Anti-Capital Missile', 'Structure Anti-Subcapital Missile', 'Structure Guided Bomb')
+        for damageType in ('em', 'thermal', 'explosive', 'kinetic'):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
+                                            '%sDamage' % damageType, src.getModifiedItemAttr('damageMultiplierBonus'),
+                                            skill='Structure Missile Systems')
+
+
+class Effect6400(EffectDef):
+
+    type = 'passive', 'structure'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Warp Scrambler', 'Structure Disruption Battery', 'Structure Stasis Webifier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'capacitorNeed', src.getModifiedItemAttr('capNeedBonus'),
+                                      skill='Structure Electronic Systems')
+
+
+class Effect6401(EffectDef):
+
+    type = 'passive', 'structure'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Energy Neutralizer', 'Structure Area Denial Module')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'capacitorNeed', src.getModifiedItemAttr('capNeedBonus'),
+                                      skill='Structure Engineering Systems')
+
+
+class Effect6402(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Anti-Subcapital Missile', 'Structure Anti-Capital Missile')
+
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
+                                      'aoeVelocity', src.getModifiedItemAttr('structureRigMissileExploVeloBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6403(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Anti-Subcapital Missile', 'Structure Anti-Capital Missile')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
+                                      'maxVelocity', src.getModifiedItemAttr('structureRigMissileVelocityBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6404(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Energy Neutralizer',
+                                      'maxRange', src.getModifiedItemAttr('structureRigEwarOptimalBonus'),
+                                      stackingPenalties=True)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Energy Neutralizer',
+                                      'falloffEffectiveness', src.getModifiedItemAttr('structureRigEwarFalloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6405(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Energy Neutralizer',
+                                      'capacitorNeed', src.getModifiedItemAttr('structureRigEwarCapUseBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6406(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure ECM Battery', 'Structure Disruption Battery')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'falloff', src.getModifiedItemAttr('structureRigEwarFalloffBonus'),
+                                      stackingPenalties=True)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'maxRange', src.getModifiedItemAttr('structureRigEwarOptimalBonus'),
+                                      stackingPenalties=True)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'falloffEffectiveness', src.getModifiedItemAttr('structureRigEwarFalloffBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6407(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure ECM Battery', 'Structure Disruption Battery')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'capacitorNeed', src.getModifiedItemAttr('structureRigEwarCapUseBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6408(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.extraAttributes.increase('maxTargetsLockedFromSkills', src.getModifiedItemAttr('structureRigMaxTargetBonus'))
+
+
+class Effect6409(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('structureRigScanResBonus'),
+                               stackingPenalties=True)
+
+
+class Effect6410(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Structure Guided Bomb',
+                                        'aoeCloudSize', src.getModifiedItemAttr('structureRigMissileExplosionRadiusBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6411(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == 'Structure Guided Bomb',
+                                        'maxVelocity', src.getModifiedItemAttr('structureRigMissileVelocityBonus'),
+                                        stackingPenalties=True)
+
+
+class Effect6412(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Area Denial Module',
+                                      'empFieldRange', src.getModifiedItemAttr('structureRigPDRangeBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6413(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Area Denial Module',
+                                      'capacitorNeed', src.getModifiedItemAttr('structureRigPDCapUseBonus'),
+                                      stackingPenalties=True)
+
+
+class Effect6417(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Structure Doomsday Weapon',
+                                         'lightningWeaponDamageLossTarget',
+                                         src.getModifiedItemAttr('structureRigDoomsdayDamageLossTargetBonus'))
+
+
+class Effect6422(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6423(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' in context:
+            for srcAttr, tgtAttr in (
+                    ('aoeCloudSizeBonus', 'aoeCloudSize'),
+                    ('aoeVelocityBonus', 'aoeVelocity'),
+                    ('missileVelocityBonus', 'maxVelocity'),
+                    ('explosionDelayBonus', 'explosionDelay'),
+            ):
+                fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                                tgtAttr, module.getModifiedItemAttr(srcAttr),
+                                                stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6424(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6425(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
+                                   stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6426(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6427(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' not in context:
+            return
+
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True)
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True)
+
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            fit.ship.boostItemAttr(
+                'scan{}Strength'.format(scanType),
+                module.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
+                stackingPenalties=True
+            )
+
+
+class Effect6428(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' in context:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                          stackingPenalties=True, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                          stackingPenalties=True, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                          stackingPenalties=True, **kwargs)
+
+
+class Effect6431(EffectDef):
+
+    displayName = 'Missile Attack'
+    hasCharges = True
+    prefix = 'fighterAbilityMissiles'
+    type = 'active'
+
+
+class Effect6434(EffectDef):
+
+    displayName = 'Energy Neutralizer'
+    grouped = True
+    prefix = 'fighterAbilityEnergyNeutralizer'
+    type = 'active', 'projected'
+
+    @classmethod
+    def handler(cls, fit, src, context, **kwargs):
+        if 'projected' in context:
+            amount = src.getModifiedItemAttr('{}Amount'.format(cls.prefix)) * src.amountActive
+            time = src.getModifiedItemAttr('{}Duration'.format(cls.prefix))
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.addDrain(src, time, amount, 0)
+
+
+class Effect6435(EffectDef):
+
+    displayName = 'Stasis Webifier'
+    grouped = True
+    prefix = 'fighterAbilityStasisWebifier'
+    type = 'active', 'projected'
+
+    @classmethod
+    def handler(cls, fit, src, context):
+        if 'projected' not in context:
+            return
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('{}SpeedPenalty'.format(cls.prefix)) * src.amountActive,
+                               stackingPenalties=True)
+
+
+class Effect6436(EffectDef):
+
+    displayName = 'Warp Disruption'
+    grouped = True
+    prefix = 'fighterAbilityWarpDisruption'
+    type = 'active', 'projected'
+
+    @classmethod
+    def handler(cls, fit, src, context):
+        if 'projected' not in context:
+            return
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('{}PointStrength'.format(cls.prefix)) * src.amountActive)
+
+
+class Effect6437(EffectDef):
+
+    displayName = 'ECM'
+    grouped = True
+    prefix = 'fighterAbilityECM'
+    type = 'projected', 'active'
+
+    @classmethod
+    def handler(cls, fit, module, context, **kwargs):
+        if 'projected' not in context:
+            return
+        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+        strModifier = 1 - (module.getModifiedItemAttr('{}Strength{}'.format(cls.prefix, fit.scanType)) * module.amountActive) / fit.scanStrength
+
+        if 'effect' in kwargs:
+            from eos.modifiedAttributeDict import ModifiedAttributeDict
+            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+        fit.ecmProjectedStr *= strModifier
+
+
+class Effect6439(EffectDef):
+
+    displayName = 'Evasive Maneuvers'
+    grouped = True
+    prefix = 'fighterAbilityEvasiveManeuvers'
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, container, context):
+        container.boostItemAttr('maxVelocity',
+                                container.getModifiedItemAttr('fighterAbilityEvasiveManeuversSpeedBonus'))
+        container.boostItemAttr('signatureRadius',
+                                container.getModifiedItemAttr('fighterAbilityEvasiveManeuversSignatureRadiusBonus'),
+                                stackingPenalties=True)
+
+        # These may not have stacking penalties, but there's nothing else that affects the attributes yet to check.
+        container.multiplyItemAttr('shieldEmDamageResonance',
+                                   container.getModifiedItemAttr('fighterAbilityEvasiveManeuversEmResonance'),
+                                   stackingPenalties=True)
+        container.multiplyItemAttr('shieldThermalDamageResonance',
+                                   container.getModifiedItemAttr('fighterAbilityEvasiveManeuversThermResonance'),
+                                   stackingPenalties=True)
+        container.multiplyItemAttr('shieldKineticDamageResonance',
+                                   container.getModifiedItemAttr('fighterAbilityEvasiveManeuversKinResonance'),
+                                   stackingPenalties=True)
+        container.multiplyItemAttr('shieldExplosiveDamageResonance',
+                                   container.getModifiedItemAttr('fighterAbilityEvasiveManeuversExpResonance'),
+                                   stackingPenalties=True)
+
+
+class Effect6441(EffectDef):
+
+    displayName = 'Microwarpdrive'
+    grouped = True
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.boostItemAttr('maxVelocity', module.getModifiedItemAttr('fighterAbilityMicroWarpDriveSpeedBonus'),
+                             stackingPenalties=True)
+        module.boostItemAttr('signatureRadius',
+                             module.getModifiedItemAttr('fighterAbilityMicroWarpDriveSignatureRadiusBonus'),
+                             stackingPenalties=True)
+
+
+class Effect6443(EffectDef):
+
+    type = 'active'
+
+
+class Effect6447(EffectDef):
+
+    type = 'active'
+
+
+class Effect6448(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        missileGroups = ('Structure Anti-Capital Missile', 'Structure Anti-Subcapital Missile')
+        for srcAttr, tgtAttr in (
+                ('aoeCloudSizeBonus', 'aoeCloudSize'),
+                ('aoeVelocityBonus', 'aoeVelocity'),
+                ('missileVelocityBonus', 'maxVelocity'),
+                ('explosionDelayBonus', 'explosionDelay'),
+        ):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in missileGroups,
+                                            tgtAttr, container.getModifiedItemAttr(srcAttr),
+                                            stackingPenalties=True)
+
+
+class Effect6449(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        missileGroups = ('Structure Anti-Capital Missile', 'Structure Anti-Subcapital Missile')
+
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.modules.filteredChargeMultiply(lambda mod: mod.charge.group.name in missileGroups,
+                                               '%sDamage' % dmgType,
+                                               module.getModifiedItemAttr('missileDamageMultiplierBonus'),
+                                               stackingPenalties=True)
+
+        launcherGroups = ('Structure XL Missile Launcher', 'Structure Multirole Missile Launcher')
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name in launcherGroups,
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect6465(EffectDef):
+
+    displayName = 'Turret Attack'
+    prefix = 'fighterAbilityAttackMissile'
+    type = 'active'
+
+
+class Effect6470(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' in context:
+            # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+            strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.ecmProjectedStr *= strModifier
+
+
+class Effect6472(EffectDef):
+
+    type = 'active'
+
+
+class Effect6473(EffectDef):
+
+    type = 'active'
+
+
+class Effect6474(EffectDef):
+
+    type = 'active'
+
+
+class Effect6475(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == 'Structure Doomsday Weapon',
+                                         'lightningWeaponTargetAmount',
+                                         src.getModifiedItemAttr('structureRigDoomsdayTargetAmountBonus'))
+
+
+class Effect6476(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6477(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        if 'projected' in context and ((hasattr(src, 'state') and src.state >= FittingModuleState.ACTIVE) or
+                                       hasattr(src, 'amountActive')):
+            amount = src.getModifiedItemAttr('energyNeutralizerAmount')
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            time = src.getModifiedItemAttr('duration')
+
+            fit.addDrain(src, time, amount, 0)
+
+
+class Effect6478(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
+                                   stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6479(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' in context:
+            for srcAttr, tgtAttr in (
+                    ('aoeCloudSizeBonus', 'aoeCloudSize'),
+                    ('aoeVelocityBonus', 'aoeVelocity'),
+                    ('missileVelocityBonus', 'maxVelocity'),
+                    ('explosionDelayBonus', 'explosionDelay'),
+            ):
+                fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                                tgtAttr, module.getModifiedItemAttr(srcAttr),
+                                                stackingPenalties=True, *args, **kwargs)
+
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6481(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6482(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        return
+
+
+class Effect6484(EffectDef):
+
+    runtime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
+            fit.ship.multiplyItemAttr('{}DamageResonance'.format(dmgType),
+                                      src.getModifiedItemAttr('hull{}DamageResonance'.format(dmgType.title())),
+                                      stackingPenalties=True, penaltyGroup='postMul')
+
+
+class Effect6485(EffectDef):
+
+    displayName = 'Bomb'
+    hasCharges = True
+    prefix = 'fighterAbilityLaunchBomb'
+    type = 'active'
+
+
+class Effect6487(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('energyWarfareResistance',
+                               module.getModifiedItemAttr('energyWarfareResistanceBonus'),
+                               stackingPenalties=True)
+
+
+class Effect6488(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for scanType in ('Gravimetric', 'Magnetometric', 'Radar', 'Ladar'):
+            module.boostItemAttr('scan{}StrengthPercent'.format(scanType),
+                                 module.getModifiedChargeAttr('sensorStrengthBonusBonus'))
+
+
+class Effect6501(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
+
+
+class Effect6502(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
+                               skill='Amarr Dreadnought')
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
+                               skill='Amarr Dreadnought')
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
+                               skill='Amarr Dreadnought')
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtA2'),
+                               skill='Amarr Dreadnought')
+
+
+class Effect6503(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtA3'), skill='Amarr Dreadnought')
+
+
+class Effect6504(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusDreadnoughtC1'), skill='Caldari Dreadnought')
+
+
+class Effect6505(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
+                               skill='Caldari Dreadnought')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
+                               skill='Caldari Dreadnought')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
+                               skill='Caldari Dreadnought')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusDreadnoughtC2'),
+                               skill='Caldari Dreadnought')
+
+
+class Effect6506(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+
+
+class Effect6507(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG2'), skill='Gallente Dreadnought')
+
+
+class Effect6508(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'), 'duration',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG3'), skill='Gallente Dreadnought')
+
+
+class Effect6509(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
+
+
+class Effect6510(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM2'), skill='Minmatar Dreadnought')
+
+
+class Effect6511(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'), 'duration',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM2'), skill='Minmatar Dreadnought')
+
+
+class Effect6513(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' in context:
+            # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+            strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.ecmProjectedStr *= strModifier
+
+
+class Effect6526(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems') or
+                                                  mod.item.requiresSkill('Capital Capacitor Emission Systems'),
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'),
+                                      skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
+                                                  mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'),
+                                      skill='Amarr Carrier')
+
+
+class Effect6527(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryA2'),
+                               skill='Amarr Carrier')
+
+
+class Effect6533(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
+                                                  mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
+                                                  mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
+                                                  mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
+                                                  mod.item.requiresSkill('Information Command'),
+                                      'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command') or
+                                                  mod.item.requiresSkill('Information Command'),
+                                      'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryA4'), skill='Amarr Carrier')
+
+
+class Effect6534(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryM4'), skill='Minmatar Carrier')
+
+
+class Effect6535(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryG4'), skill='Gallente Carrier')
+
+
+class Effect6536(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusForceAuxiliaryC4'), skill='Caldari Carrier')
+
+
+class Effect6537(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'cpu',
+                                      src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6545(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        if src.getModifiedItemAttr('shipBonusForceAuxiliaryC1') is None:
+            return  # See GH Issue 1321
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems') or
+                                                  mod.item.requiresSkill('Capital Capacitor Emission Systems'),
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryC1'),
+                                      skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
+                                                  mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'shieldBonus', src.getModifiedItemAttr('shipBonusForceAuxiliaryC1'),
+                                      skill='Caldari Carrier')
+
+
+class Effect6546(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusForceAuxiliaryC2'),
+                               skill='Caldari Carrier')
+
+
+class Effect6548(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
+                                                  mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'),
+                                      skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
+                                                  mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'),
+                                      skill='Gallente Carrier')
+
+
+class Effect6549(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG2'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'), 'armorDamageAmount',
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG2'), skill='Gallente Carrier')
+
+
+class Effect6551(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or
+                                                  mod.item.requiresSkill('Capital Shield Emission Systems'),
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'),
+                                      skill='Minmatar Carrier')
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') or
+                                                  mod.item.requiresSkill('Capital Remote Armor Repair Systems'),
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'),
+                                      skill='Minmatar Carrier')
+
+
+class Effect6552(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'), 'shieldBonus',
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'), 'shieldBonus',
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+
+
+class Effect6555(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxVelocity',
+                                     src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+
+
+class Effect6556(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+
+
+class Effect6557(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionVelocity',
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'trackingSpeed',
+                                     src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionRadius',
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretTrackingSpeed',
+                                       src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionRadius',
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
+                                       src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
+                                       stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'falloff',
+                                     src.getModifiedItemAttr('falloffBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionVelocity',
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
+                                       stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
+                                     src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
+                                       stackingPenalties=True)
+
+
+class Effect6558(EffectDef):
+
+    type = 'overheat'
+
+    @staticmethod
+    def handler(fit, module, context):
+        overloadBonus = module.getModifiedItemAttr('overloadTrackingModuleStrengthBonus')
+        module.boostItemAttr('maxRangeBonus', overloadBonus)
+        module.boostItemAttr('falloffBonus', overloadBonus)
+        module.boostItemAttr('trackingSpeedBonus', overloadBonus)
+        module.boostItemAttr('aoeCloudSizeBonus', overloadBonus)
+        module.boostItemAttr('aoeVelocityBonus', overloadBonus)
+
+
+class Effect6559(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionRadius',
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionRadius',
+                                       src.getModifiedItemAttr('aoeCloudSizeBonus'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'falloff',
+                                     src.getModifiedItemAttr('falloffBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeFalloff', src.getModifiedItemAttr('falloffBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretTrackingSpeed',
+                                       src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
+                                     src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'trackingSpeed',
+                                     src.getModifiedItemAttr('trackingSpeedBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeOptimal', src.getModifiedItemAttr('maxRangeBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionVelocity',
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionVelocity',
+                                       src.getModifiedItemAttr('aoeVelocityBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
+                                       src.getModifiedItemAttr('maxRangeBonus'), stackingPenalties=True)
+
+
+class Effect6560(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6561(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Light Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+
+
+class Effect6562(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('shieldBonus') * lvl)
+
+
+class Effect6563(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Heavy Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Heavy Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Heavy Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6565(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+
+        for attr in [
+            'structureRigDoomsdayDamageLossTargetBonus',
+            'structureRigScanResBonus',
+            'structureRigPDRangeBonus',
+            'structureRigPDCapUseBonus',
+            'structureRigMissileExploVeloBonus',
+            'structureRigMissileVelocityBonus',
+            'structureRigEwarOptimalBonus',
+            'structureRigEwarFalloffBonus',
+            'structureRigEwarCapUseBonus',
+            'structureRigMissileExplosionRadiusBonus'
+        ]:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Jury Rigging'),
+                                      attr, src.getModifiedItemAttr('structureRoleBonus'))
+
+
+class Effect6566(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('fighterBonusShieldCapacityPercent'))
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('fighterBonusVelocityPercent'), stackingPenalties=True, penaltyGroup='postMul')
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDuration',
+                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul')
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityAttackTurretDuration',
+                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul')
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesDuration',
+                                       src.getModifiedItemAttr('fighterBonusROFPercent'), stackingPenalties=True, penaltyGroup='postMul')
+        fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldRechargeRate',
+                                       src.getModifiedItemAttr('fighterBonusShieldRechargePercent'))
+
+
+class Effect6567(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('scanResolution', src.getModifiedItemAttr('scanResolutionBonus'), stackingPenalties=True)
+
+        for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
+            attr = 'scan{}Strength'.format(scanType)
+            bonus = src.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType))
+            fit.ship.boostItemAttr(attr, bonus, stackingPenalties=True)
+            fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), attr, bonus,
+                                           stackingPenalties=True)
+
+        # EW cap need increase
+        groups = [
+            'Burst Jammer',
+            'Weapon Disruptor',
+            'ECM',
+            'Stasis Grappler',
+            'Sensor Dampener',
+            'Target Painter']
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
+                                                  mod.item.requiresSkill('Propulsion Jamming'),
+                                      'capacitorNeed', src.getModifiedItemAttr('ewCapacitorNeedBonus'))
+
+
+class Effect6570(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.ship.boostItemAttr('fighterCapacity', src.getModifiedItemAttr('skillBonusFighterHangarSize') * lvl)
+
+
+class Effect6571(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Autocannon Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6572(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Artillery Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6573(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Blaster Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6574(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Railgun Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6575(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Pulse Laser Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6576(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Beam Laser Specialization'),
+                                      'damageMultiplier', src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+
+
+class Effect6577(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missile Specialization'), 'speed',
+                                      src.getModifiedItemAttr('rofBonus') * lvl)
+
+
+class Effect6578(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('XL Torpedo Specialization'), 'speed',
+                                      src.getModifiedItemAttr('rofBonus') * lvl)
+
+
+class Effect6580(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'), 'structureDamageAmount',
+                                     src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'), 'armorDamageAmount',
+                                     src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'), 'shieldBonus',
+                                     src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect6581(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        # Remote effect bonuses (duration / amount / range / fallout)
+        for skill, amtAttr, stack in (
+                ('Capital Remote Armor Repair Systems', 'armorDamageAmount', True),
+                ('Capital Shield Emission Systems', 'shieldBonus', True),
+                ('Capital Capacitor Emission Systems', 'powerTransferAmount', False),
+                ('Capital Remote Hull Repair Systems', 'structureDamageAmount', False)):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'duration',
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsDurationBonus'))
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsAmountBonus'),
+                                          stackingPenalties=stack)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'maxRange',
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsRangeBonus'), stackingPenalties=True)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'falloffEffectiveness',
+                                          src.getModifiedItemAttr('siegeRemoteLogisticsRangeBonus'), stackingPenalties=True)
+
+        # Local armor/shield rep effects (duration / amoutn)
+        for skill, amtAttr in (
+                ('Capital Shield Operation', 'shieldBonus'),
+                ('Capital Repair Systems', 'armorDamageAmount')):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), 'duration',
+                                          src.getModifiedItemAttr('siegeLocalLogisticsDurationBonus'))
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
+                                          src.getModifiedItemAttr('siegeLocalLogisticsAmountBonus'))
+
+        # Speed bonus
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'), stackingPenalties=True)
+
+        # Scan resolution multiplier
+        fit.ship.multiplyItemAttr('scanResolution', src.getModifiedItemAttr('scanResolutionMultiplier'),
+                                  stackingPenalties=True)
+
+        # Mass multiplier
+        fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'), stackingPenalties=True)
+
+        # Max locked targets
+        fit.ship.increaseItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargetsBonus'))
+
+        # EW cap need increase
+        groups = [
+            'Burst Jammer',
+            'Weapon Disruptor',
+            'ECM',
+            'Stasis Grappler',
+            'Sensor Dampener',
+            'Target Painter']
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
+                                                  mod.item.requiresSkill('Propulsion Jamming'),
+                                      'capacitorNeed', src.getModifiedItemAttr('ewCapacitorNeedBonus'))
+
+        # todo: test for April 2016 release
+        # Block EWAR & projected effects
+        fit.ship.forceItemAttr('disallowOffensiveModifiers', src.getModifiedItemAttr('disallowOffensiveModifiers'))
+        fit.ship.forceItemAttr('disallowAssistance', src.getModifiedItemAttr('disallowAssistance'))
+
+        # new in April 2016 release
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('droneDamageBonus'), stackingPenalties=True)
+
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
+
+        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
+        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
+
+
+class Effect6582(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        # Turrets
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret') or
+                                                  mod.item.requiresSkill('Capital Hybrid Turret') or
+                                                  mod.item.requiresSkill('Capital Projectile Turret'),
+                                      'damageMultiplier', src.getModifiedItemAttr('siegeTurretDamageBonus'))
+
+        # Missiles
+        for type in ('kinetic', 'thermal', 'explosive', 'em'):
+            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes') or
+                                                        mod.charge.requiresSkill('XL Cruise Missiles') or
+                                                        mod.charge.requiresSkill('Torpedoes'),
+                                            '%sDamage' % type, src.getModifiedItemAttr('siegeMissileDamageBonus'))
+
+        # Reppers
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation') or
+                                                  mod.item.requiresSkill('Capital Repair Systems'),
+                                      'duration', src.getModifiedItemAttr('siegeLocalLogisticsDurationBonus'))
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Operation'),
+                                      'shieldBonus', src.getModifiedItemAttr('siegeLocalLogisticsAmountBonus'),
+                                      stackingPenalties=True)
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('siegeLocalLogisticsAmountBonus'),
+                                      stackingPenalties=True)
+
+        # Speed penalty
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'))
+
+        # Mass
+        fit.ship.multiplyItemAttr('mass', src.getModifiedItemAttr('siegeMassMultiplier'),
+                                  stackingPenalties=True, penaltyGroup='postMul')
+
+        # @ todo: test for April 2016 release
+        # Block Hostile EWAR and friendly effects
+        fit.ship.forceItemAttr('disallowOffensiveModifiers', src.getModifiedItemAttr('disallowOffensiveModifiers'))
+        fit.ship.forceItemAttr('disallowAssistance', src.getModifiedItemAttr('disallowAssistance'))
+
+        # new in April 2016 release
+        # missile ROF bonus
+        for group in ('Missile Launcher XL Torpedo', 'Missile Launcher Rapid Torpedo', 'Missile Launcher XL Cruise'):
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == group, 'speed',
+                                          src.getModifiedItemAttr('siegeLauncherROFBonus'))
+
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'maxVelocity',
+                                        src.getModifiedItemAttr('siegeTorpedoVelocityBonus'), stackingPenalties=True)
+
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
+        fit.ship.boostItemAttr('weaponDisruptionResistance', src.getModifiedItemAttr('weaponDisruptionResistanceBonus'))
+
+        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
+        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
+
+
+class Effect6591(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierA3'),
+                                  skill='Amarr Carrier')
+
+
+class Effect6592(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierC3'),
+                                  skill='Caldari Carrier')
+
+
+class Effect6593(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierG3'),
+                                  skill='Gallente Carrier')
+
+
+class Effect6594(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusSupercarrierM3'),
+                                  skill='Minmatar Carrier')
+
+
+class Effect6595(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierA4'), skill='Amarr Carrier')
+
+
+class Effect6596(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierC4'), skill='Caldari Carrier')
+
+
+class Effect6597(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierG4'), skill='Gallente Carrier')
+
+
+class Effect6598(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusCarrierM4'), skill='Minmatar Carrier')
+
+
+class Effect6599(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusCarrierA1'),
+                               skill='Amarr Carrier')
+
+
+class Effect6600(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusCarrierC1'),
+                               skill='Caldari Carrier')
+
+
+class Effect6601(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierG1'), skill='Gallente Carrier')
+
+
+class Effect6602(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusCarrierM1'), skill='Minmatar Carrier')
+
+
+class Effect6603(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA1'), skill='Amarr Carrier')
+
+
+class Effect6604(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierC1'), skill='Caldari Carrier')
+
+
+class Effect6605(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG1'), skill='Gallente Carrier')
+
+
+class Effect6606(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+
+
+class Effect6607(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Armored Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierA5'), skill='Amarr Carrier')
+
+
+class Effect6608(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Shield Command') or mod.item.requiresSkill('Information Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierC5'), skill='Caldari Carrier')
+
+
+class Effect6609(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Armored Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierG5'), skill='Gallente Carrier')
+
+
+class Effect6610(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff4Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff1Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff3Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'buffDuration', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Skirmish Command') or mod.item.requiresSkill('Shield Command'),
+            'warfareBuff2Value', src.getModifiedItemAttr('shipBonusSupercarrierM5'), skill='Minmatar Carrier')
+
+
+class Effect6611(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'), 'speedFactor',
+                                      src.getModifiedItemAttr('shipBonusSupercarrierC2'), skill='Caldari Carrier')
+
+
+class Effect6612(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionVelocity',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA2'), skill='Amarr Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionVelocity',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA2'), skill='Amarr Carrier')
+
+
+class Effect6613(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6614(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'armorHPBonusAdd',
+                                      src.getModifiedItemAttr('shipBonusRole2'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Upgrades'), 'capacityBonus',
+                                      src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect6615(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
+                                      'durationWeaponDisruptionBurstProjector',
+                                      src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
+
+
+class Effect6616(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
+                                      'durationECMJammerBurstProjector', src.getModifiedItemAttr('shipBonusSupercarrierC4'),
+                                      skill='Caldari Carrier')
+
+
+class Effect6617(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
+                                      'durationSensorDampeningBurstProjector',
+                                      src.getModifiedItemAttr('shipBonusSupercarrierG4'), skill='Gallente Carrier')
+
+
+class Effect6618(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'),
+                                      'durationTargetIlluminationBurstProjector',
+                                      src.getModifiedItemAttr('shipBonusSupercarrierM4'), skill='Minmatar Carrier')
+
+
+class Effect6619(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6620(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Missile Launcher Operation'), 'reloadTime',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtC3'), skill='Caldari Dreadnought')
+
+
+class Effect6621(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
+                               skill='Amarr Carrier')
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierA2'),
+                               skill='Amarr Carrier')
+
+
+class Effect6622(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
+                               skill='Caldari Carrier')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusSupercarrierC2'),
+                               skill='Caldari Carrier')
+
+
+class Effect6623(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierG2'), skill='Gallente Carrier')
+
+
+class Effect6624(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierM2'), skill='Minmatar Carrier')
+
+
+class Effect6625(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierA2'), skill='Amarr Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
+                                       'fighterAbilityEnergyNeutralizerOptimalRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierA2'), skill='Amarr Carrier')
+
+
+class Effect6626(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierC2'), skill='Caldari Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
+                                       'fighterAbilityECMRangeOptimal', src.getModifiedItemAttr('shipBonusCarrierC2'),
+                                       skill='Caldari Carrier')
+
+
+class Effect6627(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierG2'), skill='Gallente Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
+                                       'fighterAbilityWarpDisruptionRange', src.getModifiedItemAttr('shipBonusCarrierG2'),
+                                       skill='Gallente Carrier')
+
+
+class Effect6628(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'), 'fighterSquadronOrbitRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierM2'), skill='Minmatar Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Support Fighters'),
+                                       'fighterAbilityStasisWebifierOptimalRange',
+                                       src.getModifiedItemAttr('shipBonusCarrierM2'), skill='Minmatar Carrier')
+
+
+class Effect6629(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        src.boostItemAttr('emDamageResistanceBonus', src.getModifiedChargeAttr('emDamageResistanceBonusBonus'))
+        src.boostItemAttr('explosiveDamageResistanceBonus',
+                          src.getModifiedChargeAttr('explosiveDamageResistanceBonusBonus'))
+        src.boostItemAttr('kineticDamageResistanceBonus', src.getModifiedChargeAttr('kineticDamageResistanceBonusBonus'))
+        src.boostItemAttr('thermalDamageResistanceBonus', src.getModifiedChargeAttr('thermalDamageResistanceBonusBonus'))
+
+
+class Effect6634(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
+
+
+class Effect6635(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+
+
+class Effect6636(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+
+
+class Effect6637(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
+
+
+class Effect6638(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher XL Cruise', 'speed',
+                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Torpedo', 'speed',
+                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher XL Torpedo', 'speed',
+                                      src.getModifiedItemAttr('shipBonusTitanC2'), skill='Caldari Titan')
+
+
+class Effect6639(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesExplosionRadius',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileExplosionRadius',
+                                       src.getModifiedItemAttr('shipBonusSupercarrierA4'), skill='Amarr Carrier')
+
+
+class Effect6640(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6641(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'armorHPBonusAdd',
+                                      src.getModifiedItemAttr('shipBonusRole2'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Upgrades'), 'capacityBonus',
+                                      src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect6642(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Doomsday Operation'), 'duration',
+                                      src.getModifiedItemAttr('rofBonus') * lvl)
+
+
+class Effect6647(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanA3'), skill='Amarr Titan')
+
+
+class Effect6648(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanC3'), skill='Caldari Titan')
+
+
+class Effect6649(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanG3'), skill='Gallente Titan')
+
+
+class Effect6650(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('shipBonusTitanM3'), skill='Minmatar Titan')
+
+
+class Effect6651(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' not in context:
+            return
+
+        if module.charge and module.charge.name == 'Nanite Repair Paste':
+            multiplier = 3
+        else:
+            multiplier = 1
+
+        amount = module.getModifiedItemAttr('armorDamageAmount') * multiplier
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        rps = amount / speed
+        fit.extraAttributes.increase('armorRepair', rps)
+        fit.extraAttributes.increase('armorRepairPreSpool', rps)
+        fit.extraAttributes.increase('armorRepairFullSpool', rps)
+
+
+class Effect6652(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' not in context:
+            return
+        amount = module.getModifiedItemAttr('shieldBonus')
+        speed = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('shieldRepair', amount / speed, **kwargs)
+
+
+class Effect6653(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusTitanA2'), skill='Amarr Titan')
+
+
+class Effect6654(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+
+
+class Effect6655(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Projectile Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusTitanM2'), skill='Minmatar Titan')
+
+
+class Effect6656(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'maxVelocity',
+                                        src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect6657(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Cruise Missiles'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('XL Torpedoes'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusTitanC5'), skill='Caldari Titan')
+
+
+class Effect6658(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        # Resistances
+        for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
+            for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
+                bonus = '%s%sDamageResonance' % (attrPrefix, damageType)
+                bonus = '%s%s' % (bonus[0].lower(), bonus[1:])
+                booster = '%s%sDamageResonance' % (layer, damageType)
+                penalize = False if layer == 'hull' else True
+                fit.ship.multiplyItemAttr(bonus, src.getModifiedItemAttr(booster),
+                                          stackingPenalties=penalize, penaltyGroup='preMul')
+
+        # Turrets
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret') or
+                                                  mod.item.requiresSkill('Large Hybrid Turret') or
+                                                  mod.item.requiresSkill('Large Projectile Turret'),
+                                      'maxRange', src.getModifiedItemAttr('maxRangeBonus'),
+                                      stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret') or
+                                                  mod.item.requiresSkill('Large Hybrid Turret') or
+                                                  mod.item.requiresSkill('Large Projectile Turret'),
+                                      'falloff', src.getModifiedItemAttr('falloffBonus'),
+                                      stackingPenalties=True)
+
+        # Missiles
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes') or
+                                                    mod.charge.requiresSkill('Cruise Missiles') or
+                                                    mod.charge.requiresSkill('Heavy Missiles'),
+                                        'maxVelocity', src.getModifiedItemAttr('missileVelocityBonus'))
+
+        # Tanking
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('armorDamageAmountBonus'),
+                                      stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', src.getModifiedItemAttr('shieldBoostMultiplier'),
+                                      stackingPenalties=True)
+
+        # Speed penalty
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('speedFactor'))
+
+        # @todo: test these for April 2016 release
+        # Max locked targets
+        fit.ship.forceItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargets'))
+
+        # Block Hostile ewar
+        fit.ship.forceItemAttr('disallowOffensiveModifiers', src.getModifiedItemAttr('disallowOffensiveModifiers'))
+
+        # new with April 2016 release
+        for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
+            fit.ship.boostItemAttr('scan{}Strength'.format(scanType),
+                                   src.getModifiedItemAttr('scan{}StrengthPercent'.format(scanType)),
+                                   stackingPenalties=True)
+
+        fit.ship.boostItemAttr('remoteRepairImpedance', src.getModifiedItemAttr('remoteRepairImpedanceBonus'))
+        fit.ship.boostItemAttr('remoteAssistanceImpedance', src.getModifiedItemAttr('remoteAssistanceImpedanceBonus'))
+        fit.ship.boostItemAttr('sensorDampenerResistance', src.getModifiedItemAttr('sensorDampenerResistanceBonus'))
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Micro Jump Drive Operation'),
+                                         'activationBlocked', src.getModifiedItemAttr('activationBlockedStrenght'))
+        fit.ship.boostItemAttr('targetPainterResistance', src.getModifiedItemAttr('targetPainterResistanceBonus'))
+        fit.ship.boostItemAttr('weaponDisruptionResistance', src.getModifiedItemAttr('weaponDisruptionResistanceBonus'))
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('siegeModeWarpStatus'))
+
+        fit.ship.forceItemAttr('disallowDocking', src.getModifiedItemAttr('disallowDocking'))
+        fit.ship.forceItemAttr('disallowTethering', src.getModifiedItemAttr('disallowTethering'))
+
+
+class Effect6661(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('shipBonusCarrierM3'), skill='Minmatar Carrier')
+
+
+class Effect6662(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('shipBonusCarrierG3'), skill='Gallente Carrier')
+
+
+class Effect6663(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('damageMultiplierBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'), 'miningDroneAmountPercent',
+                                     src.getModifiedItemAttr('miningAmountBonus') * lvl)
+
+
+class Effect6664(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
+                                     src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
+                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeOptimal',
+                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeOptimal',
+                                       src.getModifiedItemAttr('rangeSkillBonus') * lvl)
+
+
+class Effect6665(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('hullHpBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('armorHpBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('shieldCapacityBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('shieldCapacityBonus') * lvl)
+
+
+class Effect6667(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxVelocity',
+                                     src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+
+
+class Effect6669(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('hullHpBonus'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('hullHpBonus'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('hullHpBonus'))
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('hullHpBonus'))
+        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
+
+
+class Effect6670(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxRange',
+                                     src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesRange',
+                                       src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackTurretRangeOptimal', src.getModifiedItemAttr('rangeSkillBonus'),
+                                       stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'),
+                                       'fighterAbilityAttackMissileRangeOptimal',
+                                       src.getModifiedItemAttr('rangeSkillBonus'), stackingPenalties=True)
+        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
+
+
+class Effect6671(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'maxVelocity',
+                                     src.getModifiedItemAttr('droneMaxVelocityBonus'), stackingPenalties=True)
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'maxVelocity',
+                                       src.getModifiedItemAttr('droneMaxVelocityBonus'), stackingPenalties=True)
+        fit.ship.boostItemAttr('cpuOutput', src.getModifiedItemAttr('drawback'))
+
+
+class Effect6672(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        secModifier = module.getModifiedItemAttr('securityModifier')
+        module.multiplyItemAttr('structureRigDoomsdayDamageLossTargetBonus', secModifier)
+        module.multiplyItemAttr('structureRigScanResBonus', secModifier)
+        module.multiplyItemAttr('structureRigPDRangeBonus', secModifier)
+        module.multiplyItemAttr('structureRigPDCapUseBonus', secModifier)
+        module.multiplyItemAttr('structureRigMissileExploVeloBonus', secModifier)
+        module.multiplyItemAttr('structureRigMissileVelocityBonus', secModifier)
+        module.multiplyItemAttr('structureRigEwarOptimalBonus', secModifier)
+        module.multiplyItemAttr('structureRigEwarFalloffBonus', secModifier)
+        module.multiplyItemAttr('structureRigEwarCapUseBonus', secModifier)
+        module.multiplyItemAttr('structureRigMissileExplosionRadiusBonus', secModifier)
+        module.multiplyItemAttr('structureRigMaxTargetRangeBonus', secModifier)
+
+
+class Effect6679(EffectDef):
+
+    type = 'passive', 'structure'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Doomsday Weapon',
+                                      'duration', src.getModifiedItemAttr('durationBonus'),
+                                      skill='Structure Doomsday Operation')
+
+
+class Effect6681(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect6682(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6683(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
+                                   stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6684(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6685(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' in context:
+            # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+            strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
+
+            fit.ecmProjectedStr *= strModifier
+
+
+class Effect6686(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' in context:
+            for srcAttr, tgtAttr in (
+                    ('aoeCloudSizeBonus', 'aoeCloudSize'),
+                    ('aoeVelocityBonus', 'aoeVelocity'),
+                    ('missileVelocityBonus', 'maxVelocity'),
+                    ('explosionDelayBonus', 'explosionDelay'),
+            ):
+                fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                                tgtAttr, module.getModifiedItemAttr(srcAttr),
+                                                stackingPenalties=True, *args, **kwargs)
+
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6687(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context):
+        if 'projected' in context:
+            bonus = container.getModifiedItemAttr('armorDamageAmount')
+            duration = container.getModifiedItemAttr('duration') / 1000.0
+            rps = bonus / duration
+            fit.extraAttributes.increase('armorRepair', rps)
+            fit.extraAttributes.increase('armorRepairPreSpool', rps)
+            fit.extraAttributes.increase('armorRepairFullSpool', rps)
+
+
+class Effect6688(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context):
+        if 'projected' in context:
+            bonus = container.getModifiedItemAttr('shieldBonus')
+            duration = container.getModifiedItemAttr('duration') / 1000.0
+            fit.extraAttributes.increase('shieldRepair', bonus / duration)
+
+
+class Effect6689(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        if 'projected' not in context:
+            return
+        bonus = module.getModifiedItemAttr('structureDamageAmount')
+        duration = module.getModifiedItemAttr('duration') / 1000.0
+        fit.extraAttributes.increase('hullRepair', bonus / duration)
+
+
+class Effect6690(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+        fit.ship.boostItemAttr('maxVelocity', module.getModifiedItemAttr('speedFactor'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6691(EffectDef):
+
+    type = 'active', 'projected'
+
+    @staticmethod
+    def handler(fit, src, context, **kwargs):
+        if 'projected' in context and ((hasattr(src, 'state') and src.state >= FittingModuleState.ACTIVE) or
+                                       hasattr(src, 'amountActive')):
+            amount = src.getModifiedItemAttr('energyNeutralizerAmount')
+            time = src.getModifiedItemAttr('energyNeutralizerDuration')
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.addDrain(src, time, amount, 0)
+
+
+class Effect6692(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.ship.boostItemAttr('signatureRadius', container.getModifiedItemAttr('signatureRadiusBonus'),
+                                   stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6693(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' not in context:
+            return
+
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('maxTargetRangeBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+        fit.ship.boostItemAttr('scanResolution', module.getModifiedItemAttr('scanResolutionBonus'),
+                               stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6694(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, *args, **kwargs):
+        if 'projected' in context:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'trackingSpeed', module.getModifiedItemAttr('trackingSpeedBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'maxRange', module.getModifiedItemAttr('maxRangeBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Gunnery'),
+                                          'falloff', module.getModifiedItemAttr('falloffBonus'),
+                                          stackingPenalties=True, *args, **kwargs)
+
+
+class Effect6695(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' in context:
+            # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+            strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.ecmProjectedStr *= strModifier
+
+
+class Effect6697(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Armor', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Resource Processing', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6698(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Navigation', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Anchor', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6699(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Drones', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6700(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Electronic Systems', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Scanning', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Targeting', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6701(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Projectile Weapon', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6702(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Energy Weapon', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6703(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Hybrid Weapon', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6704(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Launcher', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6705(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Rig Shield', 'drawback',
+                                      src.getModifiedItemAttr('rigDrawbackBonus') * lvl)
+
+
+class Effect6706(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Cybernetics'),
+                                                 'armorRepairBonus', src.getModifiedItemAttr('implantSetSerpentis2'))
+
+
+class Effect6708(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('armorRepairBonus'))
+
+
+class Effect6709(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6710(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'speedFactor',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
+
+
+class Effect6711(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect6712(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'speedFactor',
+                                      src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
+
+
+class Effect6713(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Burst Projector Operation'), 'speedFactor',
+                                      src.getModifiedItemAttr('shipBonusSupercarrierM1'), skill='Minmatar Carrier')
+
+
+class Effect6714(EffectDef):
+
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        if 'projected' in context:
+            # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+            strModifier = 1 - module.getModifiedItemAttr('scan{0}StrengthBonus'.format(fit.scanType)) / fit.scanStrength
+
+            if 'effect' in kwargs:
+                from eos.modifiedAttributeDict import ModifiedAttributeDict
+                strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+            fit.ecmProjectedStr *= strModifier
+
+
+class Effect6717(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining'), 'duration',
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'duration',
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'capacitorNeed',
+                                      src.getModifiedItemAttr('miningDurationRoleBonus'))
+
+
+class Effect6720(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldBonus',
+                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'structureDamageAmount',
+                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorDamageAmount',
+                                     src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+
+
+class Effect6721(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'falloffEffectiveness',
+                                      src.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusLogistics1'),
+                                      skill='Logistics Cruisers')
+
+
+class Effect6722(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'falloffEffectiveness',
+                                      src.getModifiedItemAttr('roleBonusRepairRange'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'maxRange',
+                                      src.getModifiedItemAttr('roleBonusRepairRange'))
+
+
+class Effect6723(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'), 'cpu',
+                                      src.getModifiedItemAttr('shipBonusMC2'), skill='Minmatar Cruiser')
+
+
+class Effect6724(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'duration',
+                                      src.getModifiedItemAttr('eliteBonusLogistics3'), skill='Logistics Cruisers')
+
+
+class Effect6725(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'), 'falloff',
+                                      src.getModifiedItemAttr('shipBonus2AF'), skill='Amarr Frigate')
+
+
+class Effect6726(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cloaking'), 'cpu',
+                                      src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect6727(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'),
+                                      'falloffEffectiveness', src.getModifiedItemAttr('eliteBonusCovertOps1'),
+                                      stackingPenalties=True, skill='Covert Ops')
+
+
+class Effect6730(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'))
+        speedBoost = module.getModifiedItemAttr('speedFactor')
+        mass = fit.ship.getModifiedItemAttr('mass')
+        thrust = module.getModifiedItemAttr('speedBoostFactor')
+        fit.ship.boostItemAttr('maxVelocity', speedBoost * thrust / mass)
+        fit.ship.boostItemAttr('signatureRadius', module.getModifiedItemAttr('signatureRadiusBonus'),
+                               stackingPenalties=True)
+
+
+class Effect6731(EffectDef):
+
+    runTime = 'late'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('mass', module.getModifiedItemAttr('massAddition'))
+        speedBoost = module.getModifiedItemAttr('speedFactor')
+        mass = fit.ship.getModifiedItemAttr('mass')
+        thrust = module.getModifiedItemAttr('speedBoostFactor')
+        fit.ship.boostItemAttr('maxVelocity', speedBoost * thrust / mass)
+
+
+class Effect6732(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedChargeAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedChargeAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6733(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedChargeAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedChargeAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6734(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedChargeAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedChargeAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6735(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedChargeAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedChargeAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6736(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedChargeAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedChargeAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6737(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        for x in range(1, 4):
+            value = module.getModifiedChargeAttr('warfareBuff{}Multiplier'.format(x))
+            module.multiplyItemAttr('warfareBuff{}Value'.format(x), value)
+
+
+class Effect6753(EffectDef):
+
+    type = 'active', 'gang'
+
+    @staticmethod
+    def handler(fit, module, context, **kwargs):
+        for x in range(1, 5):
+            if module.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = module.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = module.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+class Effect6762(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Drone Specialization'), 'miningAmount',
+                                     src.getModifiedItemAttr('miningAmountBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Drone Specialization'), 'maxVelocity',
+                                     src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+
+
+class Effect6763(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level if 'skill' in context else 1
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Operation'), 'duration', src.getModifiedItemAttr('rofBonus') * lvl)
+
+
+class Effect6764(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Specialization'), 'duration',
+                                     src.getModifiedItemAttr('rofBonus') * lvl)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Specialization'),
+                                     'maxVelocity', src.getModifiedItemAttr('maxVelocityBonus') * lvl)
+
+
+class Effect6765(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Spatial Phenomena Generation'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6766(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupActive',
+                                         src.getModifiedItemAttr('maxGangModules'))
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Leadership'), 'maxGroupOnline',
+                                         src.getModifiedItemAttr('maxGangModules'))
+
+
+class Effect6769(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'maxRange',
+                                      src.getModifiedItemAttr('areaOfEffectBonus') * src.level)
+
+
+class Effect6770(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6771(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6772(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6773(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6774(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6776(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Armored Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+
+
+class Effect6777(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+
+
+class Effect6778(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Information Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+
+
+class Effect6779(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff3Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff4Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff1Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Skirmish Command'), 'warfareBuff2Multiplier',
+                                        src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+
+
+class Effect6780(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value', src.getModifiedItemAttr('commandStrengthBonus') * lvl)
+
+
+class Effect6782(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'),
+                                      'reloadTime',
+                                      src.getModifiedItemAttr('reloadTimeBonus') * lvl)
+
+
+class Effect6783(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'maxRange',
+                                      src.getModifiedItemAttr('roleBonusCommandBurstAoERange'))
+
+
+class Effect6786(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Multiplier',
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Multiplier',
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Multiplier',
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Multiplier',
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('shipBonusICS3'), skill='Industrial Command Ships')
+
+
+class Effect6787(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier',
+                                     src.getModifiedItemAttr('shipBonusICS4'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity',
+                                     src.getModifiedItemAttr('shipBonusICS4'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP',
+                                     src.getModifiedItemAttr('shipBonusICS4'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp',
+                                     src.getModifiedItemAttr('shipBonusICS4'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount',
+                                     src.getModifiedItemAttr('shipBonusICS4'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+
+class Effect6788(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Ice Harvesting Drone Operation'),
+                                     'duration',
+                                     src.getModifiedItemAttr('shipBonusICS5'),
+                                     skill='Industrial Command Ships'
+                                     )
+
+
+class Effect6789(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier',
+                                     src.getModifiedItemAttr('industrialBonusDroneDamage'))
+
+
+class Effect6790(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Ice Harvesting Drone Operation'), 'duration',
+                                     src.getModifiedItemAttr('roleBonusDroneIceHarvestingSpeed'))
+
+
+class Effect6792(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'damageMultiplier',
+                                     src.getModifiedItemAttr('shipBonusORECapital4'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'shieldCapacity',
+                                     src.getModifiedItemAttr('shipBonusORECapital4'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'armorHP',
+                                     src.getModifiedItemAttr('shipBonusORECapital4'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Drones'),
+                                     'hp',
+                                     src.getModifiedItemAttr('shipBonusORECapital4'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Mining Drone Operation'),
+                                     'miningAmount',
+                                     src.getModifiedItemAttr('shipBonusORECapital4'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+
+class Effect6793(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Mining Foreman'), 'buffDuration',
+                                      src.getModifiedItemAttr('shipBonusORECapital2'), skill='Capital Industrial Ships')
+
+
+class Effect6794(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff4Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'buffDuration',
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff1Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff3Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Command'), 'warfareBuff2Value',
+                                      src.getModifiedItemAttr('shipBonusORECapital3'), skill='Capital Industrial Ships')
+
+
+class Effect6795(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill('Ice Harvesting Drone Operation'),
+                                     'duration',
+                                     src.getModifiedItemAttr('shipBonusORECapital5'),
+                                     skill='Capital Industrial Ships'
+                                     )
+
+
+class Effect6796(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Hybrid Turret'),
+            'damageMultiplier',
+            1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6797(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+            'damageMultiplier',
+            1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6798(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('Small Energy Turret'),
+            'damageMultiplier',
+            1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6799(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        types = ('thermal', 'em', 'explosive', 'kinetic')
+        for type in types:
+            fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill('Rockets') or mod.charge.requiresSkill('Light Missiles'),
+                                               '{}Damage'.format(type),
+                                               1 / module.getModifiedItemAttr('modeDamageBonusPostDiv'),
+                                               stackingPenalties=True,
+                                               penaltyGroup='postDiv')
+
+
+class Effect6800(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('weaponDisruptionResistance', 1 / module.getModifiedItemAttr('modeEwarResistancePostDiv'))
+        fit.ship.multiplyItemAttr('sensorDampenerResistance', 1 / module.getModifiedItemAttr('modeEwarResistancePostDiv'))
+
+
+class Effect6801(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.requiresSkill('High Speed Maneuvering') or mod.item.requiresSkill('Afterburner'),
+            'speedFactor',
+            1 / module.getModifiedItemAttr('modeVelocityPostDiv'),
+            stackingPenalties=True,
+            penaltyGroup='postDiv'
+        )
+
+
+class Effect6807(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        lvl = src.level
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Invulnerability Core Operation'), 'buffDuration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Invulnerability Core Operation'), 'duration',
+                                      src.getModifiedItemAttr('durationBonus') * lvl)
+
+
+class Effect6844(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Defender Missiles'),
+                                        'maxVelocity', skill.getModifiedItemAttr('missileVelocityBonus') * skill.level)
+
+
+class Effect6845(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Defender Missiles'),
+                                      'moduleReactivationDelay', ship.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6851(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Energy Turret'), 'damageMultiplier', src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect6852(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', src.getModifiedItemAttr('shipBonusTitanM1'), skill='Minmatar Titan')
+
+
+class Effect6853(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', src.getModifiedItemAttr('shipBonusTitanA1'), skill='Amarr Titan')
+
+
+class Effect6855(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer',
+                                      'energyNeutralizerAmount', src.getModifiedItemAttr('shipBonusDreadnoughtA1'), skill='Amarr Dreadnought')
+
+
+class Effect6856(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'maxRange', src.getModifiedItemAttr('shipBonusDreadnoughtM1'), skill='Minmatar Dreadnought')
+
+
+class Effect6857(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'maxRange', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'falloffEffectiveness', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
+
+
+class Effect6858(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu',
+                                      'powerTransferAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryA1'), skill='Amarr Carrier')
+
+
+class Effect6859(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Nosferatu', 'cpu', src.getModifiedItemAttr('shipBonusRole4'))
+
+
+class Effect6860(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'power',
+                                      src.getModifiedItemAttr('shipBonusRole5'))
+
+
+class Effect6861(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Remote Armor Repair Systems'), 'power', src.getModifiedItemAttr('shipBonusRole5'))
+
+
+class Effect6862(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'duration', src.getModifiedItemAttr('shipBonusForceAuxiliaryM1'), skill='Minmatar Carrier')
+
+
+class Effect6865(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusCovertOps1'), skill='Covert Ops')
+
+
+class Effect6866(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Rockets'),
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Light Missiles'),
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCF'), skill='Caldari Frigate')
+
+
+class Effect6867(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Projectile Turret'),
+                                      'speed', src.getModifiedItemAttr('shipBonusMF'), skill='Minmatar Frigate')
+
+
+class Effect6871(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+
+        # Get pilot sec status bonus directly here, instead of going through the intermediary effects
+        # via https://forums.eveonline.com/default.aspx?g=posts&t=515826
+        try:
+            bonus = max(0, min(50.0, (src.parent.character.secStatus * 10)))
+        except:
+            bonus = None
+
+        if bonus is not None:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', bonus, stackingPenalties=True)
+            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'shieldBonus', bonus, stackingPenalties=True)
+
+
+class Effect6872(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange', src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect6873(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6874(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'explosionDelay', src.getModifiedItemAttr('shipBonusCC2'), skill='Caldari Cruiser')
+
+
+class Effect6877(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('eliteBonusBlackOps1'), stackingPenalties=True, skill='Black Ops')
+
+
+class Effect6878(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusBlackOps4'), stackingPenalties=True, skill='Black Ops')
+
+
+class Effect6879(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange',
+                                      src.getModifiedItemAttr('eliteBonusBlackOps3'), stackingPenalties=True, skill='Black Ops')
+
+
+class Effect6880(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Cruise', 'speed',
+                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo', 'speed',
+                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Rapid Heavy', 'speed',
+                                      src.getModifiedItemAttr('shipBonus2CB'), skill='Caldari Battleship')
+
+
+class Effect6881(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosionDelay',
+                                        src.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'explosionDelay',
+                                        src.getModifiedItemAttr('shipBonusCB'), skill='Caldari Battleship')
+
+
+class Effect6883(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Repair Systems'),
+                                      'armorDamageAmount', src.getModifiedItemAttr('shipBonusForceAuxiliaryM2'), skill='Minmatar Carrier')
+
+
+class Effect6894(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'),
+        'cpu', src.getModifiedItemAttr('subsystemEnergyNeutFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'),
+                                      'power', src.getModifiedItemAttr('subsystemEnergyNeutFittingReduction'))
+
+
+class Effect6895(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'cpu', src.getModifiedItemAttr('subsystemMETFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Energy Turret'),
+                                      'power', src.getModifiedItemAttr('subsystemMETFittingReduction'))
+
+
+class Effect6896(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'cpu', src.getModifiedItemAttr('subsystemMHTFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'),
+                                      'power', src.getModifiedItemAttr('subsystemMHTFittingReduction'))
+
+
+class Effect6897(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'power', src.getModifiedItemAttr('subsystemMPTFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Projectile Turret'),
+                                      'cpu', src.getModifiedItemAttr('subsystemMPTFittingReduction'))
+
+
+class Effect6898(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') and
+                                                  mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
+                                      'cpu', src.getModifiedItemAttr('subsystemMRARFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems') and
+                                                  mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
+                                      'power', src.getModifiedItemAttr('subsystemMRARFittingReduction'))
+
+
+class Effect6899(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') and
+                                                  mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
+                                      'cpu', src.getModifiedItemAttr('subsystemMRSBFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') and
+                                                  mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
+                                      'power', src.getModifiedItemAttr('subsystemMRSBFittingReduction'))
+
+
+class Effect6900(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Missile Launcher Heavy', 'Missile Launcher Rapid Light', 'Missile Launcher Heavy Assault')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'cpu', src.getModifiedItemAttr('subsystemMMissileFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                      'power', src.getModifiedItemAttr('subsystemMMissileFittingReduction'))
+
+
+class Effect6908(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserCaldari2'),
+                                      skill='Caldari Strategic Cruiser')
+
+
+class Effect6909(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserAmarr2'),
+                                      skill='Amarr Strategic Cruiser')
+
+
+class Effect6910(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserGallente2'),
+                                      skill='Gallente Strategic Cruiser')
+
+
+class Effect6911(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: True, 'moduleRepairRate',
+                                      ship.getModifiedItemAttr('shipBonusStrategicCruiserMinmatar2'),
+                                      skill='Minmatar Strategic Cruiser')
+
+
+class Effect6920(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.increaseItemAttr('hp', module.getModifiedItemAttr('structureHPBonusAdd') or 0)
+
+
+class Effect6921(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'),
+                                        skill='Amarr Defensive Systems')
+
+
+class Effect6923(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles') or mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                      'maxVelocity', container.getModifiedItemAttr('subsystemBonusMinmatarOffensive'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect6924(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+                                      'aoeVelocity', container.getModifiedItemAttr('subsystemBonusMinmatarOffensive3'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect6925(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'maxVelocity', src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'),
+                                     skill='Gallente Offensive Systems')
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'),
+                                     'trackingSpeed', src.getModifiedItemAttr('subsystemBonusGallenteOffensive2'),
+                                     skill='Gallente Offensive Systems')
+
+
+class Effect6926(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion'), skill='Amarr Propulsion Systems')
+
+
+class Effect6927(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpCapacitorNeed', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion'),
+                               skill='Minmatar Propulsion Systems')
+
+
+class Effect6928(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner') or mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'overloadSpeedFactorBonus', src.getModifiedItemAttr('subsystemBonusCaldariPropulsion2'),
+                                      skill='Caldari Propulsion Systems')
+
+
+class Effect6929(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner') or mod.item.requiresSkill('High Speed Maneuvering'),
+                                      'overloadSpeedFactorBonus', src.getModifiedItemAttr('subsystemBonusGallentePropulsion2'),
+                                      skill='Gallente Propulsion Systems')
+
+
+class Effect6930(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusAmarrCore2'), skill='Amarr Core Systems')
+
+
+class Effect6931(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusMinmatarCore2'),
+                               skill='Minmatar Core Systems')
+
+
+class Effect6932(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusGallenteCore2'),
+                               skill='Gallente Core Systems')
+
+
+class Effect6933(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('energyWarfareResistance', src.getModifiedItemAttr('subsystemBonusCaldariCore2'),
+                               skill='Caldari Core Systems')
+
+
+class Effect6934(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('maxLockedTargets', src.getModifiedItemAttr('maxLockedTargetsBonus'))
+
+
+class Effect6935(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Energy Nosferatu', 'Energy Neutralizer'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrCore3'), skill='Amarr Core Systems')
+
+
+class Effect6936(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web',
+                                      'overloadRangeBonus', src.getModifiedItemAttr('subsystemBonusMinmatarCore3'),
+                                      skill='Minmatar Core Systems')
+
+
+class Effect6937(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'overloadRangeBonus',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteCore3'), skill='Gallente Core Systems')
+
+
+class Effect6938(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'ECM', 'overloadECMStrengthBonus',
+                                      src.getModifiedItemAttr('subsystemBonusCaldariCore3'), skill='Caldari Core Systems')
+
+
+class Effect6939(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'), skill='Amarr Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadHardeningBonus',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrDefensive2'), skill='Amarr Defensive Systems')
+
+
+class Effect6940(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadHardeningBonus',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
+
+
+class Effect6941(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Tactical Shield Manipulation'),
+                                      'overloadHardeningBonus', src.getModifiedItemAttr('subsystemBonusCaldariDefensive2'),
+                                      skill='Caldari Defensive Systems')
+
+
+class Effect6942(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Hull Upgrades'), 'overloadHardeningBonus',
+                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Tactical Shield Manipulation'), 'overloadHardeningBonus',
+                                      src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+
+
+class Effect6943(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusAmarrDefensive3'),
+                                      skill='Amarr Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadArmorDamageAmount', src.getModifiedItemAttr('subsystemBonusAmarrDefensive3'),
+                                      skill='Amarr Defensive Systems')
+
+
+class Effect6944(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusGallenteDefensive3'),
+                                      skill='Gallente Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'),
+                                      'overloadArmorDamageAmount', src.getModifiedItemAttr('subsystemBonusGallenteDefensive3'),
+                                      skill='Gallente Defensive Systems')
+
+
+class Effect6945(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'overloadShieldBonus', src.getModifiedItemAttr('subsystemBonusCaldariDefensive3'),
+                                      skill='Caldari Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Operation'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusCaldariDefensive3'),
+                                      skill='Caldari Defensive Systems')
+
+
+class Effect6946(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Shield Operation'),
+                                      'overloadArmorDamageAmount', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive3'),
+                                      skill='Minmatar Defensive Systems')
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems') or mod.item.requiresSkill('Shield Operation'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusMinmatarDefensive3'),
+                                      skill='Minmatar Defensive Systems')
+
+
+class Effect6947(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'),
+                                        'baseSensorStrength', src.getModifiedItemAttr('subsystemBonusCaldariDefensive2'),
+                                        skill='Caldari Defensive Systems')
+
+
+class Effect6949(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'), 'baseSensorStrength',
+                                        src.getModifiedItemAttr('subsystemBonusGallenteDefensive2'), skill='Gallente Defensive Systems')
+
+
+class Effect6951(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'), 'baseSensorStrength',
+                                        src.getModifiedItemAttr('subsystemBonusMinmatarDefensive2'), skill='Minmatar Defensive Systems')
+
+
+class Effect6953(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        module.multiplyItemAttr('power', module.getModifiedItemAttr('mediumRemoteRepFittingMultiplier'))
+        module.multiplyItemAttr('cpu', module.getModifiedItemAttr('mediumRemoteRepFittingMultiplier'))
+
+
+class Effect6954(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'power',
+                                      src.getModifiedItemAttr('subsystemCommandBurstFittingReduction'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Leadership'), 'cpu',
+                                      src.getModifiedItemAttr('subsystemCommandBurstFittingReduction'))
+
+
+class Effect6955(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Remote Shield Booster', 'Ancillary Remote Shield Booster'),
+                                      'falloffEffectiveness', src.getModifiedItemAttr('remoteShieldBoosterFalloffBonus'))
+
+
+class Effect6956(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Remote Armor Repairer', 'Ancillary Remote Armor Repairer'),
+                                      'maxRange', src.getModifiedItemAttr('remoteArmorRepairerOptimalBonus'))
+
+
+class Effect6957(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Remote Armor Repairer', 'Ancillary Remote Armor Repairer'),
+                                      'falloffEffectiveness', src.getModifiedItemAttr('remoteArmorRepairerFalloffBonus'))
+
+
+class Effect6958(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusAmarrOffensive3'), skill='Amarr Offensive Systems')
+
+
+class Effect6959(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'), 'overloadSelfDurationBonus',
+                                      src.getModifiedItemAttr('subsystemBonusGallenteOffensive3'), skill='Gallente Offensive Systems')
+
+
+class Effect6960(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusCaldariOffensive3'),
+                                      skill='Caldari Offensive Systems')
+
+
+class Effect6961(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Shield Emission Systems') or mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'overloadSelfDurationBonus', src.getModifiedItemAttr('subsystemBonusMinmatarOffensive3'),
+                                      skill='Minmatar Offensive Systems')
+
+
+class Effect6962(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusAmarrPropulsion2'),
+                               skill='Amarr Propulsion Systems')
+
+
+class Effect6963(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('subsystemBonusMinmatarPropulsion2'),
+                               skill='Minmatar Propulsion Systems')
+
+
+class Effect6964(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('baseWarpSpeed', module.getModifiedItemAttr('subsystemBonusGallentePropulsion'),
+                               skill='Gallente Propulsion Systems')
+
+
+class Effect6981(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG1'), skill='Gallente Titan')
+
+
+class Effect6982(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'explosiveDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'emDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'emDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'explosiveDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'emDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'explosiveDamage',
+                                      src.getModifiedItemAttr('shipBonusTitanG2'), skill='Gallente Titan')
+
+
+class Effect6983(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('shipBonusTitanC1'), skill='Caldari Titan')
+
+
+class Effect6984(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'shieldCapacity',
+                                       src.getModifiedItemAttr('shipBonusRole4'))
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityAttackTurretDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusRole4'))
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityAttackMissileDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusRole4'))
+        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill('Fighters'), 'fighterAbilityMissilesDamageMultiplier',
+                                       src.getModifiedItemAttr('shipBonusRole4'))
+
+
+class Effect6985(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('Torpedoes'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Torpedoes'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'thermalDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+        fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill('XL Cruise Missiles'), 'kineticDamage',
+                                      src.getModifiedItemAttr('shipBonusDreadnoughtG1'), skill='Gallente Dreadnought')
+
+
+class Effect6986(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capital Shield Emission Systems'), 'shieldBonus',
+                                      src.getModifiedItemAttr('shipBonusForceAuxiliaryG1'), skill='Gallente Carrier')
+
+
+class Effect6987(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'structureDamageAmount', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'shieldBonus', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'armorDamageAmount', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'armorHP', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'shieldCapacity', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Drone Operation'),
+                                        'hp', src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect6992(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'), 'damageMultiplier', src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect6993(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMissileAOECloudPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterCapacitorCapacityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterAOEVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterArmorRepairAmountPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMissileVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretTrackingPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterShieldCapacityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretOptimalRangePenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterShieldBoostAmountPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterTurretFalloffPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterArmorHPPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+        fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == 'Booster', 'boosterMaxVelocityPenalty', src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect6994(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('eliteBonusReconShip1'), skill='Recon Ships')
+
+
+class Effect6995(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, module, context):
+        # Set reload time to 1 second
+        module.reloadTime = 1000
+
+
+class Effect6996(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
+                                      src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect6997(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount',
+                                      src.getModifiedItemAttr('eliteBonusCovertOps4'), skill='Covert Ops')
+
+
+class Effect6999(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo',
+                                         'cpu', ship.getModifiedItemAttr('stealthBomberLauncherCPU'))
+
+
+class Effect7000(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'), 'falloff',
+                                      src.getModifiedItemAttr('shipBonusGF'), skill='Gallente Frigate')
+
+
+class Effect7001(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Missile Launcher Torpedo', 'speed', src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect7002(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'), 'power', src.getModifiedItemAttr('shipBonusRole3'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Bomb Deployment'), 'cpu', src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect7003(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('eliteBonusCovertOps3'), skill='Covert Ops')
+
+
+class Effect7008(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.multiplyItemAttr('shieldCapacity', src.getModifiedItemAttr('structureFullPowerStateHitpointMultiplier') or 0)
+        fit.ship.multiplyItemAttr('armorHP', src.getModifiedItemAttr('structureFullPowerStateHitpointMultiplier') or 0)
+
+
+class Effect7009(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.forceItemAttr('structureFullPowerStateHitpointMultiplier', src.getModifiedItemAttr('serviceModuleFullPowerStateHitpointMultiplier'))
+
+
+class Effect7012(EffectDef):
+
+    runTime = 'early'
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
+            for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
+                bonus = '%s%sDamageResonance' % (attrPrefix, damageType)
+                bonus = '%s%s' % (bonus[0].lower(), bonus[1:])
+                booster = '%s%sDamageResonance' % (layer, damageType)
+
+                src.forceItemAttr(booster, src.getModifiedItemAttr('resistanceMultiplier'))
+
+
+class Effect7013(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'kineticDamage',
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect7014(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'thermalDamage',
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect7015(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'emDamage',
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect7016(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('eliteBonusGunship1'), skill='Assault Frigates')
+
+
+class Effect7017(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'), 'aoeVelocity',
+                                        src.getModifiedItemAttr('eliteBonusGunship2'), stackingPenalties=True, skill='Assault Frigates')
+
+
+class Effect7018(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Energy Turret'), 'speed',
+                                      src.getModifiedItemAttr('shipBonusAF'), stackingPenalties=False, skill='Amarr Frigate')
+
+
+class Effect7020(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Stasis Web', 'maxRange',
+                                      src.getModifiedItemAttr('stasisWebRangeBonus'), stackingPenalties=False)
+
+
+class Effect7021(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.boostItemAttr('maxTargetRange', module.getModifiedItemAttr('structureRigMaxTargetRangeBonus'))
+
+
+class Effect7024(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'trackingSpeed',
+                                     src.getModifiedItemAttr('eliteBonusGunship2'), skill='Assault Frigates')
+
+
+class Effect7026(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, *args, **kwargs):
+        src.boostItemAttr('maxRange', src.getModifiedChargeAttr('warpScrambleRangeBonus'))
+
+
+class Effect7027(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.increaseItemAttr('capacitorCapacity', ship.getModifiedItemAttr('capacitorBonus'))
+
+
+class Effect7028(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.ship.multiplyItemAttr('rechargeRate', module.getModifiedItemAttr('capacitorRechargeRateMultiplier'))
+
+
+class Effect7029(EffectDef):
+
+    runTime = 'early'
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('hiddenArmorHPMultiplier', src.getModifiedItemAttr('armorHpBonus'), stackingPenalties=True)
+
+
+class Effect7030(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Guided Bomb Launcher',
+                                      'speed', ship.getModifiedItemAttr('structureAoERoFRoleBonus'))
+        for attr in ['duration', 'durationTargetIlluminationBurstProjector', 'durationWeaponDisruptionBurstProjector',
+                     'durationECMJammerBurstProjector', 'durationSensorDampeningBurstProjector', 'capacitorNeed']:
+            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Structure Burst Projector',
+                                          attr, ship.getModifiedItemAttr('structureAoERoFRoleBonus'))
+
+
+class Effect7031(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7032(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7033(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'),
+                                        'emDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7034(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7035(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7036(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7037(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'thermalDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7038(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Assault Missiles'),
+                                        'kineticDamage', src.getModifiedItemAttr('shipBonusCBC2'), skill='Caldari Battlecruiser')
+
+
+class Effect7039(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        groups = ('Structure Anti-Subcapital Missile', 'Structure Anti-Capital Missile')
+        for dmgType in ('em', 'kinetic', 'explosive', 'thermal'):
+            fit.modules.filteredChargeMultiply(lambda mod: mod.item.group.name in groups,
+                                               '%sDamage' % dmgType,
+                                               src.getModifiedItemAttr('hiddenMissileDamageMultiplier'))
+
+
+class Effect7040(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.multiplyItemAttr('armorHP', src.getModifiedItemAttr('hiddenArmorHPMultiplier') or 0)
+
+
+class Effect7042(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('armorHP', src.getModifiedItemAttr('shipBonusAC'), skill='Amarr Cruiser')
+
+
+class Effect7043(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('shieldCapacity', src.getModifiedItemAttr('shipBonusCC'), skill='Caldari Cruiser')
+
+
+class Effect7044(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('agility', src.getModifiedItemAttr('shipBonusGC'), skill='Gallente Cruiser')
+
+
+class Effect7045(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('signatureRadius', src.getModifiedItemAttr('shipBonusMC'), skill='Minmatar Cruiser')
+
+
+class Effect7046(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('explosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('shieldKineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('shieldExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('armorThermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('thermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('shieldEmDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('armorEmDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('shieldThermalDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('kineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('armorKineticDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+        fit.ship.boostItemAttr('emDamageResonance', src.getModifiedItemAttr('eliteBonusFlagCruisers1'), skill='Flag Cruisers')
+
+
+class Effect7047(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Propulsion Module', 'Micro Jump Drive'),
+                                      'power', src.getModifiedItemAttr('flagCruiserFittingBonusPropMods'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Propulsion Module', 'Micro Jump Drive'),
+                                      'cpu', src.getModifiedItemAttr('flagCruiserFittingBonusPropMods'))
+
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Target Painter', 'Scan Probe Launcher'),
+                                      'cpu', src.getModifiedItemAttr('flagCruiserFittingBonusPainterProbes'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ('Target Painter', 'Scan Probe Launcher'),
+                                      'power', src.getModifiedItemAttr('flagCruiserFittingBonusPainterProbes'))
+
+
+class Effect7050(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7051(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7052(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter', 'signatureRadiusBonus',
+                                      src.getModifiedItemAttr('targetPainterStrengthModifierFlagCruisers'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Target Painter', 'maxRange',
+                                      src.getModifiedItemAttr('targetPainterRangeModifierFlagCruisers'))
+
+
+class Effect7055(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Hybrid Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Projectile Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Energy Turret'), 'damageMultiplier',
+                                      src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Heavy Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Torpedoes'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'thermalDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'explosiveDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'kineticDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Cruise Missiles'), 'emDamage',
+                                        src.getModifiedItemAttr('shipBonusRole7'))
+
+
+class Effect7058(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7059(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7060(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 5):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7061(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7062(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7063(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, **kwargs):
+        for x in range(1, 3):
+            if beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x)):
+                value = beacon.getModifiedItemAttr('warfareBuff{}Value'.format(x))
+                id = beacon.getModifiedItemAttr('warfareBuff{}ID'.format(x))
+
+                if id:
+                    fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
+class Effect7064(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+
+class Effect7071(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7072(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7073(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Precursor Weapon'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7074(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Disintegrator Specialization'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7075(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Disintegrator Specialization'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7076(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context):
+        level = container.level if 'skill' in context else 1
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Disintegrator Specialization'),
+                                      'damageMultiplier', container.getModifiedItemAttr('damageMultiplierBonus') * level)
+
+
+class Effect7077(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Precursor Weapon',
+                                         'damageMultiplier', module.getModifiedItemAttr('damageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect7078(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == 'Precursor Weapon',
+                                         'speed', module.getModifiedItemAttr('speedMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect7079(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Precursor Weapon'),
+                                      'speed', ship.getModifiedItemAttr('shipBonusPBS1'), skill='Precursor Battleship')
+
+
+class Effect7080(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Large Precursor Weapon'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPBS2'), skill='Precursor Battleship')
+
+
+class Effect7085(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
+
+
+class Effect7086(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
+                                      'trackingSpeed', ship.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser')
+
+
+class Effect7087(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusPF2'), skill='Precursor Frigate')
+
+
+class Effect7088(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPF1'), skill='Precursor Frigate')
+
+
+class Effect7091(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Capacitor Emission Systems'), 'capacitorNeed', src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect7092(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect7093(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Energy Pulse Weapons'),
+                                      'capacitorNeed', ship.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect7094(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Remote Armor Repair Systems'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect7097(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Precursor Weapon',
+                                      'damageMultiplier', skill.getModifiedItemAttr('damageMultiplierBonus') * skill.level)
+
+
+class Effect7111(EffectDef):
+
+    runTime = 'early'
+    type = ('projected', 'passive')
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                         'damageMultiplier', module.getModifiedItemAttr('smallWeaponDamageMultiplier'),
+                                         stackingPenalties=True)
+
+
+class Effect7112(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Neutralizer', 'capacitorNeed',
+                                      src.getModifiedItemAttr('shipBonusRole2'))
+
+
+class Effect7116(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill('Astrometrics'), 'baseSensorStrength',
+                                        src.getModifiedItemAttr('eliteBonusReconShip2'), skill='Recon Ships')
+
+
+class Effect7117(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.boostItemAttr('warpSpeedMultiplier', src.getModifiedItemAttr('shipRoleBonusWarpSpeed'))
+
+
+class Effect7118(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'), 'damageMultiplierBonusPerCycle',
+                                         src.getModifiedItemAttr('eliteBonusCovertOps3'), skill='Covert Ops')
+
+
+class Effect7119(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'), 'damageMultiplierBonusPerCycle',
+                                         src.getModifiedItemAttr('eliteBonusReconShip3'), skill='Recon Ships')
+
+
+class Effect7142(EffectDef):
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.ship.increaseItemAttr('warpScrambleStatus', src.getModifiedItemAttr('warpScrambleStrength'))
+        fit.ship.boostItemAttr('mass', src.getModifiedItemAttr('massBonusPercentage'), stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'), 'speedFactor',
+                                      src.getModifiedItemAttr('speedFactorBonus'), stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Afterburner'), 'speedBoostFactor',
+                                      src.getModifiedItemAttr('speedBoostFactorBonus'))
+        fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill('High Speed Maneuvering'), 'activationBlocked',
+                                         src.getModifiedItemAttr('activationBlockedStrenght'))
+        fit.ship.boostItemAttr('maxVelocity', src.getModifiedItemAttr('maxVelocityBonus'), stackingPenalties=True)
+
+
+class Effect7154(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPD1'),
+                                      skill='Precursor Destroyer')
+
+
+class Effect7155(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
+                                      'damageMultiplier', ship.getModifiedItemAttr('shipBonusPBC1'),
+                                      skill='Precursor Battlecruiser')
+
+
+class Effect7156(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'maxRange', ship.getModifiedItemAttr('maxRangeBonus'))
+
+
+class Effect7157(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Small Precursor Weapon'),
+                                      'maxRange', ship.getModifiedItemAttr('shipBonusPD2'),
+                                      skill='Precursor Destroyer')
+
+
+class Effect7158(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorKineticDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
+                               skill='Precursor Battlecruiser')
+
+
+class Effect7159(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorThermalDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
+                               skill='Precursor Battlecruiser')
+
+
+class Effect7160(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorEmDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
+                               skill='Precursor Battlecruiser')
+
+
+class Effect7161(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.ship.boostItemAttr('armorExplosiveDamageResonance', ship.getModifiedItemAttr('shipBonusPBC2'),
+                               skill='Precursor Battlecruiser')
+
+
+class Effect7162(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Medium Precursor Weapon'),
+                                      'maxRange', ship.getModifiedItemAttr('roleBonusCBC'))
+
+
+class Effect7166(EffectDef):
+
+    runTime = 'late'
+    type = 'projected', 'active'
+
+    @staticmethod
+    def handler(fit, container, context, **kwargs):
+        if 'projected' in context:
+            repAmountBase = container.getModifiedItemAttr('armorDamageAmount')
+            cycleTime = container.getModifiedItemAttr('duration') / 1000.0
+            repSpoolMax = container.getModifiedItemAttr('repairMultiplierBonusMax')
+            repSpoolPerCycle = container.getModifiedItemAttr('repairMultiplierBonusPerCycle')
+            defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage']
+            spoolType, spoolAmount = resolveSpoolOptions(SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False), container)
+            rps = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, spoolType, spoolAmount)[0]) / cycleTime
+            rpsPreSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SCALE, 0)[0]) / cycleTime
+            rpsFullSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SCALE, 1)[0]) / cycleTime
+            fit.extraAttributes.increase('armorRepair', rps, **kwargs)
+            fit.extraAttributes.increase('armorRepairPreSpool', rpsPreSpool, **kwargs)
+            fit.extraAttributes.increase('armorRepairFullSpool', rpsFullSpool, **kwargs)
+
+
+class Effect7167(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Remote Capacitor Transmitter', 'maxRange', src.getModifiedItemAttr('shipBonusRole1'))
+
+
+class Effect7168(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'maxRange', src.getModifiedItemAttr('shipBonusRole3'))
+
+
+class Effect7169(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'armorDamageAmount', src.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
+
+
+class Effect7170(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'capacitorNeed', src.getModifiedItemAttr('shipBonusPC2'), skill='Precursor Cruiser')
+
+
+class Effect7171(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'maxRange', src.getModifiedItemAttr('shipBonusPC1'), skill='Precursor Cruiser')
+
+
+class Effect7172(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'capacitorNeed', src.getModifiedItemAttr('eliteBonusLogistics1'), skill='Logistics Cruisers')
+
+
+class Effect7173(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mutadaptive Remote Armor Repairer', 'armorDamageAmount', src.getModifiedItemAttr('eliteBonusLogistics2'), skill='Logistics Cruisers')
+
+
+class Effect7176(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'damageMultiplier',
+                                     src.getModifiedItemAttr('damageMultiplierBonus'))
+
+
+class Effect7177(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('hullHpBonus'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('armorHpBonus'))
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('shieldCapacityBonus'))
+
+
+class Effect7179(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Strip Miner',
+                                      'duration', module.getModifiedItemAttr('miningDurationMultiplier'))
+
+
+class Effect7180(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Mining Laser',
+                                      'duration', module.getModifiedItemAttr('miningDurationMultiplier'))
+
+
+class Effect7183(EffectDef):
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Warp Scrambler', 'maxRange',
+                                      src.getModifiedItemAttr('warpScrambleRangeBonus'), stackingPenalties=False)
diff --git a/eos/effects/__init__.py b/eos/effects/__init__.py
deleted file mode 100644
index daa8ffc73..000000000
--- a/eos/effects/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# ===============================================================================
-# Copyright (C) 2010 Diego Duclos
-#               2010 Anton Vorobyov
-#
-# This file, as well as all files in this folder, are 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/>.
-# ===============================================================================
diff --git a/eos/effects/effect10.py b/eos/effects/effect10.py
deleted file mode 100644
index c0057acc5..000000000
--- a/eos/effects/effect10.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# targetAttack
-#
-# Used by:
-# Drones from group: Combat Drone (75 of 75)
-# Modules from group: Energy Weapon (212 of 214)
-type = 'active'
-
-
-def handler(fit, module, context):
-    # Set reload time to 1 second
-    module.reloadTime = 1000
diff --git a/eos/effects/effect1001.py b/eos/effects/effect1001.py
deleted file mode 100644
index ddce4507c..000000000
--- a/eos/effects/effect1001.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusGunshipCapRecharge2
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
diff --git a/eos/effects/effect1003.py b/eos/effects/effect1003.py
deleted file mode 100644
index 92a516038..000000000
--- a/eos/effects/effect1003.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallLaserPulseDamageBonus
-#
-# Used by:
-# Skill: Small Pulse Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Pulse Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1004.py b/eos/effects/effect1004.py
deleted file mode 100644
index b6cd4b2fd..000000000
--- a/eos/effects/effect1004.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallLaserBeamDamageBonus
-#
-# Used by:
-# Skill: Small Beam Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Beam Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1005.py b/eos/effects/effect1005.py
deleted file mode 100644
index 3bc3b79c1..000000000
--- a/eos/effects/effect1005.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallHybridBlasterDamageBonus
-#
-# Used by:
-# Skill: Small Blaster Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Blaster Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1006.py b/eos/effects/effect1006.py
deleted file mode 100644
index 8da445f83..000000000
--- a/eos/effects/effect1006.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallHybridRailDamageBonus
-#
-# Used by:
-# Skill: Small Railgun Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Railgun Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1007.py b/eos/effects/effect1007.py
deleted file mode 100644
index d86b1ed90..000000000
--- a/eos/effects/effect1007.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallProjectileACDamageBonus
-#
-# Used by:
-# Skill: Small Autocannon Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Autocannon Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1008.py b/eos/effects/effect1008.py
deleted file mode 100644
index 52510d1cb..000000000
--- a/eos/effects/effect1008.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2SmallProjectileArtyDamageBonus
-#
-# Used by:
-# Skill: Small Artillery Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Artillery Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1009.py b/eos/effects/effect1009.py
deleted file mode 100644
index 021493979..000000000
--- a/eos/effects/effect1009.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumLaserPulseDamageBonus
-#
-# Used by:
-# Skill: Medium Pulse Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Pulse Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect101.py b/eos/effects/effect101.py
deleted file mode 100644
index 7376dd563..000000000
--- a/eos/effects/effect101.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# useMissiles
-#
-# Used by:
-# Modules from group: Missile Launcher Heavy (12 of 12)
-# Modules from group: Missile Launcher Rocket (15 of 15)
-# Modules named like: Launcher (154 of 154)
-# Structure Modules named like: Standup Launcher (7 of 7)
-type = 'active', "projected"
-
-
-def handler(fit, src, context):
-    # Set reload time to 10 seconds
-    src.reloadTime = 10000
-
-    if "projected" in context:
-        if src.item.group.name == 'Missile Launcher Bomb':
-            # Bomb Launcher Cooldown Timer
-            moduleReactivationDelay = src.getModifiedItemAttr("moduleReactivationDelay")
-            speed = src.getModifiedItemAttr("speed")
-
-            # Void and Focused Void Bombs
-            neutAmount = src.getModifiedChargeAttr("energyNeutralizerAmount")
-
-            if moduleReactivationDelay and neutAmount and speed:
-                fit.addDrain(src, speed + moduleReactivationDelay, neutAmount, 0)
-
-            # Lockbreaker Bombs
-            ecmStrengthBonus = src.getModifiedChargeAttr("scan{0}StrengthBonus".format(fit.scanType))
-
-            if ecmStrengthBonus:
-                strModifier = 1 - ecmStrengthBonus / fit.scanStrength
-                fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect1010.py b/eos/effects/effect1010.py
deleted file mode 100644
index e509d73de..000000000
--- a/eos/effects/effect1010.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumLaserBeamDamageBonus
-#
-# Used by:
-# Skill: Medium Beam Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Beam Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1011.py b/eos/effects/effect1011.py
deleted file mode 100644
index ca7dffdf5..000000000
--- a/eos/effects/effect1011.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumHybridBlasterDamageBonus
-#
-# Used by:
-# Skill: Medium Blaster Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Blaster Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1012.py b/eos/effects/effect1012.py
deleted file mode 100644
index 77b6c5abb..000000000
--- a/eos/effects/effect1012.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumHybridRailDamageBonus
-#
-# Used by:
-# Skill: Medium Railgun Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Railgun Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1013.py b/eos/effects/effect1013.py
deleted file mode 100644
index a18d3914a..000000000
--- a/eos/effects/effect1013.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumProjectileACDamageBonus
-#
-# Used by:
-# Skill: Medium Autocannon Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Autocannon Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1014.py b/eos/effects/effect1014.py
deleted file mode 100644
index 8b091e5d8..000000000
--- a/eos/effects/effect1014.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2MediumProjectileArtyDamageBonus
-#
-# Used by:
-# Skill: Medium Artillery Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Artillery Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1015.py b/eos/effects/effect1015.py
deleted file mode 100644
index 4714dd913..000000000
--- a/eos/effects/effect1015.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeLaserPulseDamageBonus
-#
-# Used by:
-# Skill: Large Pulse Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Pulse Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1016.py b/eos/effects/effect1016.py
deleted file mode 100644
index 0a4cbafde..000000000
--- a/eos/effects/effect1016.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeLaserBeamDamageBonus
-#
-# Used by:
-# Skill: Large Beam Laser Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Beam Laser Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1017.py b/eos/effects/effect1017.py
deleted file mode 100644
index 929509540..000000000
--- a/eos/effects/effect1017.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeHybridBlasterDamageBonus
-#
-# Used by:
-# Skill: Large Blaster Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Blaster Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1018.py b/eos/effects/effect1018.py
deleted file mode 100644
index 6742d22d8..000000000
--- a/eos/effects/effect1018.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeHybridRailDamageBonus
-#
-# Used by:
-# Skill: Large Railgun Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Railgun Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1019.py b/eos/effects/effect1019.py
deleted file mode 100644
index 0b3e4c6e3..000000000
--- a/eos/effects/effect1019.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeProjectileACDamageBonus
-#
-# Used by:
-# Skill: Large Autocannon Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Autocannon Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1020.py b/eos/effects/effect1020.py
deleted file mode 100644
index 245a64866..000000000
--- a/eos/effects/effect1020.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# selfT2LargeProjectileArtyDamageBonus
-#
-# Used by:
-# Skill: Large Artillery Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Artillery Specialization"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1021.py b/eos/effects/effect1021.py
deleted file mode 100644
index 2b5b31e5d..000000000
--- a/eos/effects/effect1021.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusGunshipHybridDmg2
-#
-# Used by:
-# Ship: Harpy
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"),
-                                  skill="Assault Frigates")
diff --git a/eos/effects/effect1024.py b/eos/effects/effect1024.py
deleted file mode 100644
index aaf6de930..000000000
--- a/eos/effects/effect1024.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileHeavyVelocityBonusCC2
-#
-# Used by:
-# Ship: Caracal
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1025.py b/eos/effects/effect1025.py
deleted file mode 100644
index 32a307ef8..000000000
--- a/eos/effects/effect1025.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileLightVelocityBonusCC2
-#
-# Used by:
-# Ship: Caracal
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1030.py b/eos/effects/effect1030.py
deleted file mode 100644
index 73ff83db6..000000000
--- a/eos/effects/effect1030.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# remoteArmorSystemsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringRemoteArmorSystems
-#
-# Used by:
-# Implants named like: Inherent Implants 'Noble' Remote Armor Repair Systems RA (6 of 6)
-# Modules named like: Remote Repair Augmentor (6 of 8)
-# Skill: Remote Armor Repair Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1033.py b/eos/effects/effect1033.py
deleted file mode 100644
index 2c954a502..000000000
--- a/eos/effects/effect1033.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusLogisticRemoteArmorRepairCapNeed1
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect1034.py b/eos/effects/effect1034.py
deleted file mode 100644
index bb031021b..000000000
--- a/eos/effects/effect1034.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticRemoteArmorRepairCapNeed2
-#
-# Used by:
-# Ship: Guardian
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect1035.py b/eos/effects/effect1035.py
deleted file mode 100644
index 81b94ee96..000000000
--- a/eos/effects/effect1035.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusLogisticShieldTransferCapNeed2
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect1036.py b/eos/effects/effect1036.py
deleted file mode 100644
index 3060ef3be..000000000
--- a/eos/effects/effect1036.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticShieldTransferCapNeed1
-#
-# Used by:
-# Ship: Basilisk
-# Ship: Etana
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect1046.py b/eos/effects/effect1046.py
deleted file mode 100644
index 737631924..000000000
--- a/eos/effects/effect1046.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRemoteArmorRangeGC1
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange",
-                                  src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect1047.py b/eos/effects/effect1047.py
deleted file mode 100644
index 05e10ee65..000000000
--- a/eos/effects/effect1047.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRemoteArmorRangeAC2
-#
-# Used by:
-# Ship: Guardian
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect1048.py b/eos/effects/effect1048.py
deleted file mode 100644
index fc9ef4cfd..000000000
--- a/eos/effects/effect1048.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldTransferRangeCC1
-#
-# Used by:
-# Ship: Basilisk
-# Ship: Etana
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange",
-                                  src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1049.py b/eos/effects/effect1049.py
deleted file mode 100644
index f7096dea4..000000000
--- a/eos/effects/effect1049.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipShieldTransferRangeMC2
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "maxRange",
-                                  src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect1056.py b/eos/effects/effect1056.py
deleted file mode 100644
index 1c697dcd9..000000000
--- a/eos/effects/effect1056.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipHybridOptimal1
-#
-# Used by:
-# Ship: Eagle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1057.py b/eos/effects/effect1057.py
deleted file mode 100644
index 4d9a93161..000000000
--- a/eos/effects/effect1057.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipProjectileOptimal1
-#
-# Used by:
-# Ship: Muninn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1058.py b/eos/effects/effect1058.py
deleted file mode 100644
index 8b292f824..000000000
--- a/eos/effects/effect1058.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipLaserOptimal1
-#
-# Used by:
-# Ship: Zealot
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1060.py b/eos/effects/effect1060.py
deleted file mode 100644
index 310bc6bb1..000000000
--- a/eos/effects/effect1060.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipProjectileFallOff1
-#
-# Used by:
-# Ship: Vagabond
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1061.py b/eos/effects/effect1061.py
deleted file mode 100644
index c2cfc53cb..000000000
--- a/eos/effects/effect1061.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusHeavyGunshipHybridDmg2
-#
-# Used by:
-# Ship: Deimos
-# Ship: Eagle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1062.py b/eos/effects/effect1062.py
deleted file mode 100644
index fb52f881d..000000000
--- a/eos/effects/effect1062.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipLaserDmg2
-#
-# Used by:
-# Ship: Zealot
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1063.py b/eos/effects/effect1063.py
deleted file mode 100644
index a4f3e915b..000000000
--- a/eos/effects/effect1063.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipProjectileTracking2
-#
-# Used by:
-# Ship: Muninn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1080.py b/eos/effects/effect1080.py
deleted file mode 100644
index 11e858e78..000000000
--- a/eos/effects/effect1080.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipHybridFallOff1
-#
-# Used by:
-# Ship: Deimos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1081.py b/eos/effects/effect1081.py
deleted file mode 100644
index 3e2799483..000000000
--- a/eos/effects/effect1081.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipHeavyMissileFlightTime1
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1082.py b/eos/effects/effect1082.py
deleted file mode 100644
index c4244df02..000000000
--- a/eos/effects/effect1082.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipLightMissileFlightTime1
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1084.py b/eos/effects/effect1084.py
deleted file mode 100644
index 8c2a95017..000000000
--- a/eos/effects/effect1084.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusHeavyGunshipDroneControlRange1
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.extraAttributes.increase("droneControlRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                 skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1087.py b/eos/effects/effect1087.py
deleted file mode 100644
index 92a9f9049..000000000
--- a/eos/effects/effect1087.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipProjectileDmg2
-#
-# Used by:
-# Ship: Vagabond
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect1099.py b/eos/effects/effect1099.py
deleted file mode 100644
index 588b6c7ff..000000000
--- a/eos/effects/effect1099.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipProjectileTrackingMF2
-#
-# Used by:
-# Variations of ship: Slasher (3 of 3)
-# Ship: Republic Fleet Firetail
-# Ship: Wolf
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect1176.py b/eos/effects/effect1176.py
deleted file mode 100644
index ef24601d2..000000000
--- a/eos/effects/effect1176.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# accerationControlSkillAb&MwdSpeedBoost
-#
-# Used by:
-# Implant: Zor's Custom Navigation Hyper-Link
-# Skill: Acceleration Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "speedFactor", container.getModifiedItemAttr("speedFBonus") * level)
diff --git a/eos/effects/effect1179.py b/eos/effects/effect1179.py
deleted file mode 100644
index 198854651..000000000
--- a/eos/effects/effect1179.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusGunshipLaserDamage2
-#
-# Used by:
-# Ship: Retribution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"),
-                                  skill="Assault Frigates")
diff --git a/eos/effects/effect118.py b/eos/effects/effect118.py
deleted file mode 100644
index 9e1f52524..000000000
--- a/eos/effects/effect118.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# electronicAttributeModifyOnline
-#
-# Used by:
-# Modules from group: Automated Targeting System (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("maxLockedTargets", module.getModifiedItemAttr("maxLockedTargetsBonus"))
diff --git a/eos/effects/effect1181.py b/eos/effects/effect1181.py
deleted file mode 100644
index 14d95aae6..000000000
--- a/eos/effects/effect1181.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticEnergyTransferCapNeed1
-#
-# Used by:
-# Ship: Guardian
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect1182.py b/eos/effects/effect1182.py
deleted file mode 100644
index 95b5cac92..000000000
--- a/eos/effects/effect1182.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipEnergyTransferRange1
-#
-# Used by:
-# Ship: Guardian
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect1183.py b/eos/effects/effect1183.py
deleted file mode 100644
index a18cb0a34..000000000
--- a/eos/effects/effect1183.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusLogisticEnergyTransferCapNeed2
-#
-# Used by:
-# Ship: Basilisk
-# Ship: Etana
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect1184.py b/eos/effects/effect1184.py
deleted file mode 100644
index 3f65366f2..000000000
--- a/eos/effects/effect1184.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyTransferRange2
-#
-# Used by:
-# Ship: Basilisk
-# Ship: Etana
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1185.py b/eos/effects/effect1185.py
deleted file mode 100644
index c7e19707f..000000000
--- a/eos/effects/effect1185.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureStealthEmitterArraySigDecrease
-#
-# Used by:
-# Implants named like: X Instinct Booster (4 of 4)
-# Implants named like: grade Halo (15 of 18)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("signatureRadius", implant.getModifiedItemAttr("signatureRadiusBonus"))
diff --git a/eos/effects/effect1190.py b/eos/effects/effect1190.py
deleted file mode 100644
index 7066cba7b..000000000
--- a/eos/effects/effect1190.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# iceHarvestCycleTimeModulesRequiringIceHarvesting
-#
-# Used by:
-# Implants named like: Inherent Implants 'Yeti' Ice Harvesting IH (3 of 3)
-# Module: Medium Ice Harvester Accelerator I
-# Skill: Ice Harvesting
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", container.getModifiedItemAttr("iceHarvestCycleBonus") * level)
diff --git a/eos/effects/effect1200.py b/eos/effects/effect1200.py
deleted file mode 100644
index c8a6c04f3..000000000
--- a/eos/effects/effect1200.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# miningInfoMultiplier
-#
-# Used by:
-# Charges from group: Mining Crystal (40 of 40)
-# Charges named like: Mining Crystal (42 of 42)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("specialtyMiningAmount",
-                            module.getModifiedChargeAttr("specialisationAsteroidYieldMultiplier"))
-    # module.multiplyItemAttr("miningAmount", module.getModifiedChargeAttr("specialisationAsteroidYieldMultiplier"))
diff --git a/eos/effects/effect1212.py b/eos/effects/effect1212.py
deleted file mode 100644
index 68a126d49..000000000
--- a/eos/effects/effect1212.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# crystalMiningamountInfo2
-#
-# Used by:
-# Modules from group: Frequency Mining Laser (3 of 3)
-type = "passive"
-runTime = "late"
-
-def handler(fit, module, context):
-    module.preAssignItemAttr("specialtyMiningAmount", module.getModifiedItemAttr("miningAmount"))
diff --git a/eos/effects/effect1215.py b/eos/effects/effect1215.py
deleted file mode 100644
index 429fd4b91..000000000
--- a/eos/effects/effect1215.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipEnergyDrainAmountAF1
-#
-# Used by:
-# Ship: Caedes
-# Ship: Cruor
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect1218.py b/eos/effects/effect1218.py
deleted file mode 100644
index a9a7fb9eb..000000000
--- a/eos/effects/effect1218.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusPirateSmallHybridDmg
-#
-# Used by:
-# Ship: Daredevil
-# Ship: Hecate
-# Ship: Sunesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1219.py b/eos/effects/effect1219.py
deleted file mode 100644
index 288f21609..000000000
--- a/eos/effects/effect1219.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyVampireTransferAmountBonusAB
-#
-# Used by:
-# Ship: Bhaalgorn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAB"),
-                                  skill="Amarr Battleship")
diff --git a/eos/effects/effect1220.py b/eos/effects/effect1220.py
deleted file mode 100644
index f9a831cf3..000000000
--- a/eos/effects/effect1220.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipEnergyVampireTransferAmountBonusAc
-#
-# Used by:
-# Ship: Ashimmu
-# Ship: Rabisu
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect1221.py b/eos/effects/effect1221.py
deleted file mode 100644
index b7513bbda..000000000
--- a/eos/effects/effect1221.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipStasisWebRangeBonusMB
-#
-# Used by:
-# Ship: Bhaalgorn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect1222.py b/eos/effects/effect1222.py
deleted file mode 100644
index 3b43a9b64..000000000
--- a/eos/effects/effect1222.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipStasisWebRangeBonusMC2
-#
-# Used by:
-# Ship: Ashimmu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect1228.py b/eos/effects/effect1228.py
deleted file mode 100644
index f4f73849f..000000000
--- a/eos/effects/effect1228.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipProjectileTrackingGF
-#
-# Used by:
-# Ship: Chremoas
-# Ship: Dramiel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect1230.py b/eos/effects/effect1230.py
deleted file mode 100644
index 16c3df09c..000000000
--- a/eos/effects/effect1230.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipMissileVelocityPirateFactionFrigate
-#
-# Used by:
-# Ship: Barghest
-# Ship: Garmur
-# Ship: Orthrus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1232.py b/eos/effects/effect1232.py
deleted file mode 100644
index 25a500674..000000000
--- a/eos/effects/effect1232.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipProjectileRofPirateCruiser
-#
-# Used by:
-# Ship: Cynabal
-# Ship: Moracha
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1233.py b/eos/effects/effect1233.py
deleted file mode 100644
index 7d01b20c6..000000000
--- a/eos/effects/effect1233.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-# Ship: Vigilant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1234.py b/eos/effects/effect1234.py
deleted file mode 100644
index 1cea02ec3..000000000
--- a/eos/effects/effect1234.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileVelocityPirateFactionLight
-#
-# Used by:
-# Ship: Corax
-# Ship: Talwar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1239.py b/eos/effects/effect1239.py
deleted file mode 100644
index 9b0a7168f..000000000
--- a/eos/effects/effect1239.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileRofPirateBattleship
-#
-# Used by:
-# Ship: Machariel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1240.py b/eos/effects/effect1240.py
deleted file mode 100644
index 417ed58aa..000000000
--- a/eos/effects/effect1240.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridDmgPirateBattleship
-#
-# Used by:
-# Ship: Vindicator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect1255.py b/eos/effects/effect1255.py
deleted file mode 100644
index 2b318f6f9..000000000
--- a/eos/effects/effect1255.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusBloodraider
-#
-# Used by:
-# Implants named like: grade Talisman (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "durationBonus", implant.getModifiedItemAttr("implantSetBloodraider"))
diff --git a/eos/effects/effect1256.py b/eos/effects/effect1256.py
deleted file mode 100644
index 81d37c598..000000000
--- a/eos/effects/effect1256.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# setBonusBloodraiderNosferatu
-#
-# Used by:
-# Implants named like: grade Talisman (15 of 18)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"),
-                                  "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect1261.py b/eos/effects/effect1261.py
deleted file mode 100644
index 96f1048f5..000000000
--- a/eos/effects/effect1261.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusSerpentis
-#
-# Used by:
-# Implants named like: grade Snake (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "velocityBonus", implant.getModifiedItemAttr("implantSetSerpentis"))
diff --git a/eos/effects/effect1264.py b/eos/effects/effect1264.py
deleted file mode 100644
index c13c7bdea..000000000
--- a/eos/effects/effect1264.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# interceptor2HybridTracking
-#
-# Used by:
-# Ship: Taranis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2"),
-                                  skill="Interceptors")
diff --git a/eos/effects/effect1268.py b/eos/effects/effect1268.py
deleted file mode 100644
index bc71ac1e2..000000000
--- a/eos/effects/effect1268.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# interceptor2LaserTracking
-#
-# Used by:
-# Ship: Crusader
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2"),
-                                  skill="Interceptors")
diff --git a/eos/effects/effect1281.py b/eos/effects/effect1281.py
deleted file mode 100644
index b94832ca0..000000000
--- a/eos/effects/effect1281.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# structuralAnalysisEffect
-#
-# Used by:
-# Implants named like: Inherent Implants 'Noble' Repair Proficiency RP (6 of 6)
-# Modules named like: Auxiliary Nano Pump (8 of 8)
-# Implant: Imperial Navy Modified 'Noble' Implant
-type = "passive"
-
-
-def handler(fit, container, context):
-    penalized = "implant" not in context
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", container.getModifiedItemAttr("repairBonus"),
-                                  stackingPenalties=penalized)
diff --git a/eos/effects/effect1318.py b/eos/effects/effect1318.py
deleted file mode 100644
index 1af9d30f4..000000000
--- a/eos/effects/effect1318.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# ewSkillScanStrengthBonus
-#
-# Used by:
-# Modules named like: Particle Dispersion Augmentor (8 of 8)
-# Skill: Signal Dispersion
-type = "passive"
-
-
-def handler(fit, container, context):
-    groups = ("ECM", "Burst Jammer")
-    level = container.level if "skill" in context else 1
-    for scanType in ("Gravimetric", "Ladar", "Magnetometric", "Radar"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                      "scan{0}StrengthBonus".format(scanType),
-                                      container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level,
-                                      stackingPenalties=False if "skill" in context else True)
diff --git a/eos/effects/effect1360.py b/eos/effects/effect1360.py
deleted file mode 100644
index e7f0f80cb..000000000
--- a/eos/effects/effect1360.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# ewSkillRsdCapNeedBonusSkillLevel
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Sensor Linking SL (6 of 6)
-# Skill: Sensor Linking
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1361.py b/eos/effects/effect1361.py
deleted file mode 100644
index 88e084361..000000000
--- a/eos/effects/effect1361.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# ewSkillTdCapNeedBonusSkillLevel
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Weapon Disruption WD (6 of 6)
-# Skill: Weapon Disruption
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1370.py b/eos/effects/effect1370.py
deleted file mode 100644
index 720cea451..000000000
--- a/eos/effects/effect1370.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# ewSkillTpCapNeedBonusSkillLevel
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Target Painting TG (6 of 6)
-# Skill: Target Painting
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1372.py b/eos/effects/effect1372.py
deleted file mode 100644
index 6b1a25c5d..000000000
--- a/eos/effects/effect1372.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillEwCapNeedSkillLevel
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Electronic Warfare EW (6 of 6)
-# Modules named like: Signal Disruption Amplifier (8 of 8)
-# Skill: Electronic Warfare
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1395.py b/eos/effects/effect1395.py
deleted file mode 100644
index 182c04acf..000000000
--- a/eos/effects/effect1395.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shieldBoostAmplifierPassive
-#
-# Used by:
-# Implants named like: grade Crystal (15 of 18)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", container.getModifiedItemAttr("shieldBoostMultiplier"))
diff --git a/eos/effects/effect1397.py b/eos/effects/effect1397.py
deleted file mode 100644
index 18a708dc1..000000000
--- a/eos/effects/effect1397.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusGuristas
-#
-# Used by:
-# Implants named like: grade Crystal (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "shieldBoostMultiplier", implant.getModifiedItemAttr("implantSetGuristas"))
diff --git a/eos/effects/effect1409.py b/eos/effects/effect1409.py
deleted file mode 100644
index 16c26d373..000000000
--- a/eos/effects/effect1409.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemScanDurationSkillAstrometrics
-#
-# Used by:
-# Implants named like: Poteque 'Prospector' Astrometric Acquisition AQ (3 of 3)
-# Skill: Astrometric Acquisition
-# Skill: Astrometrics
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),
-                                  "duration", container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/effect1410.py b/eos/effects/effect1410.py
deleted file mode 100644
index 80cacae21..000000000
--- a/eos/effects/effect1410.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# propulsionSkillCapNeedBonusSkillLevel
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Propulsion Jamming PJ (6 of 6)
-# Skill: Propulsion Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-
-    level = container.level if "skill" in context else 1
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect1412.py b/eos/effects/effect1412.py
deleted file mode 100644
index 5129958e9..000000000
--- a/eos/effects/effect1412.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHybridOptimalCB
-#
-# Used by:
-# Ship: Rokh
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect1434.py b/eos/effects/effect1434.py
deleted file mode 100644
index 48bdccb60..000000000
--- a/eos/effects/effect1434.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# caldariShipEwStrengthCB
-#
-# Used by:
-# Ship: Scorpion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for sensorType in ("Gravimetric", "Ladar", "Magnetometric", "Radar"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Electronic Warfare"),
-                                      "scan{0}StrengthBonus".format(sensorType),
-                                      ship.getModifiedItemAttr("shipBonusCB"), stackingPenalties=True,
-                                      skill="Caldari Battleship")
diff --git a/eos/effects/effect1441.py b/eos/effects/effect1441.py
deleted file mode 100644
index f595eed45..000000000
--- a/eos/effects/effect1441.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# caldariShipEwOptimalRangeCB3
-#
-# Used by:
-# Ship: Scorpion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/effect1442.py b/eos/effects/effect1442.py
deleted file mode 100644
index 0c0362a85..000000000
--- a/eos/effects/effect1442.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# caldariShipEwOptimalRangeCC2
-#
-# Used by:
-# Ship: Blackbird
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1443.py b/eos/effects/effect1443.py
deleted file mode 100644
index 05a33ec43..000000000
--- a/eos/effects/effect1443.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# caldariShipEwCapacitorNeedCC
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Falcon
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1445.py b/eos/effects/effect1445.py
deleted file mode 100644
index a0d8a7db7..000000000
--- a/eos/effects/effect1445.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillRsdMaxRangeBonus
-#
-# Used by:
-# Modules named like: Particle Dispersion Projector (8 of 8)
-# Skill: Long Distance Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
-                                  "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/effect1446.py b/eos/effects/effect1446.py
deleted file mode 100644
index 901d4c45b..000000000
--- a/eos/effects/effect1446.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillTpMaxRangeBonus
-#
-# Used by:
-# Modules named like: Particle Dispersion Projector (8 of 8)
-# Skill: Long Distance Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/effect1448.py b/eos/effects/effect1448.py
deleted file mode 100644
index 1ed5b55d5..000000000
--- a/eos/effects/effect1448.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillTdMaxRangeBonus
-#
-# Used by:
-# Modules named like: Particle Dispersion Projector (8 of 8)
-# Skill: Long Distance Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/effect1449.py b/eos/effects/effect1449.py
deleted file mode 100644
index 21ab67c21..000000000
--- a/eos/effects/effect1449.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewSkillRsdFallOffBonus
-#
-# Used by:
-# Skill: Frequency Modulation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),
-                                  "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/effect1450.py b/eos/effects/effect1450.py
deleted file mode 100644
index 38eebe10a..000000000
--- a/eos/effects/effect1450.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewSkillTpFallOffBonus
-#
-# Used by:
-# Skill: Frequency Modulation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/effect1451.py b/eos/effects/effect1451.py
deleted file mode 100644
index 6b1490fc6..000000000
--- a/eos/effects/effect1451.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewSkillTdFallOffBonus
-#
-# Used by:
-# Skill: Frequency Modulation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/effect1452.py b/eos/effects/effect1452.py
deleted file mode 100644
index 68cbc4d83..000000000
--- a/eos/effects/effect1452.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# ewSkillEwMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Centurion (10 of 12)
-# Modules named like: Particle Dispersion Projector (8 of 8)
-# Skill: Long Distance Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties="skill" not in context and "implant" not in context)
diff --git a/eos/effects/effect1453.py b/eos/effects/effect1453.py
deleted file mode 100644
index 931a640f6..000000000
--- a/eos/effects/effect1453.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewSkillEwFallOffBonus
-#
-# Used by:
-# Skill: Frequency Modulation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)
diff --git a/eos/effects/effect1472.py b/eos/effects/effect1472.py
deleted file mode 100644
index 0e3bfdddf..000000000
--- a/eos/effects/effect1472.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# missileSkillAoeCloudSizeBonus
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Guided Missile Precision GP (6 of 6)
-# Modules named like: Warhead Rigor Catalyst (8 of 8)
-# Skill: Guided Missile Precision
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalize = False if "skill" in context or "implant" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", container.getModifiedItemAttr("aoeCloudSizeBonus") * level,
-                                    stackingPenalties=penalize)
diff --git a/eos/effects/effect1500.py b/eos/effects/effect1500.py
deleted file mode 100644
index da4472bd4..000000000
--- a/eos/effects/effect1500.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shieldOperationSkillBoostCapacitorNeedBonus
-#
-# Used by:
-# Modules named like: Core Defense Capacitor Safeguard (8 of 8)
-# Skill: Shield Compensation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "capacitorNeed", container.getModifiedItemAttr("shieldBoostCapacitorBonus") * level)
diff --git a/eos/effects/effect1550.py b/eos/effects/effect1550.py
deleted file mode 100644
index bf1267d77..000000000
--- a/eos/effects/effect1550.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ewSkillTargetPaintingStrengthBonus
-#
-# Used by:
-# Skill: Signature Focusing
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus",
-                                  skill.getModifiedItemAttr("scanSkillTargetPaintStrengthBonus") * skill.level)
diff --git a/eos/effects/effect1551.py b/eos/effects/effect1551.py
deleted file mode 100644
index 0140a5d57..000000000
--- a/eos/effects/effect1551.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# minmatarShipEwTargetPainterMF2
-#
-# Used by:
-# Ship: Hyena
-# Ship: Vigil
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMF2"),
-                                  skill="Minmatar Frigate")
diff --git a/eos/effects/effect157.py b/eos/effects/effect157.py
deleted file mode 100644
index ea808b755..000000000
--- a/eos/effects/effect157.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# largeHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeHybridTurret
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Large Hybrid Turret LH (6 of 6)
-# Skill: Large Hybrid Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1577.py b/eos/effects/effect1577.py
deleted file mode 100644
index 1591e9be1..000000000
--- a/eos/effects/effect1577.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# angelsetbonus
-#
-# Used by:
-# Implants named like: grade Halo (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(
-        lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and
-                        "implantSetAngel" in implant.itemModifiedAttributes,
-        "signatureRadiusBonus",
-        implant.getModifiedItemAttr("implantSetAngel"))
diff --git a/eos/effects/effect1579.py b/eos/effects/effect1579.py
deleted file mode 100644
index 48c915f1d..000000000
--- a/eos/effects/effect1579.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# setBonusSansha
-#
-# Used by:
-# Implants named like: grade Slave (18 of 18)
-# Implant: High-grade Halo Omega
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "armorHpBonus", implant.getModifiedItemAttr("implantSetSansha") or 1)
diff --git a/eos/effects/effect1581.py b/eos/effects/effect1581.py
deleted file mode 100644
index 86ff1b5ce..000000000
--- a/eos/effects/effect1581.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# jumpDriveSkillsRangeBonus
-#
-# Used by:
-# Skill: Jump Drive Calibration
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.ship.boostItemAttr("jumpDriveRange", skill.getModifiedItemAttr("jumpDriveRangeBonus") * skill.level)
diff --git a/eos/effects/effect1585.py b/eos/effects/effect1585.py
deleted file mode 100644
index e1668e7c8..000000000
--- a/eos/effects/effect1585.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalTurretSkillLaserDamage
-#
-# Used by:
-# Skill: Capital Energy Turret
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1586.py b/eos/effects/effect1586.py
deleted file mode 100644
index ac4b49115..000000000
--- a/eos/effects/effect1586.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalTurretSkillProjectileDamage
-#
-# Used by:
-# Skill: Capital Projectile Turret
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1587.py b/eos/effects/effect1587.py
deleted file mode 100644
index dac86333a..000000000
--- a/eos/effects/effect1587.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalTurretSkillHybridDamage
-#
-# Used by:
-# Skill: Capital Hybrid Turret
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1588.py b/eos/effects/effect1588.py
deleted file mode 100644
index 9e59f3aea..000000000
--- a/eos/effects/effect1588.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalLauncherSkillCitadelKineticDamage
-#
-# Used by:
-# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL 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"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect159.py b/eos/effects/effect159.py
deleted file mode 100644
index c70854c90..000000000
--- a/eos/effects/effect159.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# mediumEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumEnergyTurret
-#
-# Used by:
-# Implants named like: Inherent Implants 'Lancer' Medium Energy Turret ME (6 of 6)
-# Skill: Medium Energy Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1590.py b/eos/effects/effect1590.py
deleted file mode 100644
index 28fdae111..000000000
--- a/eos/effects/effect1590.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# missileSkillAoeVelocityBonus
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Target Navigation Prediction TN (6 of 6)
-# Modules named like: Warhead Flare Catalyst (8 of 8)
-# Skill: Target Navigation Prediction
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalize = False if "skill" in context or "implant" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeVelocity", container.getModifiedItemAttr("aoeVelocityBonus") * level,
-                                    stackingPenalties=penalize)
diff --git a/eos/effects/effect1592.py b/eos/effects/effect1592.py
deleted file mode 100644
index 253fbd818..000000000
--- a/eos/effects/effect1592.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalLauncherSkillCitadelEmDamage
-#
-# Used by:
-# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL 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"),
-                                    "emDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1593.py b/eos/effects/effect1593.py
deleted file mode 100644
index 1ce75bd0b..000000000
--- a/eos/effects/effect1593.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalLauncherSkillCitadelExplosiveDamage
-#
-# Used by:
-# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL 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"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1594.py b/eos/effects/effect1594.py
deleted file mode 100644
index 044c7a844..000000000
--- a/eos/effects/effect1594.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalLauncherSkillCitadelThermalDamage
-#
-# Used by:
-# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: XL 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"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1595.py b/eos/effects/effect1595.py
deleted file mode 100644
index 63e95f67f..000000000
--- a/eos/effects/effect1595.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileSkillWarheadUpgradesEmDamageBonus
-#
-# Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
-# Skill: Warhead Upgrades
-type = "passive"
-
-
-def handler(fit, src, context):
-    mod = src.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)
diff --git a/eos/effects/effect1596.py b/eos/effects/effect1596.py
deleted file mode 100644
index 6a6228e8e..000000000
--- a/eos/effects/effect1596.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileSkillWarheadUpgradesExplosiveDamageBonus
-#
-# Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
-# Skill: Warhead Upgrades
-type = "passive"
-
-
-def handler(fit, src, context):
-    mod = src.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)
diff --git a/eos/effects/effect1597.py b/eos/effects/effect1597.py
deleted file mode 100644
index 8b25142a8..000000000
--- a/eos/effects/effect1597.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileSkillWarheadUpgradesKineticDamageBonus
-#
-# Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
-# Skill: Warhead Upgrades
-type = "passive"
-
-
-def handler(fit, src, context):
-    mod = src.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)
diff --git a/eos/effects/effect160.py b/eos/effects/effect160.py
deleted file mode 100644
index e64a0d35b..000000000
--- a/eos/effects/effect160.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# mediumHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumHybridTurret
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Medium Hybrid Turret MH (6 of 6)
-# Skill: Medium Hybrid Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect161.py b/eos/effects/effect161.py
deleted file mode 100644
index 8bd3dec22..000000000
--- a/eos/effects/effect161.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# mediumProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringMediumProjectileTurret
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Gunslinger' Medium Projectile Turret MP (6 of 6)
-# Skill: Medium Projectile Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1615.py b/eos/effects/effect1615.py
deleted file mode 100644
index 34b19d1ac..000000000
--- a/eos/effects/effect1615.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipAdvancedSpaceshipCommandAgilityBonus
-#
-# Used by:
-# Items from market group: Ships > Capital Ships (40 of 40)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    skillName = "Advanced Spaceship Command"
-    skill = fit.character.getSkill(skillName)
-    fit.ship.boostItemAttr("agility", skill.getModifiedItemAttr("agilityBonus"), skill=skillName)
diff --git a/eos/effects/effect1616.py b/eos/effects/effect1616.py
deleted file mode 100644
index 5a0846335..000000000
--- a/eos/effects/effect1616.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillCapitalShipsAdvancedAgility
-#
-# Used by:
-# Skill: Capital Ships
-type = "passive"
-
-
-def handler(fit, skill, context):
-    if fit.ship.item.requiresSkill("Capital Ships"):
-        fit.ship.boostItemAttr("agility", skill.getModifiedItemAttr("agilityBonus") * skill.level)
diff --git a/eos/effects/effect1617.py b/eos/effects/effect1617.py
deleted file mode 100644
index 05b0beb25..000000000
--- a/eos/effects/effect1617.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipCapitalAgilityBonus
-#
-# Used by:
-# Items from market group: Ships > Capital Ships (31 of 40)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.multiplyItemAttr("agility", src.getModifiedItemAttr("advancedCapitalAgility"), stackingPenalties=True)
diff --git a/eos/effects/effect162.py b/eos/effects/effect162.py
deleted file mode 100644
index 09ffdc5fb..000000000
--- a/eos/effects/effect162.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# largeEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeEnergyTurret
-#
-# Used by:
-# Implants named like: Inherent Implants 'Lancer' Large Energy Turret LE (6 of 6)
-# Implant: Pashan's Turret Handling Mindlink
-# Skill: Large Energy Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1634.py b/eos/effects/effect1634.py
deleted file mode 100644
index 82b5f1cde..000000000
--- a/eos/effects/effect1634.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalShieldOperationSkillCapacitorNeedBonus
-#
-# Used by:
-# Modules named like: Core Defense Capacitor Safeguard (8 of 8)
-# Skill: Capital Shield Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
-                                  "capacitorNeed", container.getModifiedItemAttr("shieldBoostCapacitorBonus") * level)
diff --git a/eos/effects/effect1635.py b/eos/effects/effect1635.py
deleted file mode 100644
index 9ccf42487..000000000
--- a/eos/effects/effect1635.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# capitalRepairSystemsSkillDurationBonus
-#
-# Used by:
-# Modules named like: Nanobot Accelerator (8 of 8)
-# Skill: Capital Repair Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
-                                  "duration", container.getModifiedItemAttr("durationSkillBonus") * level,
-                                  stackingPenalties="skill" not in context)
diff --git a/eos/effects/effect1638.py b/eos/effects/effect1638.py
deleted file mode 100644
index 6cd2337c9..000000000
--- a/eos/effects/effect1638.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillAdvancedWeaponUpgradesPowerNeedBonus
-#
-# Used by:
-# Skill: Advanced Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Gunnery") or mod.item.requiresSkill("Missile Launcher Operation"),
-        "power", skill.getModifiedItemAttr("powerNeedBonus") * skill.level)
diff --git a/eos/effects/effect1643.py b/eos/effects/effect1643.py
deleted file mode 100644
index 2e36ed6f0..000000000
--- a/eos/effects/effect1643.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# armoredCommandMindlink
-#
-# Used by:
-# Implant: Armored Command Mindlink
-# Implant: Federation Navy Command Mindlink
-# Implant: Imperial Navy Command Mindlink
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/effect1644.py b/eos/effects/effect1644.py
deleted file mode 100644
index 9999d7f56..000000000
--- a/eos/effects/effect1644.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# skirmishCommandMindlink
-#
-# Used by:
-# Implant: Federation Navy Command Mindlink
-# Implant: Republic Fleet Command Mindlink
-# Implant: Skirmish Command Mindlink
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/effect1645.py b/eos/effects/effect1645.py
deleted file mode 100644
index fac7a7720..000000000
--- a/eos/effects/effect1645.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shieldCommandMindlink
-#
-# Used by:
-# Implants from group: Cyber Leadership (4 of 10)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/effect1646.py b/eos/effects/effect1646.py
deleted file mode 100644
index f545ab629..000000000
--- a/eos/effects/effect1646.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# informationCommandMindlink
-#
-# Used by:
-# Implant: Caldari Navy Command Mindlink
-# Implant: Imperial Navy Command Mindlink
-# Implant: Information Command Mindlink
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/effect1650.py b/eos/effects/effect1650.py
deleted file mode 100644
index 119ed3072..000000000
--- a/eos/effects/effect1650.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillSiegeModuleConsumptionQuantityBonus
-#
-# Used by:
-# Skill: Tactical Weapon Reconfiguration
-type = "passive"
-
-
-def handler(fit, skill, context):
-    amount = -skill.getModifiedItemAttr("consumptionQuantityBonus")
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
-                                     "consumptionQuantity", amount * skill.level)
diff --git a/eos/effects/effect1657.py b/eos/effects/effect1657.py
deleted file mode 100644
index 737e5d20d..000000000
--- a/eos/effects/effect1657.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileSkillWarheadUpgradesThermalDamageBonus
-#
-# Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
-# Skill: Warhead Upgrades
-type = "passive"
-
-
-def handler(fit, src, context):
-    mod = src.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)
diff --git a/eos/effects/effect1668.py b/eos/effects/effect1668.py
deleted file mode 100644
index beda51a4c..000000000
--- a/eos/effects/effect1668.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterCargoBonusA2
-#
-# Used by:
-# Variations of ship: Providence (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusA2"), skill="Amarr Freighter")
diff --git a/eos/effects/effect1669.py b/eos/effects/effect1669.py
deleted file mode 100644
index 35085c886..000000000
--- a/eos/effects/effect1669.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterCargoBonusC2
-#
-# Used by:
-# Variations of ship: Charon (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusC2"), skill="Caldari Freighter")
diff --git a/eos/effects/effect1670.py b/eos/effects/effect1670.py
deleted file mode 100644
index 4b4807871..000000000
--- a/eos/effects/effect1670.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterCargoBonusG2
-#
-# Used by:
-# Variations of ship: Obelisk (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusG2"), skill="Gallente Freighter")
diff --git a/eos/effects/effect1671.py b/eos/effects/effect1671.py
deleted file mode 100644
index ee616cb53..000000000
--- a/eos/effects/effect1671.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterCargoBonusM2
-#
-# Used by:
-# Variations of ship: Fenrir (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusM2"), skill="Minmatar Freighter")
diff --git a/eos/effects/effect1672.py b/eos/effects/effect1672.py
deleted file mode 100644
index 0842ef288..000000000
--- a/eos/effects/effect1672.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterMaxVelocityBonusA1
-#
-# Used by:
-# Ship: Providence
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusA1"), skill="Amarr Freighter")
diff --git a/eos/effects/effect1673.py b/eos/effects/effect1673.py
deleted file mode 100644
index e81e55459..000000000
--- a/eos/effects/effect1673.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterMaxVelocityBonusC1
-#
-# Used by:
-# Ship: Charon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusC1"), skill="Caldari Freighter")
diff --git a/eos/effects/effect1674.py b/eos/effects/effect1674.py
deleted file mode 100644
index 4fc3f4844..000000000
--- a/eos/effects/effect1674.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterMaxVelocityBonusG1
-#
-# Used by:
-# Ship: Obelisk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusG1"), skill="Gallente Freighter")
diff --git a/eos/effects/effect1675.py b/eos/effects/effect1675.py
deleted file mode 100644
index 497d0797f..000000000
--- a/eos/effects/effect1675.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterMaxVelocityBonusM1
-#
-# Used by:
-# Ship: Fenrir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusM1"), skill="Minmatar Freighter")
diff --git a/eos/effects/effect17.py b/eos/effects/effect17.py
deleted file mode 100644
index de0c95cac..000000000
--- a/eos/effects/effect17.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# mining
-#
-# Used by:
-# Drones from group: Mining Drone (10 of 10)
-
-type = "passive"
-grouped = True
-
-
-def handler(fit, container, context):
-    miningDroneAmountPercent = container.getModifiedItemAttr("miningDroneAmountPercent")
-    if (miningDroneAmountPercent is None) or (miningDroneAmountPercent == 0):
-        pass
-    else:
-        container.multiplyItemAttr("miningAmount", miningDroneAmountPercent / 100)
diff --git a/eos/effects/effect172.py b/eos/effects/effect172.py
deleted file mode 100644
index 496efc986..000000000
--- a/eos/effects/effect172.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# smallEnergyTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallEnergyTurret
-#
-# Used by:
-# Implants named like: Inherent Implants 'Lancer' Small Energy Turret SE (6 of 6)
-# Skill: Small Energy Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1720.py b/eos/effects/effect1720.py
deleted file mode 100644
index 6b37ba157..000000000
--- a/eos/effects/effect1720.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shieldBoostAmplifier
-#
-# Used by:
-# Modules from group: Capacitor Power Relay (20 of 20)
-# Modules from group: Shield Boost Amplifier (25 of 25)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
-        "shieldBonus", module.getModifiedItemAttr("shieldBoostMultiplier"),
-        stackingPenalties=True)
diff --git a/eos/effects/effect1722.py b/eos/effects/effect1722.py
deleted file mode 100644
index 578b0f47f..000000000
--- a/eos/effects/effect1722.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# jumpDriveSkillsCapacitorNeedBonus
-#
-# Used by:
-# Skill: Jump Drive Operation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.ship.boostItemAttr("jumpDriveCapacitorNeed",
-                           skill.getModifiedItemAttr("jumpDriveCapacitorNeedBonus") * skill.level)
diff --git a/eos/effects/effect173.py b/eos/effects/effect173.py
deleted file mode 100644
index f317f297b..000000000
--- a/eos/effects/effect173.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# smallHybridTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallHybridTurret
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Small Hybrid Turret SH (6 of 6)
-# Skill: Small Hybrid Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1730.py b/eos/effects/effect1730.py
deleted file mode 100644
index 2256ff5b4..000000000
--- a/eos/effects/effect1730.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# droneDmgBonus
-#
-# Used by:
-# Skills from group: Drones (8 of 26)
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill(skill),
-                                 "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect1738.py b/eos/effects/effect1738.py
deleted file mode 100644
index ddd2a7205..000000000
--- a/eos/effects/effect1738.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# doHacking
-#
-# Used by:
-# Modules from group: Data Miners (10 of 10)
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect174.py b/eos/effects/effect174.py
deleted file mode 100644
index a77f76806..000000000
--- a/eos/effects/effect174.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# smallProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringSmallProjectileTurret
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Gunslinger' Small Projectile Turret SP (6 of 6)
-# Skill: Small Projectile Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect1763.py b/eos/effects/effect1763.py
deleted file mode 100644
index 9cdc9a0f6..000000000
--- a/eos/effects/effect1763.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# missileSkillRapidLauncherRoF
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Rapid Launch RL (6 of 6)
-# Implant: Standard Cerebral Accelerator
-# Implant: Whelan Machorin's Ballistic Smartlink
-# Skill: Missile Launcher Operation
-# Skill: Rapid Launch
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", container.getModifiedItemAttr("rofBonus") * level)
diff --git a/eos/effects/effect1764.py b/eos/effects/effect1764.py
deleted file mode 100644
index 3c7cee775..000000000
--- a/eos/effects/effect1764.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# missileSkillMissileProjectileVelocityBonus
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Missile Projection MP (6 of 6)
-# Modules named like: Hydraulic Bay Thrusters (8 of 8)
-# Skill: Missile Projection
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context or "implant" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", container.getModifiedItemAttr("speedFactor") * level,
-                                    stackingPenalties=penalized)
diff --git a/eos/effects/effect1773.py b/eos/effects/effect1773.py
deleted file mode 100644
index ea9d1c560..000000000
--- a/eos/effects/effect1773.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSHTFalloffGF2
-#
-# Used by:
-# Ship: Atron
-# Ship: Daredevil
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect1804.py b/eos/effects/effect1804.py
deleted file mode 100644
index ba757a558..000000000
--- a/eos/effects/effect1804.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorEMResistanceAF1
-#
-# Used by:
-# Ship: Astero
-# Ship: Malice
-# Ship: Punisher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect1805.py b/eos/effects/effect1805.py
deleted file mode 100644
index 3e01abbc3..000000000
--- a/eos/effects/effect1805.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipArmorTHResistanceAF1
-#
-# Used by:
-# Ship: Astero
-# Ship: Malice
-# Ship: Punisher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAF"),
-                           skill="Amarr Frigate")
diff --git a/eos/effects/effect1806.py b/eos/effects/effect1806.py
deleted file mode 100644
index d5d9ea4ac..000000000
--- a/eos/effects/effect1806.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipArmorKNResistanceAF1
-#
-# Used by:
-# Ship: Astero
-# Ship: Malice
-# Ship: Punisher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAF"),
-                           skill="Amarr Frigate")
diff --git a/eos/effects/effect1807.py b/eos/effects/effect1807.py
deleted file mode 100644
index 448ed9fd3..000000000
--- a/eos/effects/effect1807.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipArmorEXResistanceAF1
-#
-# Used by:
-# Ship: Astero
-# Ship: Malice
-# Ship: Punisher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAF"),
-                           skill="Amarr Frigate")
diff --git a/eos/effects/effect1812.py b/eos/effects/effect1812.py
deleted file mode 100644
index 20a8e86a3..000000000
--- a/eos/effects/effect1812.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipShieldEMResistanceCC2
-#
-# Used by:
-# Variations of ship: Moa (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1813.py b/eos/effects/effect1813.py
deleted file mode 100644
index 9c9328d43..000000000
--- a/eos/effects/effect1813.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipShieldThermalResistanceCC2
-#
-# Used by:
-# Variations of ship: Moa (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"),
-                           skill="Caldari Cruiser")
diff --git a/eos/effects/effect1814.py b/eos/effects/effect1814.py
deleted file mode 100644
index d8477420c..000000000
--- a/eos/effects/effect1814.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipShieldKineticResistanceCC2
-#
-# Used by:
-# Variations of ship: Moa (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"),
-                           skill="Caldari Cruiser")
diff --git a/eos/effects/effect1815.py b/eos/effects/effect1815.py
deleted file mode 100644
index 203b2676a..000000000
--- a/eos/effects/effect1815.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipShieldExplosiveResistanceCC2
-#
-# Used by:
-# Variations of ship: Moa (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"),
-                           skill="Caldari Cruiser")
diff --git a/eos/effects/effect1816.py b/eos/effects/effect1816.py
deleted file mode 100644
index 4e68a86aa..000000000
--- a/eos/effects/effect1816.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldEMResistanceCF2
-#
-# Used by:
-# Variations of ship: Merlin (3 of 4)
-# Ship: Cambion
-# Ship: Whiptail
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect1817.py b/eos/effects/effect1817.py
deleted file mode 100644
index 739d4033f..000000000
--- a/eos/effects/effect1817.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldThermalResistanceCF2
-#
-# Used by:
-# Variations of ship: Merlin (3 of 4)
-# Ship: Cambion
-# Ship: Whiptail
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCF"),
-                           skill="Caldari Frigate")
diff --git a/eos/effects/effect1819.py b/eos/effects/effect1819.py
deleted file mode 100644
index 3fd3ebb89..000000000
--- a/eos/effects/effect1819.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldKineticResistanceCF2
-#
-# Used by:
-# Variations of ship: Merlin (3 of 4)
-# Ship: Cambion
-# Ship: Whiptail
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCF"),
-                           skill="Caldari Frigate")
diff --git a/eos/effects/effect1820.py b/eos/effects/effect1820.py
deleted file mode 100644
index 264c2b94d..000000000
--- a/eos/effects/effect1820.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldExplosiveResistanceCF2
-#
-# Used by:
-# Variations of ship: Merlin (3 of 4)
-# Ship: Cambion
-# Ship: Whiptail
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCF"),
-                           skill="Caldari Frigate")
diff --git a/eos/effects/effect1848.py b/eos/effects/effect1848.py
deleted file mode 100644
index ad4339f67..000000000
--- a/eos/effects/effect1848.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# miningForemanMindlink
-#
-# Used by:
-# Implant: Mining Foreman Mindlink
-# Implant: ORE Mining Director Mindlink
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/effect1851.py b/eos/effects/effect1851.py
deleted file mode 100644
index b9f0541f2..000000000
--- a/eos/effects/effect1851.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# selfRof
-#
-# Used by:
-# Skills named like: Missile Specialization (4 of 5)
-# Skill: Rocket Specialization
-# Skill: Torpedo Specialization
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill),
-                                  "speed", skill.getModifiedItemAttr("rofBonus") * skill.level)
diff --git a/eos/effects/effect1862.py b/eos/effects/effect1862.py
deleted file mode 100644
index 62e2e0fb3..000000000
--- a/eos/effects/effect1862.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileEMDamageCF2
-#
-# Used by:
-# Ship: Garmur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect1863.py b/eos/effects/effect1863.py
deleted file mode 100644
index c61c29ee1..000000000
--- a/eos/effects/effect1863.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileThermalDamageCF2
-#
-# Used by:
-# Ship: Garmur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect1864.py b/eos/effects/effect1864.py
deleted file mode 100644
index ba61d0f47..000000000
--- a/eos/effects/effect1864.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileExplosiveDamageCF2
-#
-# Used by:
-# Ship: Garmur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2"),
-                                    skill="Caldari Frigate")
diff --git a/eos/effects/effect1882.py b/eos/effects/effect1882.py
deleted file mode 100644
index a02b4333b..000000000
--- a/eos/effects/effect1882.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# miningYieldMultiplyPercent
-#
-# Used by:
-# Variations of module: Mining Laser Upgrade I (5 of 5)
-# Module: Frostline 'Omnivore' Harvester Upgrade
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", module.getModifiedItemAttr("miningAmountBonus"))
diff --git a/eos/effects/effect1885.py b/eos/effects/effect1885.py
deleted file mode 100644
index e525b593f..000000000
--- a/eos/effects/effect1885.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipCruiseLauncherROFBonus2CB
-#
-# Used by:
-# Ship: Raven
-# Ship: Raven State Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise",
-                                  "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect1886.py b/eos/effects/effect1886.py
deleted file mode 100644
index 9ab173443..000000000
--- a/eos/effects/effect1886.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSiegeLauncherROFBonus2CB
-#
-# Used by:
-# Ship: Raven
-# Ship: Raven State Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
-                                  "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect1896.py b/eos/effects/effect1896.py
deleted file mode 100644
index 0ae042d2d..000000000
--- a/eos/effects/effect1896.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBargeBonusIceHarvestingCycleTimeBarge3
-#
-# Used by:
-# Ships from group: Exhumer (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers")
diff --git a/eos/effects/effect1910.py b/eos/effects/effect1910.py
deleted file mode 100644
index 8fb5bac49..000000000
--- a/eos/effects/effect1910.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusVampireDrainAmount2
-#
-# Used by:
-# Ship: Curse
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect1911.py b/eos/effects/effect1911.py
deleted file mode 100644
index a023201da..000000000
--- a/eos/effects/effect1911.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteReconBonusGravimetricStrength2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Falcon
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanGravimetricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect1912.py b/eos/effects/effect1912.py
deleted file mode 100644
index 89baa4a80..000000000
--- a/eos/effects/effect1912.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteReconBonusMagnetometricStrength2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Falcon
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanMagnetometricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect1913.py b/eos/effects/effect1913.py
deleted file mode 100644
index fec2c9490..000000000
--- a/eos/effects/effect1913.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteReconBonusRadarStrength2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Falcon
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanRadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect1914.py b/eos/effects/effect1914.py
deleted file mode 100644
index 3bab26dfa..000000000
--- a/eos/effects/effect1914.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteReconBonusLadarStrength2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Falcon
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanLadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect1921.py b/eos/effects/effect1921.py
deleted file mode 100644
index 071739847..000000000
--- a/eos/effects/effect1921.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteReconStasisWebBonus2
-#
-# Used by:
-# Ship: Huginn
-# Ship: Moracha
-# Ship: Rapier
-# Ship: Victor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/effect1922.py b/eos/effects/effect1922.py
deleted file mode 100644
index d308a56ba..000000000
--- a/eos/effects/effect1922.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteReconScramblerRangeBonus2
-#
-# Used by:
-# Ship: Arazu
-# Ship: Enforcer
-# Ship: Lachesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/effect1959.py b/eos/effects/effect1959.py
deleted file mode 100644
index e60326892..000000000
--- a/eos/effects/effect1959.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# armorReinforcerMassAdd
-#
-# Used by:
-# Modules from group: Armor Reinforcer (51 of 51)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
diff --git a/eos/effects/effect1964.py b/eos/effects/effect1964.py
deleted file mode 100644
index 6a7ab5f90..000000000
--- a/eos/effects/effect1964.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferCapneed1
-#
-# Used by:
-# Ship: Osprey
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect1969.py b/eos/effects/effect1969.py
deleted file mode 100644
index 3c04cdc3a..000000000
--- a/eos/effects/effect1969.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRemoteArmorRepairCapNeedGC1
-#
-# Used by:
-# Ship: Exequror
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect1996.py b/eos/effects/effect1996.py
deleted file mode 100644
index 3a63615dd..000000000
--- a/eos/effects/effect1996.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# caldariShipEwCapacitorNeedCF2
-#
-# Used by:
-# Ship: Griffin
-# Ship: Kitsune
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect2000.py b/eos/effects/effect2000.py
deleted file mode 100644
index 790825723..000000000
--- a/eos/effects/effect2000.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# droneRangeBonusAdd
-#
-# Used by:
-# Modules from group: Drone Control Range Module (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("droneRangeBonus")
-    fit.extraAttributes.increase("droneControlRange", amount)
diff --git a/eos/effects/effect2008.py b/eos/effects/effect2008.py
deleted file mode 100644
index defbd9ca3..000000000
--- a/eos/effects/effect2008.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# cynosuralDurationBonus
-#
-# Used by:
-# Ships from group: Force Recon Ship (8 of 9)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cynosural Field Generator",
-                                  "duration", ship.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect2013.py b/eos/effects/effect2013.py
deleted file mode 100644
index 9ab5f4af0..000000000
--- a/eos/effects/effect2013.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# droneMaxVelocityBonus
-#
-# Used by:
-# Modules named like: Drone Speed Augmentor (6 of 8)
-# Implant: Overmind 'Goliath' Drone Tuner T25-10S
-# Implant: Overmind 'Hawkmoth' Drone Tuner S10-25T
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", container.getModifiedItemAttr("droneMaxVelocityBonus") * level, stackingPenalties=True)
diff --git a/eos/effects/effect2014.py b/eos/effects/effect2014.py
deleted file mode 100644
index fba4a35bc..000000000
--- a/eos/effects/effect2014.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# droneMaxRangeBonus
-#
-# Used by:
-# Modules named like: Drone Scope Chip (6 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    stacking = False if "skill" in context else True
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxRange",
-                                 container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                 stackingPenalties=stacking)
diff --git a/eos/effects/effect2015.py b/eos/effects/effect2015.py
deleted file mode 100644
index 75f7c1ca7..000000000
--- a/eos/effects/effect2015.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# droneDurabilityShieldCapBonus
-#
-# Used by:
-# Modules named like: Drone Durability Enhancer (6 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity", module.getModifiedItemAttr("hullHpBonus"))
diff --git a/eos/effects/effect2016.py b/eos/effects/effect2016.py
deleted file mode 100644
index 9f22fa762..000000000
--- a/eos/effects/effect2016.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# droneDurabilityArmorHPBonus
-#
-# Used by:
-# Modules named like: Drone Durability Enhancer (6 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP", module.getModifiedItemAttr("hullHpBonus"))
diff --git a/eos/effects/effect2017.py b/eos/effects/effect2017.py
deleted file mode 100644
index cbd2fb065..000000000
--- a/eos/effects/effect2017.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# droneDurabilityHPBonus
-#
-# Used by:
-# Modules named like: Drone Durability Enhancer (6 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp", container.getModifiedItemAttr("hullHpBonus") * level)
diff --git a/eos/effects/effect2019.py b/eos/effects/effect2019.py
deleted file mode 100644
index 86bcba79b..000000000
--- a/eos/effects/effect2019.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# repairDroneShieldBonusBonus
-#
-# Used by:
-# Modules named like: Drone Repair Augmentor (8 of 8)
-# Skill: Repair Drone Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
-                                 "shieldBonus", container.getModifiedItemAttr("damageHP") * level)
diff --git a/eos/effects/effect2020.py b/eos/effects/effect2020.py
deleted file mode 100644
index 3d7d56d4b..000000000
--- a/eos/effects/effect2020.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# repairDroneArmorDamageAmountBonus
-#
-# Used by:
-# Modules named like: Drone Repair Augmentor (8 of 8)
-# Skill: Repair Drone Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
-                                 "armorDamageAmount", container.getModifiedItemAttr("damageHP") * level,
-                                 stackingPenalties=True)
diff --git a/eos/effects/effect2029.py b/eos/effects/effect2029.py
deleted file mode 100644
index 6c790a925..000000000
--- a/eos/effects/effect2029.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# addToSignatureRadius2
-#
-# Used by:
-# Modules from group: Missile Launcher Bomb (2 of 2)
-# Modules from group: Shield Extender (36 of 36)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))
diff --git a/eos/effects/effect2041.py b/eos/effects/effect2041.py
deleted file mode 100644
index f5316cb3a..000000000
--- a/eos/effects/effect2041.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modifyArmorResonancePostPercent
-#
-# Used by:
-# Modules from group: Armor Coating (202 of 202)
-# Modules from group: Armor Plating Energized (187 of 187)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("armor%sDamageResonance" % type.capitalize(),
-                               module.getModifiedItemAttr("%sDamageResistanceBonus" % type),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect2052.py b/eos/effects/effect2052.py
deleted file mode 100644
index 93125bf7c..000000000
--- a/eos/effects/effect2052.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# modifyShieldResonancePostPercent
-#
-# Used by:
-# Modules from group: Shield Resistance Amplifier (88 of 88)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("shield%sDamageResonance" % type.capitalize(),
-                               module.getModifiedItemAttr("%sDamageResistanceBonus" % type),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect2053.py b/eos/effects/effect2053.py
deleted file mode 100644
index 189738822..000000000
--- a/eos/effects/effect2053.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# emShieldCompensationHardeningBonusGroupShieldAmp
-#
-# Used by:
-# Skill: EM Shield Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2054.py b/eos/effects/effect2054.py
deleted file mode 100644
index 332ccae6e..000000000
--- a/eos/effects/effect2054.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# explosiveShieldCompensationHardeningBonusGroupShieldAmp
-#
-# Used by:
-# Skill: Explosive Shield Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "explosiveDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2055.py b/eos/effects/effect2055.py
deleted file mode 100644
index 3b07f5957..000000000
--- a/eos/effects/effect2055.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# kineticShieldCompensationHardeningBonusGroupShieldAmp
-#
-# Used by:
-# Skill: Kinetic Shield Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "kineticDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2056.py b/eos/effects/effect2056.py
deleted file mode 100644
index abb1ad0d7..000000000
--- a/eos/effects/effect2056.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# thermalShieldCompensationHardeningBonusGroupShieldAmp
-#
-# Used by:
-# Skill: Thermal Shield Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Resistance Amplifier",
-                                  "thermalDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect21.py b/eos/effects/effect21.py
deleted file mode 100644
index cba8f70bb..000000000
--- a/eos/effects/effect21.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shieldCapacityBonusOnline
-#
-# Used by:
-# Modules from group: Shield Extender (36 of 36)
-# Modules from group: Shield Resistance Amplifier (88 of 88)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("shieldCapacity", module.getModifiedItemAttr("capacityBonus"))
diff --git a/eos/effects/effect2105.py b/eos/effects/effect2105.py
deleted file mode 100644
index 26e453172..000000000
--- a/eos/effects/effect2105.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# emArmorCompensationHardeningBonusGroupArmorCoating
-#
-# Used by:
-# Skill: EM Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
-                                  "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2106.py b/eos/effects/effect2106.py
deleted file mode 100644
index 05511b42f..000000000
--- a/eos/effects/effect2106.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# explosiveArmorCompensationHardeningBonusGroupArmorCoating
-#
-# Used by:
-# Skill: Explosive Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
-                                  "explosiveDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2107.py b/eos/effects/effect2107.py
deleted file mode 100644
index 90df83fb9..000000000
--- a/eos/effects/effect2107.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# kineticArmorCompensationHardeningBonusGroupArmorCoating
-#
-# Used by:
-# Skill: Kinetic Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
-                                  "kineticDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2108.py b/eos/effects/effect2108.py
deleted file mode 100644
index 36790f342..000000000
--- a/eos/effects/effect2108.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# thermicArmorCompensationHardeningBonusGroupArmorCoating
-#
-# Used by:
-# Skill: Thermal Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Coating",
-                                  "thermalDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2109.py b/eos/effects/effect2109.py
deleted file mode 100644
index 837cf6912..000000000
--- a/eos/effects/effect2109.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# emArmorCompensationHardeningBonusGroupEnergized
-#
-# Used by:
-# Skill: EM Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2110.py b/eos/effects/effect2110.py
deleted file mode 100644
index 556cbb7f2..000000000
--- a/eos/effects/effect2110.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# explosiveArmorCompensationHardeningBonusGroupEnergized
-#
-# Used by:
-# Skill: Explosive Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "explosiveDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2111.py b/eos/effects/effect2111.py
deleted file mode 100644
index 6300b21af..000000000
--- a/eos/effects/effect2111.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# kineticArmorCompensationHardeningBonusGroupEnergized
-#
-# Used by:
-# Skill: Kinetic Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "kineticDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect2112.py b/eos/effects/effect2112.py
deleted file mode 100644
index 8f33c77d7..000000000
--- a/eos/effects/effect2112.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# thermicArmorCompensationHardeningBonusGroupEnergized
-#
-# Used by:
-# Skill: Thermal Armor Compensation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Plating Energized",
-                                  "thermalDamageResistanceBonus",
-                                  skill.getModifiedItemAttr("hardeningBonus") * skill.level)
diff --git a/eos/effects/effect212.py b/eos/effects/effect212.py
deleted file mode 100644
index f4d9c0886..000000000
--- a/eos/effects/effect212.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# sensorUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringSensorUpgrades
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Electronics Upgrades EU (6 of 6)
-# Modules named like: Liquid Cooled Electronics (8 of 8)
-# Skill: Electronics Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Electronics Upgrades"),
-                                  "cpu", container.getModifiedItemAttr("cpuNeedBonus") * level)
diff --git a/eos/effects/effect2130.py b/eos/effects/effect2130.py
deleted file mode 100644
index 86e95036d..000000000
--- a/eos/effects/effect2130.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# smallHybridMaxRangeBonus
-#
-# Used by:
-# Ship: Catalyst
-# Ship: Cormorant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect2131.py b/eos/effects/effect2131.py
deleted file mode 100644
index 4c13361f6..000000000
--- a/eos/effects/effect2131.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# smallEnergyMaxRangeBonus
-#
-# Used by:
-# Ship: Coercer
-# Ship: Gold Magnate
-# Ship: Silver Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect2132.py b/eos/effects/effect2132.py
deleted file mode 100644
index b94e016be..000000000
--- a/eos/effects/effect2132.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# smallProjectileMaxRangeBonus
-#
-# Used by:
-# Ship: Thrasher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect2133.py b/eos/effects/effect2133.py
deleted file mode 100644
index cc26638ad..000000000
--- a/eos/effects/effect2133.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyTransferArrayMaxRangeBonus
-#
-# Used by:
-# Ship: Augoror
-# Ship: Osprey
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus2"))
diff --git a/eos/effects/effect2134.py b/eos/effects/effect2134.py
deleted file mode 100644
index 8c4ce976e..000000000
--- a/eos/effects/effect2134.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shieldTransporterMaxRangeBonus
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-# Ship: Osprey
-# Ship: Rorqual
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "maxRange",
-                                  ship.getModifiedItemAttr("maxRangeBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Shield Booster", "maxRange",
-                                  ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect2135.py b/eos/effects/effect2135.py
deleted file mode 100644
index 60f66763c..000000000
--- a/eos/effects/effect2135.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# armorRepairProjectorMaxRangeBonus
-#
-# 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", "maxRange",
-                                  src.getModifiedItemAttr("maxRangeBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Armor Repairer", "maxRange",
-                                  src.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect214.py b/eos/effects/effect214.py
deleted file mode 100644
index d7a2004e4..000000000
--- a/eos/effects/effect214.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# targetingMaxTargetBonusModAddMaxLockedTargetsLocationChar
-#
-# Used by:
-# Skills named like: Target Management (2 of 2)
-type = "passive", "structure"
-
-
-def handler(fit, skill, context):
-    amount = skill.getModifiedItemAttr("maxTargetBonus") * skill.level
-    fit.extraAttributes.increase("maxTargetsLockedFromSkills", amount)
diff --git a/eos/effects/effect2143.py b/eos/effects/effect2143.py
deleted file mode 100644
index cb80fba62..000000000
--- a/eos/effects/effect2143.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# minmatarShipEwTargetPainterMC2
-#
-# Used by:
-# Ship: Huginn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC2"),
-                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/effect2155.py b/eos/effects/effect2155.py
deleted file mode 100644
index c6fdde891..000000000
--- a/eos/effects/effect2155.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipProjectileDamageCS1
-#
-# Used by:
-# Ship: Sleipnir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
-                                  skill="Command Ships")
diff --git a/eos/effects/effect2156.py b/eos/effects/effect2156.py
deleted file mode 100644
index 074b7aaad..000000000
--- a/eos/effects/effect2156.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCommandShipProjectileFalloffCS2
-#
-# Used by:
-# Ship: Sleipnir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/effect2157.py b/eos/effects/effect2157.py
deleted file mode 100644
index a14f6cd70..000000000
--- a/eos/effects/effect2157.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipLaserDamageCS1
-#
-# Used by:
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
-                                  skill="Command Ships")
diff --git a/eos/effects/effect2158.py b/eos/effects/effect2158.py
deleted file mode 100644
index 50b0624e1..000000000
--- a/eos/effects/effect2158.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCommandShipLaserROFCS2
-#
-# Used by:
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/effect2160.py b/eos/effects/effect2160.py
deleted file mode 100644
index a2a89d17d..000000000
--- a/eos/effects/effect2160.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCommandShipHybridFalloffCS2
-#
-# Used by:
-# Ship: Astarte
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/effect2161.py b/eos/effects/effect2161.py
deleted file mode 100644
index c26d77ef6..000000000
--- a/eos/effects/effect2161.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipHybridOptimalCS1
-#
-# Used by:
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
-                                  skill="Command Ships")
diff --git a/eos/effects/effect2179.py b/eos/effects/effect2179.py
deleted file mode 100644
index 8dabc04f0..000000000
--- a/eos/effects/effect2179.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusDroneHitpointsGC2
-#
-# Used by:
-# Ships named like: Stratios (2 of 2)
-# Ship: Vexor
-# Ship: Vexor Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     type, ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect2181.py b/eos/effects/effect2181.py
deleted file mode 100644
index b761c859b..000000000
--- a/eos/effects/effect2181.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneHitpointsFixedAC2
-#
-# Used by:
-# Variations of ship: Arbitrator (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     type, ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect2186.py b/eos/effects/effect2186.py
deleted file mode 100644
index 9a591a4bc..000000000
--- a/eos/effects/effect2186.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusDroneHitpointsGB2
-#
-# Used by:
-# Variations of ship: Dominix (3 of 3)
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     type, ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship")
diff --git a/eos/effects/effect2187.py b/eos/effects/effect2187.py
deleted file mode 100644
index 19ea8bdde..000000000
--- a/eos/effects/effect2187.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusDroneDamageMultiplierGB2
-#
-# Used by:
-# Variations of ship: Dominix (3 of 3)
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB2"),
-                                 skill="Gallente Battleship")
diff --git a/eos/effects/effect2188.py b/eos/effects/effect2188.py
deleted file mode 100644
index 9585f7590..000000000
--- a/eos/effects/effect2188.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusDroneDamageMultiplierGC2
-#
-# Used by:
-# Ships named like: Stratios (2 of 2)
-# Ship: Vexor
-# Ship: Vexor Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect2189.py b/eos/effects/effect2189.py
deleted file mode 100644
index 24e284817..000000000
--- a/eos/effects/effect2189.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneDamageMultiplierAC2
-#
-# Used by:
-# Variations of ship: Arbitrator (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect2200.py b/eos/effects/effect2200.py
deleted file mode 100644
index 310c19504..000000000
--- a/eos/effects/effect2200.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusInterdictorsMissileKineticDamage1
-#
-# Used by:
-# Ship: Flycatcher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"),
-        "kineticDamage", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/effect2201.py b/eos/effects/effect2201.py
deleted file mode 100644
index 2b7450e2b..000000000
--- a/eos/effects/effect2201.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusInterdictorsProjectileFalloff1
-#
-# Used by:
-# Ship: Sabre
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/effect2215.py b/eos/effects/effect2215.py
deleted file mode 100644
index e3710e611..000000000
--- a/eos/effects/effect2215.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusPirateFrigateProjDamage
-#
-# Used by:
-# Ship: Chremoas
-# Ship: Dramiel
-# Ship: Sunesis
-# Ship: Svipul
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect223.py b/eos/effects/effect223.py
deleted file mode 100644
index 143f84076..000000000
--- a/eos/effects/effect223.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# navigationVelocityBonusPostPercentMaxVelocityLocationShip
-#
-# Used by:
-# Implant: Low-grade Snake Alpha
-# Implant: Mid-grade Snake Alpha
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("velocityBonus"))
diff --git a/eos/effects/effect2232.py b/eos/effects/effect2232.py
deleted file mode 100644
index bccd06a4a..000000000
--- a/eos/effects/effect2232.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# scanStrengthBonusPercentOnline
-#
-# Used by:
-# Modules from group: Signal Amplifier (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.boostItemAttr("scan%sStrength" % type,
-                               module.getModifiedItemAttr("scan%sStrengthPercent" % type),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect2249.py b/eos/effects/effect2249.py
deleted file mode 100644
index 0fc338bf7..000000000
--- a/eos/effects/effect2249.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneMiningAmountAC2
-#
-# Used by:
-# Ship: Arbitrator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "miningAmount", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect2250.py b/eos/effects/effect2250.py
deleted file mode 100644
index e1bbc1314..000000000
--- a/eos/effects/effect2250.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneMiningAmountGC2
-#
-# Used by:
-# Ship: Vexor
-# Ship: Vexor Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect2251.py b/eos/effects/effect2251.py
deleted file mode 100644
index 9a3b30089..000000000
--- a/eos/effects/effect2251.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# commandshipMultiRelayEffect
-#
-# Used by:
-# Ships from group: Command Ship (8 of 8)
-# Ships from group: Industrial Command Ship (2 of 2)
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("maxGangModules"))
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupOnline",
-                                     src.getModifiedItemAttr("maxGangModules"))
diff --git a/eos/effects/effect2252.py b/eos/effects/effect2252.py
deleted file mode 100644
index 7ea8e593d..000000000
--- a/eos/effects/effect2252.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# covertOpsAndReconOpsCloakModuleDelayBonus
-#
-# Used by:
-# Ships from group: Black Ops (5 of 5)
-# Ships from group: Blockade Runner (4 of 4)
-# Ships from group: Covert Ops (8 of 8)
-# Ships from group: Expedition Frigate (2 of 2)
-# Ships from group: Force Recon Ship (9 of 9)
-# Ships from group: Stealth Bomber (5 of 5)
-# Ships named like: Stratios (2 of 2)
-# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
-# Ship: Astero
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemForce(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "moduleReactivationDelay",
-                                  container.getModifiedItemAttr("covertOpsAndReconOpsCloakModuleDelay"))
diff --git a/eos/effects/effect2253.py b/eos/effects/effect2253.py
deleted file mode 100644
index 14d838e74..000000000
--- a/eos/effects/effect2253.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# covertOpsStealthBomberTargettingDelayBonus
-#
-# Used by:
-# Ships from group: Black Ops (5 of 5)
-# Ships from group: Stealth Bomber (5 of 5)
-# Ship: Caedes
-# Ship: Chremoas
-# Ship: Endurance
-# Ship: Etana
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemForce(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cloakingTargetingDelay",
-                                  ship.getModifiedItemAttr("covertOpsStealthBomberTargettingDelay"))
diff --git a/eos/effects/effect2255.py b/eos/effects/effect2255.py
deleted file mode 100644
index 27517bdc0..000000000
--- a/eos/effects/effect2255.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# tractorBeamCan
-#
-# Used by:
-# Deployables from group: Mobile Tractor Unit (3 of 3)
-# Modules from group: Tractor Beam (4 of 4)
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect227.py b/eos/effects/effect227.py
deleted file mode 100644
index acf8b25e3..000000000
--- a/eos/effects/effect227.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# accerationControlCapNeedBonusPostPercentCapacitorNeedLocationShipGroupAfterburner
-#
-# Used by:
-# Modules named like: Dynamic Fuel Valve (8 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/effect2298.py b/eos/effects/effect2298.py
deleted file mode 100644
index d00f4e2b6..000000000
--- a/eos/effects/effect2298.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# scanStrengthBonusPercentPassive
-#
-# Used by:
-# Implants named like: High grade (20 of 66)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        sensorType = "scan{0}Strength".format(type)
-        sensorBoost = "scan{0}StrengthPercent".format(type)
-        if sensorBoost in implant.item.attributes:
-            fit.ship.boostItemAttr(sensorType, implant.getModifiedItemAttr(sensorBoost))
diff --git a/eos/effects/effect230.py b/eos/effects/effect230.py
deleted file mode 100644
index 1d1b9c309..000000000
--- a/eos/effects/effect230.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# afterburnerDurationBonusPostPercentDurationLocationShipModulesRequiringAfterburner
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6)
-# Implant: Zor's Custom Navigation Link
-# Skill: Afterburner
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "duration", container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/effect2302.py b/eos/effects/effect2302.py
deleted file mode 100644
index f563fac03..000000000
--- a/eos/effects/effect2302.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# damageControl
-#
-# Used by:
-# Modules from group: Damage Control (22 of 27)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
-        for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
-            bonus = "%s%sDamageResonance" % (attrPrefix, damageType)
-            bonus = "%s%s" % (bonus[0].lower(), bonus[1:])
-            booster = "%s%sDamageResonance" % (layer, damageType)
-            fit.ship.multiplyItemAttr(bonus, module.getModifiedItemAttr(booster),
-                                      stackingPenalties=True, penaltyGroup="preMul")
diff --git a/eos/effects/effect2305.py b/eos/effects/effect2305.py
deleted file mode 100644
index a7051eb62..000000000
--- a/eos/effects/effect2305.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteReconBonusEnergyNeutAmount2
-#
-# Used by:
-# Ship: Curse
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect235.py b/eos/effects/effect235.py
deleted file mode 100644
index 8e8bd9cec..000000000
--- a/eos/effects/effect235.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# warpdriveoperationWarpCapacitorNeedBonusPostPercentWarpCapacitorNeedLocationShip
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Warp Drive Operation WD (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", implant.getModifiedItemAttr("warpCapacitorNeedBonus"))
diff --git a/eos/effects/effect2354.py b/eos/effects/effect2354.py
deleted file mode 100644
index 502143ed2..000000000
--- a/eos/effects/effect2354.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# capitalRemoteArmorRepairerCapNeedBonusSkill
-#
-# Used by:
-# Variations of module: Capital Remote Repair Augmentor I (2 of 2)
-# Skill: Capital Remote Armor Repair Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect2355.py b/eos/effects/effect2355.py
deleted file mode 100644
index 7ae9b3710..000000000
--- a/eos/effects/effect2355.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# capitalRemoteShieldTransferCapNeedBonusSkill
-#
-# Used by:
-# Skill: Capital Shield Emission Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect2356.py b/eos/effects/effect2356.py
deleted file mode 100644
index a33d1250d..000000000
--- a/eos/effects/effect2356.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalRemoteEnergyTransferCapNeedBonusSkill
-#
-# Used by:
-# Skill: Capital Capacitor Emission Systems
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/effect2402.py b/eos/effects/effect2402.py
deleted file mode 100644
index e2952621f..000000000
--- a/eos/effects/effect2402.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# skillSuperWeaponDmgBonus
-#
-# Used by:
-# Skill: Doomsday Operation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    damageTypes = ("em", "explosive", "kinetic", "thermal")
-    for dmgType in damageTypes:
-        dmgAttr = "{0}Damage".format(dmgType)
-        fit.modules.filteredItemBoost(
-            lambda mod: mod.item.group.name == "Super Weapon" and dmgAttr in mod.itemModifiedAttributes,
-            dmgAttr, skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect242.py b/eos/effects/effect242.py
deleted file mode 100644
index dc38ae5f8..000000000
--- a/eos/effects/effect242.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# accerationControlSpeedFBonusPostPercentSpeedFactorLocationShipGroupAfterburner
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "speedFactor", implant.getModifiedItemAttr("speedFBonus"))
diff --git a/eos/effects/effect2422.py b/eos/effects/effect2422.py
deleted file mode 100644
index d7841ad64..000000000
--- a/eos/effects/effect2422.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# implantVelocityBonus
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Navigation NN (6 of 6)
-# Implant: Genolution Core Augmentation CA-3
-# Implant: Shaqil's Speed Enhancer
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("implantBonusVelocity"))
diff --git a/eos/effects/effect2432.py b/eos/effects/effect2432.py
deleted file mode 100644
index da1896d18..000000000
--- a/eos/effects/effect2432.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# energyManagementCapacitorBonusPostPercentCapacityLocationShipGroupCapacitorCapacityBonus
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Capacitor Management EM (6 of 6)
-# Implants named like: Mindflood Booster (4 of 4)
-# Modules named like: Semiconductor Memory Cell (8 of 8)
-# Implant: Antipharmakon Aeolis
-# Implant: Genolution Core Augmentation CA-1
-# Skill: Capacitor Management
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("capacitorCapacity", container.getModifiedItemAttr("capacitorCapacityBonus") * level)
diff --git a/eos/effects/effect244.py b/eos/effects/effect244.py
deleted file mode 100644
index 12ae33b27..000000000
--- a/eos/effects/effect244.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# highSpeedManuveringCapacitorNeedMultiplierPostPercentCapacitorNeedLocationShipModulesRequiringHighSpeedManuvering
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' High Speed Maneuvering HS (6 of 6)
-# Skill: High Speed Maneuvering
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect2444.py b/eos/effects/effect2444.py
deleted file mode 100644
index 7cba56603..000000000
--- a/eos/effects/effect2444.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# minerCpuUsageMultiplyPercent2
-#
-# Used by:
-# Variations of module: Mining Laser Upgrade I (5 of 5)
-# Module: Frostline 'Omnivore' Harvester Upgrade
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "cpu", module.getModifiedItemAttr("cpuPenaltyPercent"))
diff --git a/eos/effects/effect2445.py b/eos/effects/effect2445.py
deleted file mode 100644
index 666c030a6..000000000
--- a/eos/effects/effect2445.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# iceMinerCpuUsagePercent
-#
-# Used by:
-# Variations of module: Ice Harvester Upgrade I (5 of 5)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "cpu", module.getModifiedItemAttr("cpuPenaltyPercent"))
diff --git a/eos/effects/effect2456.py b/eos/effects/effect2456.py
deleted file mode 100644
index f5afa70b6..000000000
--- a/eos/effects/effect2456.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# miningUpgradeCPUPenaltyReductionModulesRequiringMiningUpgradePercent
-#
-# Used by:
-# Implants named like: Inherent Implants 'Highwall' Mining Upgrades MU (3 of 3)
-# Skill: Mining Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Upgrades"),
-                                  "cpuPenaltyPercent",
-                                  container.getModifiedItemAttr("miningUpgradeCPUReductionBonus") * level)
diff --git a/eos/effects/effect2465.py b/eos/effects/effect2465.py
deleted file mode 100644
index cc3351844..000000000
--- a/eos/effects/effect2465.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusArmorResistAB
-#
-# Used by:
-# Ship: Abaddon
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("Em", "Explosive", "Kinetic", "Thermal"):
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), ship.getModifiedItemAttr("shipBonusAB"),
-                               skill="Amarr Battleship")
diff --git a/eos/effects/effect2479.py b/eos/effects/effect2479.py
deleted file mode 100644
index 500775345..000000000
--- a/eos/effects/effect2479.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# iceHarvestCycleTimeModulesRequiringIceHarvestingOnline
-#
-# Used by:
-# Variations of module: Ice Harvester Upgrade I (5 of 5)
-# Module: Frostline 'Omnivore' Harvester Upgrade
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", module.getModifiedItemAttr("iceHarvestCycleBonus"))
diff --git a/eos/effects/effect2485.py b/eos/effects/effect2485.py
deleted file mode 100644
index 36c997118..000000000
--- a/eos/effects/effect2485.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# implantArmorHpBonus2
-#
-# Used by:
-# Implants named like: Inherent Implants 'Noble' Hull Upgrades HG (7 of 7)
-# Implant: Genolution Core Augmentation CA-4
-# Implant: Imperial Navy Modified 'Noble' Implant
-# Implant: Imperial Special Ops Field Enhancer - Standard
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("armorHP", implant.getModifiedItemAttr("armorHpBonus2"))
diff --git a/eos/effects/effect2488.py b/eos/effects/effect2488.py
deleted file mode 100644
index 3a39e759f..000000000
--- a/eos/effects/effect2488.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# implantVelocityBonus2
-#
-# Used by:
-# Implant: Republic Special Ops Field Enhancer - Gamma
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.boostItemAttr("maxVelocity", implant.getModifiedItemAttr("velocityBonus2"))
diff --git a/eos/effects/effect2489.py b/eos/effects/effect2489.py
deleted file mode 100644
index c760a4b28..000000000
--- a/eos/effects/effect2489.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteTrackingComputerFalloffMC
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusMC"),
-                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/effect2490.py b/eos/effects/effect2490.py
deleted file mode 100644
index 0c65a20f2..000000000
--- a/eos/effects/effect2490.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteTrackingComputerFalloffGC2
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusGC2"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect2491.py b/eos/effects/effect2491.py
deleted file mode 100644
index 1f257c03c..000000000
--- a/eos/effects/effect2491.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillEcmBurstRangeBonus
-#
-# Used by:
-# Modules named like: Particle Dispersion Projector (8 of 8)
-# Skill: Long Distance Jamming
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
-                                  "ecmBurstRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
-                                  stackingPenalties=False if "skill" in context else True)
diff --git a/eos/effects/effect2492.py b/eos/effects/effect2492.py
deleted file mode 100644
index 0e836193a..000000000
--- a/eos/effects/effect2492.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillEcmBurstCapNeedBonus
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Electronic Warfare EW (6 of 6)
-# Modules named like: Signal Disruption Amplifier (8 of 8)
-# Skill: Electronic Warfare
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect25.py b/eos/effects/effect25.py
deleted file mode 100644
index c998bcaa0..000000000
--- a/eos/effects/effect25.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# capacitorCapacityBonus
-#
-# Used by:
-# Modules from group: Capacitor Battery (30 of 30)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.increaseItemAttr("capacitorCapacity", ship.getModifiedItemAttr("capacitorBonus"))
diff --git a/eos/effects/effect2503.py b/eos/effects/effect2503.py
deleted file mode 100644
index 244003ecd..000000000
--- a/eos/effects/effect2503.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipHTTrackingBonusGB2
-#
-# Used by:
-# Ships named like: Megathron (3 of 3)
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB2"),
-                                  skill="Gallente Battleship")
diff --git a/eos/effects/effect2504.py b/eos/effects/effect2504.py
deleted file mode 100644
index 77b58a6d6..000000000
--- a/eos/effects/effect2504.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusHybridTrackingGF2
-#
-# Used by:
-# Ship: Ares
-# Ship: Federation Navy Comet
-# Ship: Pacifier
-# Ship: Tristan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect2561.py b/eos/effects/effect2561.py
deleted file mode 100644
index 2031a3db3..000000000
--- a/eos/effects/effect2561.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusAssaultShipMissileVelocity1
-#
-# Used by:
-# Ship: Hawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                                    skill="Assault Frigates")
diff --git a/eos/effects/effect2589.py b/eos/effects/effect2589.py
deleted file mode 100644
index 604e3e14b..000000000
--- a/eos/effects/effect2589.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# modifyBoosterEffectChanceWithBoosterChanceBonusPostPercent
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Recovery NR (2 of 2)
-# Skill: Neurotoxin Recovery
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    for i in range(5):
-        attr = "boosterEffectChance{0}".format(i + 1)
-        fit.boosters.filteredItemBoost(lambda booster: attr in booster.itemModifiedAttributes,
-                                       attr, container.getModifiedItemAttr("boosterChanceBonus") * level)
diff --git a/eos/effects/effect26.py b/eos/effects/effect26.py
deleted file mode 100644
index 40a88a261..000000000
--- a/eos/effects/effect26.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRepair
-#
-# Used by:
-# Modules from group: Hull Repair Unit (25 of 25)
-type = "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("structureDamageAmount")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("hullRepair", amount / speed)
diff --git a/eos/effects/effect2602.py b/eos/effects/effect2602.py
deleted file mode 100644
index f69913dfd..000000000
--- a/eos/effects/effect2602.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusEmShieldResistanceCB2
-#
-# Used by:
-# Ship: Rattlesnake
-# Ship: Rokh
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
-                           skill="Caldari Battleship")
diff --git a/eos/effects/effect2603.py b/eos/effects/effect2603.py
deleted file mode 100644
index 8c1459e98..000000000
--- a/eos/effects/effect2603.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusExplosiveShieldResistanceCB2
-#
-# Used by:
-# Ship: Rattlesnake
-# Ship: Rokh
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
-                           skill="Caldari Battleship")
diff --git a/eos/effects/effect2604.py b/eos/effects/effect2604.py
deleted file mode 100644
index 257628fe1..000000000
--- a/eos/effects/effect2604.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusKineticShieldResistanceCB2
-#
-# Used by:
-# Ship: Rattlesnake
-# Ship: Rokh
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
-                           skill="Caldari Battleship")
diff --git a/eos/effects/effect2605.py b/eos/effects/effect2605.py
deleted file mode 100644
index 96067063f..000000000
--- a/eos/effects/effect2605.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusThermicShieldResistanceCB2
-#
-# Used by:
-# Ship: Rattlesnake
-# Ship: Rokh
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"),
-                           skill="Caldari Battleship")
diff --git a/eos/effects/effect2611.py b/eos/effects/effect2611.py
deleted file mode 100644
index f0545ec68..000000000
--- a/eos/effects/effect2611.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusGunshipProjectileDamage1
-#
-# Used by:
-# Ship: Wolf
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                                  skill="Assault Frigates")
diff --git a/eos/effects/effect2644.py b/eos/effects/effect2644.py
deleted file mode 100644
index 1ae8fe69a..000000000
--- a/eos/effects/effect2644.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# increaseSignatureRadiusOnline
-#
-# Used by:
-# Modules from group: Inertial Stabilizer (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect2645.py b/eos/effects/effect2645.py
deleted file mode 100644
index 9b453a4c8..000000000
--- a/eos/effects/effect2645.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# scanResolutionMultiplierOnline
-#
-# Used by:
-# Modules from group: Warp Core Stabilizer (8 of 8)
-# Module: Target Spectrum Breaker
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionMultiplier"),
-                              stackingPenalties=True)
diff --git a/eos/effects/effect2646.py b/eos/effects/effect2646.py
deleted file mode 100644
index 96731483b..000000000
--- a/eos/effects/effect2646.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# maxTargetRangeBonus
-#
-# Used by:
-# Modules from group: Warp Core Stabilizer (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect2647.py b/eos/effects/effect2647.py
deleted file mode 100644
index 178f96aa9..000000000
--- a/eos/effects/effect2647.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipHeavyMissileLaunhcerRof2
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect2648.py b/eos/effects/effect2648.py
deleted file mode 100644
index c3de080b1..000000000
--- a/eos/effects/effect2648.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipHeavyAssaultMissileLaunhcerRof2
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect2649.py b/eos/effects/effect2649.py
deleted file mode 100644
index 27b7cefba..000000000
--- a/eos/effects/effect2649.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipAssaultMissileLaunhcerRof2
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect2670.py b/eos/effects/effect2670.py
deleted file mode 100644
index f79c16a57..000000000
--- a/eos/effects/effect2670.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# sensorBoosterActivePercentage
-#
-# Used by:
-# Modules from group: Sensor Booster (16 of 16)
-type = "active"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True)
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True)
-
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.boostItemAttr(
-            "scan{}Strength".format(scanType),
-            module.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-            stackingPenalties=True
-        )
diff --git a/eos/effects/effect2688.py b/eos/effects/effect2688.py
deleted file mode 100644
index e37290e63..000000000
--- a/eos/effects/effect2688.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capNeedBonusEffectLasers
-#
-# Used by:
-# Modules named like: Energy Discharge Elutriation (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "capacitorNeed", module.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/effect2689.py b/eos/effects/effect2689.py
deleted file mode 100644
index 8f1cad753..000000000
--- a/eos/effects/effect2689.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capNeedBonusEffectHybrids
-#
-# Used by:
-# Modules named like: Hybrid Discharge Elutriation (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "capacitorNeed", module.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/effect2690.py b/eos/effects/effect2690.py
deleted file mode 100644
index 689898682..000000000
--- a/eos/effects/effect2690.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# cpuNeedBonusEffectLasers
-#
-# Used by:
-# Modules named like: Algid Energy Administrations Unit (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "cpu", module.getModifiedItemAttr("cpuNeedBonus"))
diff --git a/eos/effects/effect2691.py b/eos/effects/effect2691.py
deleted file mode 100644
index b3e7d6c75..000000000
--- a/eos/effects/effect2691.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# cpuNeedBonusEffectHybrid
-#
-# Used by:
-# Modules named like: Algid Hybrid Administrations Unit (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "cpu", module.getModifiedItemAttr("cpuNeedBonus"))
diff --git a/eos/effects/effect2693.py b/eos/effects/effect2693.py
deleted file mode 100644
index dd5838c5a..000000000
--- a/eos/effects/effect2693.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# falloffBonusEffectLasers
-#
-# Used by:
-# Modules named like: Energy Ambit Extension (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect2694.py b/eos/effects/effect2694.py
deleted file mode 100644
index 94f3ab90b..000000000
--- a/eos/effects/effect2694.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# falloffBonusEffectHybrids
-#
-# Used by:
-# Modules named like: Hybrid Ambit Extension (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect2695.py b/eos/effects/effect2695.py
deleted file mode 100644
index 0de580e18..000000000
--- a/eos/effects/effect2695.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# falloffBonusEffectProjectiles
-#
-# Used by:
-# Modules named like: Projectile Ambit Extension (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect2696.py b/eos/effects/effect2696.py
deleted file mode 100644
index 7f4126ad8..000000000
--- a/eos/effects/effect2696.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# maxRangeBonusEffectLasers
-#
-# Used by:
-# Modules named like: Energy Locus Coordinator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect2697.py b/eos/effects/effect2697.py
deleted file mode 100644
index 68f035cc6..000000000
--- a/eos/effects/effect2697.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# maxRangeBonusEffectHybrids
-#
-# Used by:
-# Modules named like: Hybrid Locus Coordinator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect2698.py b/eos/effects/effect2698.py
deleted file mode 100644
index 5f433584c..000000000
--- a/eos/effects/effect2698.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# maxRangeBonusEffectProjectiles
-#
-# Used by:
-# Modules named like: Projectile Locus Coordinator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect27.py b/eos/effects/effect27.py
deleted file mode 100644
index 07c1926da..000000000
--- a/eos/effects/effect27.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# armorRepair
-#
-# Used by:
-# Modules from group: Armor Repair Unit (108 of 108)
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("armorDamageAmount")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    rps = amount / speed
-    fit.extraAttributes.increase("armorRepair", rps)
-    fit.extraAttributes.increase("armorRepairPreSpool", rps)
-    fit.extraAttributes.increase("armorRepairFullSpool", rps)
diff --git a/eos/effects/effect2706.py b/eos/effects/effect2706.py
deleted file mode 100644
index addcabb17..000000000
--- a/eos/effects/effect2706.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# drawbackPowerNeedLasers
-#
-# Used by:
-# Modules from group: Rig Energy Weapon (56 of 56)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect2707.py b/eos/effects/effect2707.py
deleted file mode 100644
index 68a8c4233..000000000
--- a/eos/effects/effect2707.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# drawbackPowerNeedHybrids
-#
-# Used by:
-# Modules from group: Rig Hybrid Weapon (56 of 56)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect2708.py b/eos/effects/effect2708.py
deleted file mode 100644
index 0f8490bfd..000000000
--- a/eos/effects/effect2708.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# drawbackPowerNeedProjectiles
-#
-# Used by:
-# Modules from group: Rig Projectile Weapon (40 of 40)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect271.py b/eos/effects/effect271.py
deleted file mode 100644
index 9d9ba7b72..000000000
--- a/eos/effects/effect271.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# hullUpgradesArmorHpBonusPostPercentHpLocationShip
-#
-# Used by:
-# Implants named like: grade Slave (15 of 18)
-# Modules named like: Trimark Armor Pump (8 of 8)
-# Implant: Low-grade Snake Epsilon
-# Implant: Mid-grade Snake Epsilon
-# Skill: Hull Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("armorHP", (container.getModifiedItemAttr("armorHpBonus") or 0) * level)
diff --git a/eos/effects/effect2712.py b/eos/effects/effect2712.py
deleted file mode 100644
index 94c4fb0ff..000000000
--- a/eos/effects/effect2712.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# drawbackArmorHP
-#
-# Used by:
-# Modules from group: Rig Navigation (48 of 64)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect2713.py b/eos/effects/effect2713.py
deleted file mode 100644
index 659199ee1..000000000
--- a/eos/effects/effect2713.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# drawbackCPUOutput
-#
-# Used by:
-# Modules from group: Rig Drones (58 of 64)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect2714.py b/eos/effects/effect2714.py
deleted file mode 100644
index cb22a2523..000000000
--- a/eos/effects/effect2714.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# drawbackCPUNeedLaunchers
-#
-# Used by:
-# Modules from group: Rig Launcher (48 of 48)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "cpu", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect2716.py b/eos/effects/effect2716.py
deleted file mode 100644
index 176bdd423..000000000
--- a/eos/effects/effect2716.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# drawbackSigRad
-#
-# Used by:
-# Modules from group: Rig Shield (72 of 72)
-# Modules named like: Optimizer (16 of 16)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("drawback"), stackingPenalties=True)
diff --git a/eos/effects/effect2717.py b/eos/effects/effect2717.py
deleted file mode 100644
index 8bdd806ae..000000000
--- a/eos/effects/effect2717.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# drawbackMaxVelocity
-#
-# Used by:
-# Modules from group: Rig Armor (48 of 72)
-# Modules from group: Rig Resource Processing (8 of 10)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("drawback"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect2718.py b/eos/effects/effect2718.py
deleted file mode 100644
index 84887a559..000000000
--- a/eos/effects/effect2718.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# drawbackShieldCapacity
-#
-# Used by:
-# Modules from group: Rig Electronic Systems (40 of 48)
-# Modules from group: Rig Targeting (16 of 16)
-# Modules named like: Signal Focusing Kit (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("shieldCapacity", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect272.py b/eos/effects/effect272.py
deleted file mode 100644
index 79a48defa..000000000
--- a/eos/effects/effect272.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# repairSystemsDurationBonusPostPercentDurationLocationShipModulesRequiringRepairSystems
-#
-# Used by:
-# Implants named like: Inherent Implants 'Noble' Repair Systems RS (6 of 6)
-# Modules named like: Nanobot Accelerator (8 of 8)
-# Implant: Numon Family Heirloom
-# Skill: Repair Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "duration", container.getModifiedItemAttr("durationSkillBonus") * level)
diff --git a/eos/effects/effect2726.py b/eos/effects/effect2726.py
deleted file mode 100644
index f37896233..000000000
--- a/eos/effects/effect2726.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# miningClouds
-#
-# Used by:
-# Modules from group: Gas Cloud Harvester (5 of 5)
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect2727.py b/eos/effects/effect2727.py
deleted file mode 100644
index 3491f2f44..000000000
--- a/eos/effects/effect2727.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# gasCloudHarvestingMaxGroupSkillLevel
-#
-# Used by:
-# Skill: Gas Cloud Harvesting
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
-                                     "maxGroupActive", skill.level)
diff --git a/eos/effects/effect273.py b/eos/effects/effect273.py
deleted file mode 100644
index 2d59d3d3a..000000000
--- a/eos/effects/effect273.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shieldUpgradesPowerNeedBonusPostPercentPowerLocationShipModulesRequiringShieldUpgrades
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Shield Upgrades SU (6 of 6)
-# Modules named like: Core Defense Charge Economizer (8 of 8)
-# Skill: Shield Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"),
-                                  "power", container.getModifiedItemAttr("powerNeedBonus") * level)
diff --git a/eos/effects/effect2734.py b/eos/effects/effect2734.py
deleted file mode 100644
index 6d1640619..000000000
--- a/eos/effects/effect2734.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipECMScanStrengthBonusCF
-#
-# Used by:
-# Variations of ship: Griffin (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("Gravimetric", "Ladar", "Radar", "Magnetometric"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                      "scan{0}StrengthBonus".format(type),
-                                      ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect2735.py b/eos/effects/effect2735.py
deleted file mode 100644
index 0620ca719..000000000
--- a/eos/effects/effect2735.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# boosterArmorHpPenalty
-#
-# Used by:
-# Implants named like: Booster (12 of 35)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Armor Capacity"
-
-# Attribute that this effect targets
-attr = "boosterArmorHPPenalty"
-
-
-def handler(fit, booster, context):
-    fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2736.py b/eos/effects/effect2736.py
deleted file mode 100644
index 32596c796..000000000
--- a/eos/effects/effect2736.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# boosterArmorRepairAmountPenalty
-#
-# Used by:
-# Implants named like: Drop Booster (3 of 4)
-# Implants named like: Mindflood Booster (3 of 4)
-# Implants named like: Sooth Sayer Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Armor Repair Amount"
-
-# Attribute that this effect targets
-attr = "boosterArmorRepairAmountPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",
-                                  "armorDamageAmount", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2737.py b/eos/effects/effect2737.py
deleted file mode 100644
index f93f04af9..000000000
--- a/eos/effects/effect2737.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# boosterShieldCapacityPenalty
-#
-# Used by:
-# Implants from group: Booster (12 of 70)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Shield Capacity"
-
-# Attribute that this effect targets
-attr = "boosterShieldCapacityPenalty"
-
-
-def handler(fit, booster, context):
-    fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2739.py b/eos/effects/effect2739.py
deleted file mode 100644
index e62bef3f5..000000000
--- a/eos/effects/effect2739.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# boosterTurretOptimalRangePenalty
-#
-# Used by:
-# Implants named like: Blue Pill Booster (3 of 5)
-# Implants named like: Mindflood Booster (3 of 4)
-# Implants named like: Sooth Sayer Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Turret Optimal Range"
-
-# Attribute that this effect targets
-attr = "boosterTurretOptimalRangePenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "maxRange", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2741.py b/eos/effects/effect2741.py
deleted file mode 100644
index 636c49909..000000000
--- a/eos/effects/effect2741.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# boosterTurretFalloffPenalty
-#
-# Used by:
-# Implants named like: Drop Booster (3 of 4)
-# Implants named like: X Instinct Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Turret Falloff"
-
-# Attribute that this effect targets
-attr = "boosterTurretFalloffPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "falloff", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2745.py b/eos/effects/effect2745.py
deleted file mode 100644
index 1f546f439..000000000
--- a/eos/effects/effect2745.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# boosterCapacitorCapacityPenalty
-#
-# Used by:
-# Implants named like: Blue Pill Booster (3 of 5)
-# Implants named like: Exile Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Cap Capacity"
-
-# Attribute that this effect targets
-attr = "boosterCapacitorCapacityPenalty"
-
-
-def handler(fit, booster, context):
-    fit.ship.boostItemAttr("capacitorCapacity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2746.py b/eos/effects/effect2746.py
deleted file mode 100644
index 83856e018..000000000
--- a/eos/effects/effect2746.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# boosterMaxVelocityPenalty
-#
-# Used by:
-# Implants named like: Crash Booster (3 of 4)
-# Items from market group: Implants & Boosters > Booster > Booster Slot 02 (9 of 13)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Velocity"
-
-# Attribute that this effect targets
-attr = "boosterMaxVelocityPenalty"
-
-
-def handler(fit, booster, context):
-    fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2747.py b/eos/effects/effect2747.py
deleted file mode 100644
index 77e71d373..000000000
--- a/eos/effects/effect2747.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# boosterTurretTrackingPenalty
-#
-# Used by:
-# Implants named like: Exile Booster (3 of 4)
-# Implants named like: Frentix Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Turret Tracking"
-
-# Attribute that this effect targets
-attr = "boosterTurretTrackingPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "trackingSpeed", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2748.py b/eos/effects/effect2748.py
deleted file mode 100644
index c18a39346..000000000
--- a/eos/effects/effect2748.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# boosterMissileVelocityPenalty
-#
-# Used by:
-# Implants named like: Crash Booster (3 of 4)
-# Implants named like: X Instinct Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Missile Velocity"
-
-# Attribute that this effect targets
-attr = "boosterMissileVelocityPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2749.py b/eos/effects/effect2749.py
deleted file mode 100644
index 873dd2968..000000000
--- a/eos/effects/effect2749.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# boosterMissileExplosionVelocityPenalty
-#
-# Used by:
-# Implants named like: Blue Pill Booster (3 of 5)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Missile Explosion Velocity"
-
-# Attribute that this effect targets
-attr = "boosterAOEVelocityPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeVelocity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2756.py b/eos/effects/effect2756.py
deleted file mode 100644
index 1eaf7ef56..000000000
--- a/eos/effects/effect2756.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusECMStrengthBonusCC
-#
-# Used by:
-# Ship: Blackbird
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("Gravimetric", "Magnetometric", "Ladar", "Radar"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                      "scan{0}StrengthBonus".format(type), ship.getModifiedItemAttr("shipBonusCC"),
-                                      skill="Caldari Cruiser")
diff --git a/eos/effects/effect2757.py b/eos/effects/effect2757.py
deleted file mode 100644
index f9445babc..000000000
--- a/eos/effects/effect2757.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# salvaging
-#
-# Used by:
-# Modules from group: Salvager (3 of 3)
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect2760.py b/eos/effects/effect2760.py
deleted file mode 100644
index 0714422d4..000000000
--- a/eos/effects/effect2760.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# boosterModifyBoosterArmorPenalties
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
-# Implants named like: grade Edge (10 of 12)
-# Skill: Neurotoxin Control
-runTime = 'early'
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    attrs = ("boosterArmorHPPenalty", "boosterArmorRepairAmountPenalty")
-    for attr in attrs:
-        fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                       container.getModifiedItemAttr("boosterAttributeModifier") * level)
diff --git a/eos/effects/effect2763.py b/eos/effects/effect2763.py
deleted file mode 100644
index 9e05f2cb0..000000000
--- a/eos/effects/effect2763.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# boosterModifyBoosterShieldPenalty
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
-# Implants named like: grade Edge (10 of 12)
-# Skill: Neurotoxin Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    attrs = ("boosterShieldBoostAmountPenalty", "boosterShieldCapacityPenalty", "shieldBoostMultiplier")
-    for attr in attrs:
-        # shieldBoostMultiplier can be positive (Blue Pill) and negative value (other boosters)
-        # We're interested in decreasing only side-effects
-        fit.boosters.filteredItemBoost(lambda booster: booster.getModifiedItemAttr(attr) < 0,
-                                       attr, container.getModifiedItemAttr("boosterAttributeModifier") * level)
diff --git a/eos/effects/effect2766.py b/eos/effects/effect2766.py
deleted file mode 100644
index 348cd192b..000000000
--- a/eos/effects/effect2766.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# boosterModifyBoosterMaxVelocityAndCapacitorPenalty
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
-# Implants named like: grade Edge (10 of 12)
-# Skill: Neurotoxin Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    attrs = ("boosterCapacitorCapacityPenalty", "boosterMaxVelocityPenalty")
-    for attr in attrs:
-        fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                       container.getModifiedItemAttr("boosterAttributeModifier") * level)
diff --git a/eos/effects/effect277.py b/eos/effects/effect277.py
deleted file mode 100644
index 2c281449c..000000000
--- a/eos/effects/effect277.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# tacticalshieldManipulationSkillBoostUniformityBonus
-#
-# Used by:
-# Skill: Tactical Shield Manipulation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.ship.increaseItemAttr("shieldUniformity", skill.getModifiedItemAttr("uniformityBonus") * skill.level)
diff --git a/eos/effects/effect2776.py b/eos/effects/effect2776.py
deleted file mode 100644
index 0c247422d..000000000
--- a/eos/effects/effect2776.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# boosterModifyBoosterMissilePenalty
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
-# Implants named like: grade Edge (10 of 12)
-# Skill: Neurotoxin Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    attrs = ("boosterAOEVelocityPenalty", "boosterMissileAOECloudPenalty", "boosterMissileVelocityPenalty")
-    for attr in attrs:
-        fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                       container.getModifiedItemAttr("boosterAttributeModifier") * level)
diff --git a/eos/effects/effect2778.py b/eos/effects/effect2778.py
deleted file mode 100644
index e016e57e8..000000000
--- a/eos/effects/effect2778.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# boosterModifyBoosterTurretPenalty
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
-# Implants named like: grade Edge (10 of 12)
-# Skill: Neurotoxin Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    attrs = ("boosterTurretFalloffPenalty", "boosterTurretOptimalRangePenalty", "boosterTurretTrackingPenalty")
-    for attr in attrs:
-        fit.boosters.filteredItemBoost(lambda booster: True, attr,
-                                       container.getModifiedItemAttr("boosterAttributeModifier") * level)
diff --git a/eos/effects/effect279.py b/eos/effects/effect279.py
deleted file mode 100644
index 6161d3fe0..000000000
--- a/eos/effects/effect279.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shieldEmmisionSystemsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringShieldEmmisionSystems
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Shield Emission Systems SE (6 of 6)
-# Skill: Shield Emission Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect2791.py b/eos/effects/effect2791.py
deleted file mode 100644
index 24da2f481..000000000
--- a/eos/effects/effect2791.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# boosterMissileExplosionCloudPenaltyFixed
-#
-# Used by:
-# Implants named like: Exile Booster (3 of 4)
-# Implants named like: Mindflood Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Missile Explosion Radius"
-
-# Attribute that this effect targets
-attr = "boosterMissileAOECloudPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/effect2792.py b/eos/effects/effect2792.py
deleted file mode 100644
index 3478f268f..000000000
--- a/eos/effects/effect2792.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# modifyArmorResonancePostPercentPassive
-#
-# Used by:
-# Modules named like: Anti Pump (32 of 32)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("armor" + type.capitalize() + "DamageResonance",
-                               module.getModifiedItemAttr(type + "DamageResistanceBonus") or 0,
-                               stackingPenalties=True)
diff --git a/eos/effects/effect2794.py b/eos/effects/effect2794.py
deleted file mode 100644
index f762ce8f0..000000000
--- a/eos/effects/effect2794.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# salvagingAccessDifficultyBonusEffectPassive
-#
-# Used by:
-# Modules from group: Rig Resource Processing (8 of 10)
-# Implant: Poteque 'Prospector' Salvaging SV-905
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                     "accessDifficultyBonus", container.getModifiedItemAttr("accessDifficultyBonus"),
-                                     position="post")
diff --git a/eos/effects/effect2795.py b/eos/effects/effect2795.py
deleted file mode 100644
index dfb7b35a8..000000000
--- a/eos/effects/effect2795.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# modifyShieldResonancePostPercentPassive
-#
-# Used by:
-# Modules named like: Anti Screen Reinforcer (32 of 32)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("shield" + type.capitalize() + "DamageResonance",
-                               module.getModifiedItemAttr(type + "DamageResistanceBonus") or 0,
-                               stackingPenalties=True)
diff --git a/eos/effects/effect2796.py b/eos/effects/effect2796.py
deleted file mode 100644
index abc1dddde..000000000
--- a/eos/effects/effect2796.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# massReductionBonusPassive
-#
-# Used by:
-# Modules from group: Rig Anchor (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("mass", module.getModifiedItemAttr("massBonusPercentage"), stackingPenalties=True)
diff --git a/eos/effects/effect2797.py b/eos/effects/effect2797.py
deleted file mode 100644
index 6a1b54d15..000000000
--- a/eos/effects/effect2797.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# projectileWeaponSpeedMultiplyPassive
-#
-# Used by:
-# Modules named like: Projectile Burst Aerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2798.py b/eos/effects/effect2798.py
deleted file mode 100644
index 0060dafc8..000000000
--- a/eos/effects/effect2798.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# projectileWeaponDamageMultiplyPassive
-#
-# Used by:
-# Modules named like: Projectile Collision Accelerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2799.py b/eos/effects/effect2799.py
deleted file mode 100644
index 6c3c147bb..000000000
--- a/eos/effects/effect2799.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileLauncherSpeedMultiplierPassive
-#
-# Used by:
-# Modules named like: Bay Loading Accelerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2801.py b/eos/effects/effect2801.py
deleted file mode 100644
index bcee87d6b..000000000
--- a/eos/effects/effect2801.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyWeaponSpeedMultiplyPassive
-#
-# Used by:
-# Modules named like: Energy Burst Aerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2802.py b/eos/effects/effect2802.py
deleted file mode 100644
index 53dcbda89..000000000
--- a/eos/effects/effect2802.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# hybridWeaponDamageMultiplyPassive
-#
-# Used by:
-# Modules named like: Hybrid Collision Accelerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2803.py b/eos/effects/effect2803.py
deleted file mode 100644
index 5e4cad460..000000000
--- a/eos/effects/effect2803.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyWeaponDamageMultiplyPassive
-#
-# Used by:
-# Modules named like: Energy Collision Accelerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2804.py b/eos/effects/effect2804.py
deleted file mode 100644
index d40a2d630..000000000
--- a/eos/effects/effect2804.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# hybridWeaponSpeedMultiplyPassive
-#
-# Used by:
-# Modules named like: Hybrid Burst Aerator (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect2805.py b/eos/effects/effect2805.py
deleted file mode 100644
index ab92bb560..000000000
--- a/eos/effects/effect2805.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusLargeEnergyWeaponDamageAB2
-#
-# Used by:
-# Ship: Abaddon
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB2"),
-                                  skill="Amarr Battleship")
diff --git a/eos/effects/effect2809.py b/eos/effects/effect2809.py
deleted file mode 100644
index b66bb9cac..000000000
--- a/eos/effects/effect2809.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileAssaultMissileVelocityBonusCC2
-#
-# Used by:
-# Ship: Caracal
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect2810.py b/eos/effects/effect2810.py
deleted file mode 100644
index 8ff8a12c9..000000000
--- a/eos/effects/effect2810.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyGunshipAssaultMissileFlightTime1
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect2812.py b/eos/effects/effect2812.py
deleted file mode 100644
index cc2d38e7a..000000000
--- a/eos/effects/effect2812.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# caldariShipECMBurstOptimalRangeCB3
-#
-# Used by:
-# Ship: Scorpion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
-                                  "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/effect2837.py b/eos/effects/effect2837.py
deleted file mode 100644
index f965b45ae..000000000
--- a/eos/effects/effect2837.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# armorHPBonusAdd
-#
-# Used by:
-# Modules from group: Armor Reinforcer (51 of 51)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))
diff --git a/eos/effects/effect2847.py b/eos/effects/effect2847.py
deleted file mode 100644
index 6e1df7bcf..000000000
--- a/eos/effects/effect2847.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# trackingSpeedBonusPassiveRequiringGunneryTrackingSpeedBonus
-#
-# Used by:
-# Implants named like: Drop Booster (4 of 4)
-# Implants named like: Eifyr and Co. 'Gunslinger' Motion Prediction MR (6 of 6)
-# Implant: Antipharmakon Iokira
-# Implant: Ogdin's Eye Coordination Enhancer
-# Skill: Motion Prediction
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "trackingSpeed", container.getModifiedItemAttr("trackingSpeedBonus") * level)
diff --git a/eos/effects/effect2848.py b/eos/effects/effect2848.py
deleted file mode 100644
index 3fb468dea..000000000
--- a/eos/effects/effect2848.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# accessDifficultyBonusModifierRequiringArchaelogy
-#
-# Used by:
-# Modules named like: Emission Scope Sharpener (8 of 8)
-# Implant: Poteque 'Prospector' Archaeology AC-905
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemIncrease(lambda module: module.item.requiresSkill("Archaeology"),
-                                     "accessDifficultyBonus",
-                                     container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")
diff --git a/eos/effects/effect2849.py b/eos/effects/effect2849.py
deleted file mode 100644
index 2094f08d3..000000000
--- a/eos/effects/effect2849.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# accessDifficultyBonusModifierRequiringHacking
-#
-# Used by:
-# Modules named like: Memetic Algorithm Bank (8 of 8)
-# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-# Implant: Poteque 'Prospector' Hacking HC-905
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemIncrease(lambda c: c.item.requiresSkill("Hacking"),
-                                     "accessDifficultyBonus",
-                                     container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")
diff --git a/eos/effects/effect2850.py b/eos/effects/effect2850.py
deleted file mode 100644
index d193ca6ef..000000000
--- a/eos/effects/effect2850.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# durationBonusForGroupAfterburner
-#
-# Used by:
-# Modules named like: Engine Thermal Shielding (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "duration", module.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect2851.py b/eos/effects/effect2851.py
deleted file mode 100644
index 4934dc7cf..000000000
--- a/eos/effects/effect2851.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# missileDMGBonusPassive
-#
-# Used by:
-# Modules named like: Warhead Calefaction Catalyst (8 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    for dmgType in ("em", "kinetic", "explosive", "thermal"):
-        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                           "%sDamage" % dmgType,
-                                           container.getModifiedItemAttr("missileDamageMultiplierBonus"),
-                                           stackingPenalties=True)
diff --git a/eos/effects/effect2853.py b/eos/effects/effect2853.py
deleted file mode 100644
index 40d80376e..000000000
--- a/eos/effects/effect2853.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# cloakingTargetingDelayBonusLRSMCloakingPassive
-#
-# Used by:
-# Modules named like: Targeting Systems Stabilizer (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill("Cloaking"),
-                                  "cloakingTargetingDelay", module.getModifiedItemAttr("cloakingTargetingDelayBonus"))
diff --git a/eos/effects/effect2857.py b/eos/effects/effect2857.py
deleted file mode 100644
index 36e29c52d..000000000
--- a/eos/effects/effect2857.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# cynosuralGeneration
-#
-# Used by:
-# Modules from group: Cynosural Field Generator (2 of 2)
-type = "active"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"))
diff --git a/eos/effects/effect2865.py b/eos/effects/effect2865.py
deleted file mode 100644
index 5ffd1b9bb..000000000
--- a/eos/effects/effect2865.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# velocityBonusOnline
-#
-# Used by:
-# Modules from group: Entosis Link (6 of 6)
-# Modules from group: Nanofiber Internal Structure (7 of 7)
-# Modules from group: Overdrive Injector System (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("implantBonusVelocity"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect2866.py b/eos/effects/effect2866.py
deleted file mode 100644
index b0e63322a..000000000
--- a/eos/effects/effect2866.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# biologyTimeBonusFixed
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Biology BY (2 of 2)
-# Skill: Biology
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.boosters.filteredItemBoost(lambda bst: True, "boosterDuration",
-                                   container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/effect2867.py b/eos/effects/effect2867.py
deleted file mode 100644
index cf8ec25b2..000000000
--- a/eos/effects/effect2867.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# sentryDroneDamageBonus
-#
-# Used by:
-# Modules named like: Sentry Damage Augmentor (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "damageMultiplier", module.getModifiedItemAttr("damageMultiplierBonus"),
-                                 stackingPenalties=True)
diff --git a/eos/effects/effect2868.py b/eos/effects/effect2868.py
deleted file mode 100644
index 49def1be7..000000000
--- a/eos/effects/effect2868.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# armorDamageAmountBonusCapitalArmorRepairers
-#
-# Used by:
-# Modules named like: Auxiliary Nano Pump (8 of 8)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
-                                  "armorDamageAmount", implant.getModifiedItemAttr("repairBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect287.py b/eos/effects/effect287.py
deleted file mode 100644
index 7c1cd7011..000000000
--- a/eos/effects/effect287.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# controlledBurstsCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Inherent Implants 'Lancer' Controlled Bursts CB (6 of 6)
-# Skill: Controlled Bursts
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect2872.py b/eos/effects/effect2872.py
deleted file mode 100644
index 350eabe4d..000000000
--- a/eos/effects/effect2872.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileVelocityBonusDefender
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Defender Missiles DM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Defender Missiles"),
-                                       "maxVelocity", container.getModifiedItemAttr("missileVelocityBonus"))
diff --git a/eos/effects/effect2881.py b/eos/effects/effect2881.py
deleted file mode 100644
index c7f718062..000000000
--- a/eos/effects/effect2881.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusCruise3
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2882.py b/eos/effects/effect2882.py
deleted file mode 100644
index 861799510..000000000
--- a/eos/effects/effect2882.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusCruise3
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2883.py b/eos/effects/effect2883.py
deleted file mode 100644
index 7ce36c44b..000000000
--- a/eos/effects/effect2883.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusCruise3
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2884.py b/eos/effects/effect2884.py
deleted file mode 100644
index 47bd9feeb..000000000
--- a/eos/effects/effect2884.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusCruise3
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2885.py b/eos/effects/effect2885.py
deleted file mode 100644
index 015bad393..000000000
--- a/eos/effects/effect2885.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# gasHarvestingCycleTimeModulesRequiringGasCloudHarvesting
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Gas Harvesting GH (3 of 3)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting"),
-                                  "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect2887.py b/eos/effects/effect2887.py
deleted file mode 100644
index cf4d1e826..000000000
--- a/eos/effects/effect2887.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusRocket
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2888.py b/eos/effects/effect2888.py
deleted file mode 100644
index 437d99761..000000000
--- a/eos/effects/effect2888.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusRocket
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2889.py b/eos/effects/effect2889.py
deleted file mode 100644
index ab04fedf1..000000000
--- a/eos/effects/effect2889.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusRocket
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2890.py b/eos/effects/effect2890.py
deleted file mode 100644
index 20694a704..000000000
--- a/eos/effects/effect2890.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusRocket
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2891.py b/eos/effects/effect2891.py
deleted file mode 100644
index 82b69159a..000000000
--- a/eos/effects/effect2891.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusStandard
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2892.py b/eos/effects/effect2892.py
deleted file mode 100644
index 67c75f102..000000000
--- a/eos/effects/effect2892.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusStandard
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2893.py b/eos/effects/effect2893.py
deleted file mode 100644
index e8f3714fa..000000000
--- a/eos/effects/effect2893.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusStandard
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2894.py b/eos/effects/effect2894.py
deleted file mode 100644
index 49a8006e7..000000000
--- a/eos/effects/effect2894.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusStandard
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2899.py b/eos/effects/effect2899.py
deleted file mode 100644
index 35a8f634b..000000000
--- a/eos/effects/effect2899.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusHeavy
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect290.py b/eos/effects/effect290.py
deleted file mode 100644
index 7b53ea966..000000000
--- a/eos/effects/effect290.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# sharpshooterRangeSkillBonusPostPercentMaxRangeLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Frentix Booster (4 of 4)
-# Implants named like: Zainou 'Deadeye' Sharpshooter ST (6 of 6)
-# Skill: Sharpshooter
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level)
diff --git a/eos/effects/effect2900.py b/eos/effects/effect2900.py
deleted file mode 100644
index dc68d5aed..000000000
--- a/eos/effects/effect2900.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusHeavy
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2901.py b/eos/effects/effect2901.py
deleted file mode 100644
index 56296feb1..000000000
--- a/eos/effects/effect2901.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusHeavy
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2902.py b/eos/effects/effect2902.py
deleted file mode 100644
index 5e4087e84..000000000
--- a/eos/effects/effect2902.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusHeavy
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2903.py b/eos/effects/effect2903.py
deleted file mode 100644
index 93b008b9a..000000000
--- a/eos/effects/effect2903.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusHAM
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2904.py b/eos/effects/effect2904.py
deleted file mode 100644
index 8000c3df0..000000000
--- a/eos/effects/effect2904.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusHAM
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2905.py b/eos/effects/effect2905.py
deleted file mode 100644
index 4a01de0bb..000000000
--- a/eos/effects/effect2905.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusHAM
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2906.py b/eos/effects/effect2906.py
deleted file mode 100644
index 13e2d3398..000000000
--- a/eos/effects/effect2906.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusHAM
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2907.py b/eos/effects/effect2907.py
deleted file mode 100644
index 82b228f3e..000000000
--- a/eos/effects/effect2907.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileEMDmgBonusTorpedo
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "emDamage", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2908.py b/eos/effects/effect2908.py
deleted file mode 100644
index 9611c2b22..000000000
--- a/eos/effects/effect2908.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileExplosiveDmgBonusTorpedo
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2909.py b/eos/effects/effect2909.py
deleted file mode 100644
index de8d92fb6..000000000
--- a/eos/effects/effect2909.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileKineticDmgBonusTorpedo
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2910.py b/eos/effects/effect2910.py
deleted file mode 100644
index 22293eb06..000000000
--- a/eos/effects/effect2910.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileThermalDmgBonusTorpedo
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect2911.py b/eos/effects/effect2911.py
deleted file mode 100644
index aaa6af58a..000000000
--- a/eos/effects/effect2911.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# dataminerModuleDurationReduction
-#
-# Used by:
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Data Miners",
-                                  "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect2967.py b/eos/effects/effect2967.py
deleted file mode 100644
index 3682128c1..000000000
--- a/eos/effects/effect2967.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillTriageModuleConsumptionQuantityBonus
-#
-# Used by:
-# Skill: Tactical Logistics Reconfiguration
-type = "passive"
-
-
-def handler(fit, skill, context):
-    amount = -skill.getModifiedItemAttr("consumptionQuantityBonus")
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
-                                     "consumptionQuantity", amount * skill.level)
diff --git a/eos/effects/effect2977.py b/eos/effects/effect2977.py
deleted file mode 100644
index e5f173bbe..000000000
--- a/eos/effects/effect2977.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillRemoteHullRepairSystemsCapNeedBonus
-#
-# Used by:
-# Skill: Remote Hull Repair Systems
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Hull Repair Systems"),
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/effect298.py b/eos/effects/effect298.py
deleted file mode 100644
index d28e30f76..000000000
--- a/eos/effects/effect298.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# surgicalStrikeFalloffBonusPostPercentFalloffLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Sooth Sayer Booster (4 of 4)
-# Implants named like: Zainou 'Deadeye' Trajectory Analysis TA (6 of 6)
-# Skill: Trajectory Analysis
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "falloff", container.getModifiedItemAttr("falloffBonus") * level)
diff --git a/eos/effects/effect2980.py b/eos/effects/effect2980.py
deleted file mode 100644
index 984efa65e..000000000
--- a/eos/effects/effect2980.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillCapitalRemoteHullRepairSystemsCapNeedBonus
-#
-# Used by:
-# Skill: Capital Remote Hull Repair Systems
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Hull Repair Systems"),
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/effect2982.py b/eos/effects/effect2982.py
deleted file mode 100644
index 77c687f34..000000000
--- a/eos/effects/effect2982.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# skillRemoteECMDurationBonus
-#
-# Used by:
-# Skill: Burst Projector Operation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    # We need to make sure that the attribute exists, otherwise we add attributes that don't belong.  See #927
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation") and
-                                              mod.item.getAttribute("duration"),
-                                  "duration",
-                                  skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation") and
-                                              mod.item.getAttribute("durationECMJammerBurstProjector"),
-                                  "durationECMJammerBurstProjector",
-                                  skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation") and
-                                              mod.item.getAttribute("durationTargetIlluminationBurstProjector"),
-                                  "durationTargetIlluminationBurstProjector",
-                                  skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation") and
-                                              mod.item.getAttribute("durationSensorDampeningBurstProjector"),
-                                  "durationSensorDampeningBurstProjector",
-                                  skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation") and
-                                              mod.item.getAttribute("durationWeaponDisruptionBurstProjector"),
-                                  "durationWeaponDisruptionBurstProjector",
-                                  skill.getModifiedItemAttr("projECMDurationBonus") * skill.level)
diff --git a/eos/effects/effect3001.py b/eos/effects/effect3001.py
deleted file mode 100644
index c0fedef1a..000000000
--- a/eos/effects/effect3001.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadRofBonus
-#
-# Used by:
-# Modules from group: Missile Launcher Torpedo (22 of 22)
-# Items from market group: Ship Equipment > Turrets & Bays (429 of 883)
-# Module: Interdiction Sphere Launcher I
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("speed", module.getModifiedItemAttr("overloadRofBonus"))
diff --git a/eos/effects/effect3002.py b/eos/effects/effect3002.py
deleted file mode 100644
index e4ecde55c..000000000
--- a/eos/effects/effect3002.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# overloadSelfDurationBonus
-#
-# Used by:
-# Modules from group: Ancillary Remote Shield Booster (4 of 4)
-# Modules from group: Capacitor Booster (59 of 59)
-# Modules from group: Energy Neutralizer (54 of 54)
-# Modules from group: Energy Nosferatu (54 of 54)
-# Modules from group: Hull Repair Unit (25 of 25)
-# Modules from group: Remote Armor Repairer (39 of 39)
-# Modules from group: Remote Capacitor Transmitter (41 of 41)
-# Modules from group: Remote Shield Booster (38 of 38)
-# Modules from group: Smart Bomb (118 of 118)
-# Modules from group: Warp Disrupt Field Generator (7 of 7)
-# Modules named like: Remote Repairer (56 of 56)
-# Module: Reactive Armor Hardener
-# Module: Target Spectrum Breaker
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus") or 0)
diff --git a/eos/effects/effect3024.py b/eos/effects/effect3024.py
deleted file mode 100644
index efc729b51..000000000
--- a/eos/effects/effect3024.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusCoverOpsBombExplosiveDmg1
-#
-# Used by:
-# Ship: Hound
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect3025.py b/eos/effects/effect3025.py
deleted file mode 100644
index 073b1ead3..000000000
--- a/eos/effects/effect3025.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# overloadSelfDamageBonus
-#
-# Used by:
-# Modules from group: Energy Weapon (101 of 214)
-# Modules from group: Hybrid Weapon (105 of 221)
-# Modules from group: Precursor Weapon (15 of 15)
-# Modules from group: Projectile Weapon (99 of 165)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("damageMultiplier", module.getModifiedItemAttr("overloadDamageModifier"))
diff --git a/eos/effects/effect3026.py b/eos/effects/effect3026.py
deleted file mode 100644
index e44ec9270..000000000
--- a/eos/effects/effect3026.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCoverOpsBombKineticDmg1
-#
-# Used by:
-# Ship: Manticore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect3027.py b/eos/effects/effect3027.py
deleted file mode 100644
index 681231040..000000000
--- a/eos/effects/effect3027.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusCoverOpsBombThermalDmg1
-#
-# Used by:
-# Ship: Nemesis
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect3028.py b/eos/effects/effect3028.py
deleted file mode 100644
index e9ac65114..000000000
--- a/eos/effects/effect3028.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCoverOpsBombEmDmg1
-#
-# Used by:
-# Ship: Purifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "emDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
diff --git a/eos/effects/effect3029.py b/eos/effects/effect3029.py
deleted file mode 100644
index 7e6cc6166..000000000
--- a/eos/effects/effect3029.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadSelfEmHardeningBonus
-#
-# Used by:
-# Variations of module: Armor EM Hardener I (39 of 39)
-# Variations of module: EM Ward Field I (19 of 19)
-# Module: Civilian EM Ward Field
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("emDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/effect3030.py b/eos/effects/effect3030.py
deleted file mode 100644
index a97ab16fb..000000000
--- a/eos/effects/effect3030.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadSelfThermalHardeningBonus
-#
-# Used by:
-# Variations of module: Armor Thermal Hardener I (39 of 39)
-# Variations of module: Thermal Dissipation Field I (19 of 19)
-# Module: Civilian Thermal Dissipation Field
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("thermalDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/effect3031.py b/eos/effects/effect3031.py
deleted file mode 100644
index 9762eaf14..000000000
--- a/eos/effects/effect3031.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadSelfExplosiveHardeningBonus
-#
-# Used by:
-# Variations of module: Armor Explosive Hardener I (39 of 39)
-# Variations of module: Explosive Deflection Field I (19 of 19)
-# Module: Civilian Explosive Deflection Field
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("explosiveDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/effect3032.py b/eos/effects/effect3032.py
deleted file mode 100644
index 549ddf5e7..000000000
--- a/eos/effects/effect3032.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadSelfKineticHardeningBonus
-#
-# Used by:
-# Variations of module: Armor Kinetic Hardener I (39 of 39)
-# Variations of module: Kinetic Deflection Field I (19 of 19)
-# Module: Civilian Kinetic Deflection Field
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("kineticDamageResistanceBonus", module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/effect3035.py b/eos/effects/effect3035.py
deleted file mode 100644
index 59e6a1575..000000000
--- a/eos/effects/effect3035.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# overloadSelfHardeningInvulnerabilityBonus
-#
-# Used by:
-# Modules named like: Capital Flex Hardener (9 of 9)
-# Variations of module: Adaptive Invulnerability Field I (17 of 17)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        module.boostItemAttr("%sDamageResistanceBonus" % type,
-                             module.getModifiedItemAttr("overloadHardeningBonus"))
diff --git a/eos/effects/effect3036.py b/eos/effects/effect3036.py
deleted file mode 100644
index 4db900c9b..000000000
--- a/eos/effects/effect3036.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillBombDeploymentModuleReactivationDelayBonus
-#
-# Used by:
-# Skill: Bomb Deployment
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Bomb",
-                                  "moduleReactivationDelay", skill.getModifiedItemAttr("reactivationDelayBonus") * skill.level)
diff --git a/eos/effects/effect3046.py b/eos/effects/effect3046.py
deleted file mode 100644
index 24e833fb3..000000000
--- a/eos/effects/effect3046.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# modifyMaxVelocityOfShipPassive
-#
-# Used by:
-# Modules from group: Expanded Cargohold (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityModifier"), stackingPenalties=True)
diff --git a/eos/effects/effect3047.py b/eos/effects/effect3047.py
deleted file mode 100644
index 543cb488a..000000000
--- a/eos/effects/effect3047.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# structureHPMultiplyPassive
-#
-# Used by:
-# Modules from group: Expanded Cargohold (7 of 7)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("hp", module.getModifiedItemAttr("structureHPMultiplier"))
diff --git a/eos/effects/effect3061.py b/eos/effects/effect3061.py
deleted file mode 100644
index a4648cefa..000000000
--- a/eos/effects/effect3061.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# heatDamageBonus
-#
-# Used by:
-# Modules from group: Shield Boost Amplifier (25 of 25)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "heatDamage", module.getModifiedItemAttr("heatDamageBonus"))
diff --git a/eos/effects/effect315.py b/eos/effects/effect315.py
deleted file mode 100644
index aae3f84a7..000000000
--- a/eos/effects/effect315.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# dronesSkillBoostMaxActiveDroneBonus
-#
-# Used by:
-# Skill: Drones
-type = "passive"
-
-
-def handler(fit, skill, context):
-    amount = skill.getModifiedItemAttr("maxActiveDroneBonus") * skill.level
-    fit.extraAttributes.increase("maxActiveDrones", amount)
diff --git a/eos/effects/effect3169.py b/eos/effects/effect3169.py
deleted file mode 100644
index 427290a3f..000000000
--- a/eos/effects/effect3169.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shieldTransportCpuNeedBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (3 of 7)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "cpu",
-                                  src.getModifiedItemAttr("shieldTransportCpuNeedBonus"))
diff --git a/eos/effects/effect3172.py b/eos/effects/effect3172.py
deleted file mode 100644
index a5cfb52fe..000000000
--- a/eos/effects/effect3172.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# droneArmorDamageBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (6 of 7)
-# Ship: Exequror
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    # This is actually level-less bonus, anyway you have to train cruisers 5
-    # and will get 100% (20%/lvl as stated by description)
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
-                                 "armorDamageAmount", ship.getModifiedItemAttr("droneArmorDamageAmountBonus"))
diff --git a/eos/effects/effect3173.py b/eos/effects/effect3173.py
deleted file mode 100644
index 2f2d1e6c5..000000000
--- a/eos/effects/effect3173.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# droneShieldBonusBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (6 of 7)
-# Ship: Exequror
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    # This is actually level-less bonus, anyway you have to train cruisers 5
-    # and will get 100% (20%/lvl as stated by description)
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
-                                 "shieldBonus", ship.getModifiedItemAttr("droneShieldBonusBonus"))
diff --git a/eos/effects/effect3174.py b/eos/effects/effect3174.py
deleted file mode 100644
index 781bf4794..000000000
--- a/eos/effects/effect3174.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# overloadSelfRangeBonus
-#
-# Used by:
-# Modules from group: Stasis Grappler (7 of 7)
-# Modules from group: Stasis Web (19 of 19)
-# Modules from group: Warp Scrambler (54 of 55)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxRange", module.getModifiedItemAttr("overloadRangeBonus"),
-                         stackingPenalties=True)
diff --git a/eos/effects/effect3175.py b/eos/effects/effect3175.py
deleted file mode 100644
index cc5dbe3f6..000000000
--- a/eos/effects/effect3175.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# overloadSelfSpeedBonus
-#
-# Used by:
-# Modules from group: Propulsion Module (133 of 133)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("speedFactor", module.getModifiedItemAttr("overloadSpeedFactorBonus"),
-                         stackingPenalties=True)
diff --git a/eos/effects/effect3182.py b/eos/effects/effect3182.py
deleted file mode 100644
index f39a5eed1..000000000
--- a/eos/effects/effect3182.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# overloadSelfECMStrenghtBonus
-#
-# Used by:
-# Modules from group: Burst Jammer (11 of 11)
-# Modules from group: ECM (39 of 39)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-            module.boostItemAttr("scan{0}StrengthBonus".format(scanType),
-                                 module.getModifiedItemAttr("overloadECMStrengthBonus"),
-                                 stackingPenalties=True)
diff --git a/eos/effects/effect3196.py b/eos/effects/effect3196.py
deleted file mode 100644
index 0386ad6e6..000000000
--- a/eos/effects/effect3196.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# thermodynamicsSkillDamageBonus
-#
-# Used by:
-# Skill: Thermodynamics
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: "heatDamage" in mod.item.attributes, "heatDamage",
-                                  skill.getModifiedItemAttr("thermodynamicsHeatDamage") * skill.level)
diff --git a/eos/effects/effect3200.py b/eos/effects/effect3200.py
deleted file mode 100644
index c7a2a1049..000000000
--- a/eos/effects/effect3200.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# overloadSelfArmorDamageAmountDurationBonus
-#
-# Used by:
-# Modules from group: Ancillary Armor Repairer (7 of 7)
-# Modules from group: Armor Repair Unit (108 of 108)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus"))
-    module.boostItemAttr("armorDamageAmount", module.getModifiedItemAttr("overloadArmorDamageAmount"),
-                         stackingPenalties=True)
diff --git a/eos/effects/effect3201.py b/eos/effects/effect3201.py
deleted file mode 100644
index 4706ccbca..000000000
--- a/eos/effects/effect3201.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# overloadSelfShieldBonusDurationBonus
-#
-# Used by:
-# Modules from group: Ancillary Shield Booster (8 of 8)
-# Modules from group: Shield Booster (97 of 97)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus"))
-    module.boostItemAttr("shieldBonus", module.getModifiedItemAttr("overloadShieldBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect3212.py b/eos/effects/effect3212.py
deleted file mode 100644
index a4cb02f67..000000000
--- a/eos/effects/effect3212.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileSkillFoFAoeCloudSizeBonus
-#
-# Used by:
-# Implants named like: Zainou 'Snapshot' Auto Targeting Explosion Radius FR (6 of 6)
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("FoF Missiles"),
-                                    "aoeCloudSize", container.getModifiedItemAttr("aoeCloudSizeBonus") * level)
diff --git a/eos/effects/effect3234.py b/eos/effects/effect3234.py
deleted file mode 100644
index 4ff2ef7f2..000000000
--- a/eos/effects/effect3234.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketExplosiveDmgAF
-#
-# Used by:
-# Ship: Anathema
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3235.py b/eos/effects/effect3235.py
deleted file mode 100644
index f3b178535..000000000
--- a/eos/effects/effect3235.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketKineticDmgAF
-#
-# Used by:
-# Ship: Anathema
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3236.py b/eos/effects/effect3236.py
deleted file mode 100644
index b937c6760..000000000
--- a/eos/effects/effect3236.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketThermalDmgAF
-#
-# Used by:
-# Ship: Anathema
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3237.py b/eos/effects/effect3237.py
deleted file mode 100644
index 440ae90cb..000000000
--- a/eos/effects/effect3237.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketEmDmgAF
-#
-# Used by:
-# Ship: Anathema
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3241.py b/eos/effects/effect3241.py
deleted file mode 100644
index d65a4a148..000000000
--- a/eos/effects/effect3241.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipArmorEmResistance1
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                           skill="Assault Frigates")
diff --git a/eos/effects/effect3242.py b/eos/effects/effect3242.py
deleted file mode 100644
index ef7175b0b..000000000
--- a/eos/effects/effect3242.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipArmorThermalResistance1
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                           skill="Assault Frigates")
diff --git a/eos/effects/effect3243.py b/eos/effects/effect3243.py
deleted file mode 100644
index e9be2dd52..000000000
--- a/eos/effects/effect3243.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipArmorKineticResistance1
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                           skill="Assault Frigates")
diff --git a/eos/effects/effect3244.py b/eos/effects/effect3244.py
deleted file mode 100644
index 937dd7309..000000000
--- a/eos/effects/effect3244.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipArmorExplosiveResistance1
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"),
-                           skill="Assault Frigates")
diff --git a/eos/effects/effect3249.py b/eos/effects/effect3249.py
deleted file mode 100644
index 5822015f5..000000000
--- a/eos/effects/effect3249.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipCapRecharge2AF
-#
-# Used by:
-# Ship: Anathema
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3264.py b/eos/effects/effect3264.py
deleted file mode 100644
index e6b8f558b..000000000
--- a/eos/effects/effect3264.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillIndustrialReconfigurationConsumptionQuantityBonus
-#
-# Used by:
-# Skill: Industrial Reconfiguration
-type = "passive"
-
-
-def handler(fit, skill, context):
-    amount = -skill.getModifiedItemAttr("consumptionQuantityBonus")
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill(skill),
-                                     "consumptionQuantity", amount * skill.level)
diff --git a/eos/effects/effect3267.py b/eos/effects/effect3267.py
deleted file mode 100644
index fd57fb534..000000000
--- a/eos/effects/effect3267.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipConsumptionQuantityBonusIndustrialReconfigurationORECapital1
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Industrial Reconfiguration"),
-                                  "consumptionQuantity", ship.getModifiedItemAttr("shipBonusORECapital1"),
-                                  skill="Capital Industrial Ships")
diff --git a/eos/effects/effect3297.py b/eos/effects/effect3297.py
deleted file mode 100644
index 925a33c92..000000000
--- a/eos/effects/effect3297.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyNeutralizerTransferAmountBonusAB
-#
-# Used by:
-# Ship: Bhaalgorn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAB"),
-                                  skill="Amarr Battleship")
diff --git a/eos/effects/effect3298.py b/eos/effects/effect3298.py
deleted file mode 100644
index 4dfc4dc87..000000000
--- a/eos/effects/effect3298.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipEnergyNeutralizerTransferAmountBonusAC
-#
-# Used by:
-# Ship: Ashimmu
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAC"),
-                                  skill="Amarr Cruiser")
diff --git a/eos/effects/effect3299.py b/eos/effects/effect3299.py
deleted file mode 100644
index 76b6c1f33..000000000
--- a/eos/effects/effect3299.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipEnergyNeutralizerTransferAmountBonusAF
-#
-# Used by:
-# Ship: Caedes
-# Ship: Cruor
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAF"),
-                                  skill="Amarr Frigate")
diff --git a/eos/effects/effect3313.py b/eos/effects/effect3313.py
deleted file mode 100644
index 0ab64f55e..000000000
--- a/eos/effects/effect3313.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# cloneVatMaxJumpCloneBonusSkillNew
-#
-# Used by:
-# Skill: Cloning Facility Operation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.ship.boostItemAttr("maxJumpClones", skill.getModifiedItemAttr("maxJumpClonesBonus") * skill.level)
diff --git a/eos/effects/effect3331.py b/eos/effects/effect3331.py
deleted file mode 100644
index c8492c130..000000000
--- a/eos/effects/effect3331.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusCommandShipArmorHP1
-#
-# Used by:
-# Ship: Damnation
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/effect3335.py b/eos/effects/effect3335.py
deleted file mode 100644
index 777c51ec0..000000000
--- a/eos/effects/effect3335.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipArmorEmResistanceMC2
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3336.py b/eos/effects/effect3336.py
deleted file mode 100644
index f6ef4cfab..000000000
--- a/eos/effects/effect3336.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorExplosiveResistanceMC2
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"),
-                           skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3339.py b/eos/effects/effect3339.py
deleted file mode 100644
index fe1303bd5..000000000
--- a/eos/effects/effect3339.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorKineticResistanceMC2
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"),
-                           skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3340.py b/eos/effects/effect3340.py
deleted file mode 100644
index 85ca998f0..000000000
--- a/eos/effects/effect3340.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorThermalResistanceMC2
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"),
-                           skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3343.py b/eos/effects/effect3343.py
deleted file mode 100644
index b5d232374..000000000
--- a/eos/effects/effect3343.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorsProjectileFalloff1
-#
-# Used by:
-# Ship: Broadsword
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect3355.py b/eos/effects/effect3355.py
deleted file mode 100644
index 6f5239340..000000000
--- a/eos/effects/effect3355.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorHeavyMissileVelocityBonus1
-#
-# Used by:
-# Ship: Onyx
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                    skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect3356.py b/eos/effects/effect3356.py
deleted file mode 100644
index ef0e91456..000000000
--- a/eos/effects/effect3356.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorHeavyAssaultMissileVelocityBonus
-#
-# Used by:
-# Ship: Onyx
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                    skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect3357.py b/eos/effects/effect3357.py
deleted file mode 100644
index aee02924c..000000000
--- a/eos/effects/effect3357.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorLightMissileVelocityBonus
-#
-# Used by:
-# Ship: Onyx
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                    skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect3366.py b/eos/effects/effect3366.py
deleted file mode 100644
index ac0d80650..000000000
--- a/eos/effects/effect3366.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRemoteSensorDampenerCapNeedGF
-#
-# Used by:
-# Ship: Keres
-# Ship: Maulus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect3367.py b/eos/effects/effect3367.py
deleted file mode 100644
index 20e48def7..000000000
--- a/eos/effects/effect3367.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusElectronicAttackShipWarpScramblerMaxRange1
-#
-# Used by:
-# Ship: Keres
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3369.py b/eos/effects/effect3369.py
deleted file mode 100644
index 4b5fdb0fd..000000000
--- a/eos/effects/effect3369.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusElectronicAttackShipECMOptimalRange1
-#
-# Used by:
-# Ship: Kitsune
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3370.py b/eos/effects/effect3370.py
deleted file mode 100644
index 929219c96..000000000
--- a/eos/effects/effect3370.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusElectronicAttackShipStasisWebMaxRange1
-#
-# Used by:
-# Ship: Hyena
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3371.py b/eos/effects/effect3371.py
deleted file mode 100644
index 63e03d14d..000000000
--- a/eos/effects/effect3371.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusElectronicAttackShipWarpScramblerCapNeed2
-#
-# Used by:
-# Ship: Keres
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3374.py b/eos/effects/effect3374.py
deleted file mode 100644
index 29dfc8f55..000000000
--- a/eos/effects/effect3374.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusElectronicAttackShipSignatureRadius2
-#
-# Used by:
-# Ship: Hyena
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
-                           skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3379.py b/eos/effects/effect3379.py
deleted file mode 100644
index 1f0adf21c..000000000
--- a/eos/effects/effect3379.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# implantHardwiringABcapacitorNeed
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Fuel Conservation FC (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "capacitorNeed", implant.getModifiedItemAttr("capNeedBonus"))
diff --git a/eos/effects/effect3380.py b/eos/effects/effect3380.py
deleted file mode 100644
index 5a5878fd4..000000000
--- a/eos/effects/effect3380.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# warpDisruptSphere
-#
-# Used by:
-# Modules from group: Warp Disrupt Field Generator (7 of 7)
-
-# warpDisruptSphere
-#
-# Used by:
-# Modules from group: Warp Disrupt Field Generator (7 of 7)
-from eos.const import FittingModuleState
-
-type = "projected", "active"
-runTime = "early"
-
-
-def handler(fit, module, context):
-
-    if "projected" in context:
-        fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
-        if module.charge is not None and module.charge.ID == 45010:
-            for mod in fit.modules:
-                if not mod.isEmpty and mod.item.requiresSkill("High Speed Maneuvering") and mod.state > FittingModuleState.ONLINE:
-                    mod.state = FittingModuleState.ONLINE
-                if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > FittingModuleState.ONLINE:
-                    mod.state = FittingModuleState.ONLINE
-    else:
-        if module.charge is None:
-            fit.ship.boostItemAttr("mass", module.getModifiedItemAttr("massBonusPercentage"))
-            fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"))
-            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                          "speedBoostFactor", module.getModifiedItemAttr("speedBoostFactorBonus"))
-            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                      "speedFactor", module.getModifiedItemAttr("speedFactorBonus"))
-
-        fit.ship.forceItemAttr("disallowAssistance", 1)
diff --git a/eos/effects/effect3392.py b/eos/effects/effect3392.py
deleted file mode 100644
index 0d20b2c44..000000000
--- a/eos/effects/effect3392.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusBlackOpsLargeEnergyTurretTracking1
-#
-# Used by:
-# Ship: Redeemer
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/effect34.py b/eos/effects/effect34.py
deleted file mode 100644
index 491b73f0c..000000000
--- a/eos/effects/effect34.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# projectileFired
-#
-# Used by:
-# Modules from group: Hybrid Weapon (221 of 221)
-# Modules from group: Projectile Weapon (165 of 165)
-type = 'active'
-
-
-def handler(fit, module, context):
-    rt = module.getModifiedItemAttr("reloadTime")
-    if not rt:
-        # Set reload time to 10 seconds
-        module.reloadTime = 10000
-    else:
-        module.reloadTime = rt
diff --git a/eos/effects/effect3403.py b/eos/effects/effect3403.py
deleted file mode 100644
index af6239d41..000000000
--- a/eos/effects/effect3403.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusBlackOpsCloakVelocity2
-#
-# Used by:
-# Ships from group: Black Ops (5 of 5)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    if fit.extraAttributes["cloaked"]:
-        fit.ship.multiplyItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps2"), skill="Black Ops")
diff --git a/eos/effects/effect3406.py b/eos/effects/effect3406.py
deleted file mode 100644
index 8fe20233c..000000000
--- a/eos/effects/effect3406.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusBlackOpsMaxVelocity1
-#
-# Used by:
-# Ship: Panther
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/effect3415.py b/eos/effects/effect3415.py
deleted file mode 100644
index 9b25bb56f..000000000
--- a/eos/effects/effect3415.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsLargeEnergyTurretDamageRole1
-#
-# Used by:
-# Ship: Paladin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect3416.py b/eos/effects/effect3416.py
deleted file mode 100644
index 932faef41..000000000
--- a/eos/effects/effect3416.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsLargeHybridTurretDamageRole1
-#
-# Used by:
-# Ship: Kronos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect3417.py b/eos/effects/effect3417.py
deleted file mode 100644
index b0166442e..000000000
--- a/eos/effects/effect3417.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsLargeProjectileTurretDamageRole1
-#
-# Used by:
-# Ship: Vargur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect3424.py b/eos/effects/effect3424.py
deleted file mode 100644
index da791d457..000000000
--- a/eos/effects/effect3424.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsLargeHybridTurretTracking1
-#
-# Used by:
-# Ship: Kronos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders")
diff --git a/eos/effects/effect3425.py b/eos/effects/effect3425.py
deleted file mode 100644
index 708c6098c..000000000
--- a/eos/effects/effect3425.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsLargeProjectileTurretTracking1
-#
-# Used by:
-# Ship: Vargur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders")
diff --git a/eos/effects/effect3427.py b/eos/effects/effect3427.py
deleted file mode 100644
index e6e49cbd3..000000000
--- a/eos/effects/effect3427.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsTractorBeamMaxRangeRole2
-#
-# Used by:
-# Ships from group: Marauder (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusViolatorsRole2"))
diff --git a/eos/effects/effect3439.py b/eos/effects/effect3439.py
deleted file mode 100644
index cf16508e5..000000000
--- a/eos/effects/effect3439.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusViolatorsEwTargetPainting1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusViolators1"),
-                                  skill="Marauders")
diff --git a/eos/effects/effect3447.py b/eos/effects/effect3447.py
deleted file mode 100644
index 5cd2fade4..000000000
--- a/eos/effects/effect3447.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusPTFalloffMB1
-#
-# Used by:
-# Ship: Marshal
-# Ship: Vargur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect3466.py b/eos/effects/effect3466.py
deleted file mode 100644
index b9d5bbf34..000000000
--- a/eos/effects/effect3466.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusElectronicAttackShipRechargeRate2
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
-                           skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3467.py b/eos/effects/effect3467.py
deleted file mode 100644
index bb5fa326e..000000000
--- a/eos/effects/effect3467.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusElectronicAttackShipCapacitorCapacity2
-#
-# Used by:
-# Ship: Kitsune
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"),
-                           skill="Electronic Attack Ships")
diff --git a/eos/effects/effect3468.py b/eos/effects/effect3468.py
deleted file mode 100644
index 20a47e364..000000000
--- a/eos/effects/effect3468.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorsWarpDisruptFieldGeneratorWarpScrambleRange2
-#
-# Used by:
-# Ships from group: Heavy Interdiction Cruiser (5 of 5)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Disrupt Field Generator",
-                                  "warpScrambleRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors2"),
-                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect3473.py b/eos/effects/effect3473.py
deleted file mode 100644
index 747b01bb9..000000000
--- a/eos/effects/effect3473.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusViolatorsTractorBeamMaxTractorVelocityRole3
-#
-# Used by:
-# Ships from group: Marauder (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxTractorVelocity", ship.getModifiedItemAttr("eliteBonusViolatorsRole3"))
diff --git a/eos/effects/effect3478.py b/eos/effects/effect3478.py
deleted file mode 100644
index ff1e9558a..000000000
--- a/eos/effects/effect3478.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLaserDamagePirateBattleship
-#
-# Used by:
-# Ship: Bhaalgorn
-# Ship: Nightmare
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect3480.py b/eos/effects/effect3480.py
deleted file mode 100644
index ad820e01d..000000000
--- a/eos/effects/effect3480.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipTrackingBonusAB
-#
-# Used by:
-# Ship: Nightmare
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect3483.py b/eos/effects/effect3483.py
deleted file mode 100644
index 8e3662ced..000000000
--- a/eos/effects/effect3483.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusMediumEnergyTurretDamagePirateFaction
-#
-# Used by:
-# Ship: Ashimmu
-# Ship: Fiend
-# Ship: Gnosis
-# Ship: Phantasm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect3484.py b/eos/effects/effect3484.py
deleted file mode 100644
index d0c9a8e55..000000000
--- a/eos/effects/effect3484.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMediumEnergyTurretTrackingAC2
-#
-# Used by:
-# Ship: Fiend
-# Ship: Phantasm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect3487.py b/eos/effects/effect3487.py
deleted file mode 100644
index f4b2ccfca..000000000
--- a/eos/effects/effect3487.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipBonusSmallEnergyTurretDamagePirateFaction
-#
-# Used by:
-# Ship: Caedes
-# Ship: Confessor
-# Ship: Cruor
-# Ship: Imp
-# Ship: Succubus
-# Ship: Sunesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect3489.py b/eos/effects/effect3489.py
deleted file mode 100644
index 76232e8f4..000000000
--- a/eos/effects/effect3489.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSmallEnergyTurretTracking2AF
-#
-# Used by:
-# Ship: Imp
-# Ship: Succubus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect3493.py b/eos/effects/effect3493.py
deleted file mode 100644
index 1b10ac223..000000000
--- a/eos/effects/effect3493.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# rorqualCargoScanRangeBonus
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cargo Scanner",
-                                  "cargoScanRange", ship.getModifiedItemAttr("cargoScannerRangeBonus"))
diff --git a/eos/effects/effect3494.py b/eos/effects/effect3494.py
deleted file mode 100644
index 1a49d68ce..000000000
--- a/eos/effects/effect3494.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# rorqualSurveyScannerRangeBonus
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner",
-                                  "surveyScanRange", ship.getModifiedItemAttr("surveyScannerRangeBonus"))
diff --git a/eos/effects/effect3495.py b/eos/effects/effect3495.py
deleted file mode 100644
index eb349db5c..000000000
--- a/eos/effects/effect3495.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipCapPropulsionJamming
-#
-# Used by:
-# Ships from group: Interceptor (10 of 10)
-# Ship: Atron
-# Ship: Condor
-# Ship: Executioner
-# Ship: Slasher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    groups = ("Stasis Web", "Warp Scrambler")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusInterceptorRole"))
diff --git a/eos/effects/effect3496.py b/eos/effects/effect3496.py
deleted file mode 100644
index 78313ac62..000000000
--- a/eos/effects/effect3496.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusThukker
-#
-# Used by:
-# Implants named like: grade Nomad (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "agilityBonus", implant.getModifiedItemAttr("implantSetThukker"))
diff --git a/eos/effects/effect3498.py b/eos/effects/effect3498.py
deleted file mode 100644
index a63079741..000000000
--- a/eos/effects/effect3498.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusSisters
-#
-# Used by:
-# Implants named like: grade Virtue (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "scanStrengthBonus", implant.getModifiedItemAttr("implantSetSisters"))
diff --git a/eos/effects/effect3499.py b/eos/effects/effect3499.py
deleted file mode 100644
index ffb9c754f..000000000
--- a/eos/effects/effect3499.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# setBonusSyndicate
-#
-# Used by:
-# Implants named like: grade Edge (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "boosterAttributeModifier",
-                                             implant.getModifiedItemAttr("implantSetSyndicate"))
diff --git a/eos/effects/effect3513.py b/eos/effects/effect3513.py
deleted file mode 100644
index 6db3789dd..000000000
--- a/eos/effects/effect3513.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusMordus
-#
-# Used by:
-# Implants named like: grade Centurion (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "rangeSkillBonus", implant.getModifiedItemAttr("implantSetMordus"))
diff --git a/eos/effects/effect3514.py b/eos/effects/effect3514.py
deleted file mode 100644
index d878926d0..000000000
--- a/eos/effects/effect3514.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Interceptor2WarpScrambleRange
-#
-# Used by:
-# Ships from group: Interceptor (6 of 10)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
diff --git a/eos/effects/effect3519.py b/eos/effects/effect3519.py
deleted file mode 100644
index 72f944de7..000000000
--- a/eos/effects/effect3519.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringBombLauncher
-#
-# Used by:
-# Skill: Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"),
-                                  "cpu", skill.getModifiedItemAttr("cpuNeedBonus") * skill.level)
diff --git a/eos/effects/effect3520.py b/eos/effects/effect3520.py
deleted file mode 100644
index 769b0327f..000000000
--- a/eos/effects/effect3520.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillAdvancedWeaponUpgradesPowerNeedBonusBombLaunchers
-#
-# Used by:
-# Skill: Advanced Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"),
-                                  "power", skill.getModifiedItemAttr("powerNeedBonus") * skill.level)
diff --git a/eos/effects/effect3526.py b/eos/effects/effect3526.py
deleted file mode 100644
index d6bda31b7..000000000
--- a/eos/effects/effect3526.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# cynosuralTheoryConsumptionBonus
-#
-# Used by:
-# Ships from group: Force Recon Ship (8 of 9)
-# Skill: Cynosural Field Theory
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cynosural Field Generator",
-                                  "consumptionQuantity",
-                                  container.getModifiedItemAttr("consumptionQuantityBonusPercentage") * level)
diff --git a/eos/effects/effect3530.py b/eos/effects/effect3530.py
deleted file mode 100644
index d5a92e778..000000000
--- a/eos/effects/effect3530.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusBlackOpsAgiliy1
-#
-# Used by:
-# Ship: Sin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/effect3532.py b/eos/effects/effect3532.py
deleted file mode 100644
index 5cb2d9654..000000000
--- a/eos/effects/effect3532.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillJumpDriveConsumptionAmountBonusPercentage
-#
-# Used by:
-# Skill: Jump Fuel Conservation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.ship.boostItemAttr("jumpDriveConsumptionAmount",
-                           skill.getModifiedItemAttr("consumptionQuantityBonusPercentage") * skill.level)
diff --git a/eos/effects/effect3561.py b/eos/effects/effect3561.py
deleted file mode 100644
index 6a532270d..000000000
--- a/eos/effects/effect3561.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillTrackingDisruptionTrackingSpeedBonus
-#
-# Used by:
-# Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Weapon Destabilization
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "trackingSpeedBonus",
-                                  container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/effect3568.py b/eos/effects/effect3568.py
deleted file mode 100644
index 87225755e..000000000
--- a/eos/effects/effect3568.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkMaxRangeBonus1
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect3569.py b/eos/effects/effect3569.py
deleted file mode 100644
index f95e79062..000000000
--- a/eos/effects/effect3569.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkMaxRangeBonus2
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect3570.py b/eos/effects/effect3570.py
deleted file mode 100644
index b79d6faf0..000000000
--- a/eos/effects/effect3570.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkTrackingSpeedBonus2
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect3571.py b/eos/effects/effect3571.py
deleted file mode 100644
index dcb3c5d3a..000000000
--- a/eos/effects/effect3571.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkTrackingSpeedBonus1
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect3586.py b/eos/effects/effect3586.py
deleted file mode 100644
index 0f218ec69..000000000
--- a/eos/effects/effect3586.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# ewSkillSignalSuppressionScanResolutionBonus
-#
-# Used by:
-# Modules named like: Inverted Signal Field Projector (8 of 8)
-# Skill: Signal Suppression
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context else True
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus",
-                                  container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level,
-                                  stackingPenalties=penalized)
diff --git a/eos/effects/effect3587.py b/eos/effects/effect3587.py
deleted file mode 100644
index 7d1afd2ed..000000000
--- a/eos/effects/effect3587.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusGC2
-#
-# Used by:
-# Variations of ship: Celestis (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGC2"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect3588.py b/eos/effects/effect3588.py
deleted file mode 100644
index bbfd54a57..000000000
--- a/eos/effects/effect3588.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusGF2
-#
-# Used by:
-# Ship: Keres
-# Ship: Maulus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGF2"),
-                                  skill="Gallente Frigate")
diff --git a/eos/effects/effect3589.py b/eos/effects/effect3589.py
deleted file mode 100644
index ede9c9d7e..000000000
--- a/eos/effects/effect3589.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusEwRemoteSensorDampenerScanResolutionBonusGF2
-#
-# Used by:
-# Ship: Keres
-# Ship: Maulus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGF2"),
-                                  skill="Gallente Frigate")
diff --git a/eos/effects/effect3590.py b/eos/effects/effect3590.py
deleted file mode 100644
index b8b1259dc..000000000
--- a/eos/effects/effect3590.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEwRemoteSensorDampenerScanResolutionBonusGC2
-#
-# Used by:
-# Variations of ship: Celestis (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGC2"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect3591.py b/eos/effects/effect3591.py
deleted file mode 100644
index 534c3af7a..000000000
--- a/eos/effects/effect3591.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillSignalSuppressionMaxTargetRangeBonus
-#
-# Used by:
-# Modules named like: Inverted Signal Field Projector (8 of 8)
-# Skill: Signal Suppression
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus",
-                                  container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/effect3592.py b/eos/effects/effect3592.py
deleted file mode 100644
index df631889f..000000000
--- a/eos/effects/effect3592.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusJumpFreighterHullHP1
-#
-# Used by:
-# Ships from group: Jump Freighter (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("hp", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"), skill="Jump Freighters")
diff --git a/eos/effects/effect3593.py b/eos/effects/effect3593.py
deleted file mode 100644
index 811dc7770..000000000
--- a/eos/effects/effect3593.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusJumpFreighterJumpDriveConsumptionAmount2
-#
-# Used by:
-# Ships from group: Jump Freighter (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("jumpDriveConsumptionAmount", ship.getModifiedItemAttr("eliteBonusJumpFreighter2"),
-                           skill="Jump Freighters")
diff --git a/eos/effects/effect3597.py b/eos/effects/effect3597.py
deleted file mode 100644
index c1d064018..000000000
--- a/eos/effects/effect3597.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptSensorBoosterScanResolutionBonusBonus
-#
-# Used by:
-# Charges from group: Sensor Booster Script (3 of 3)
-# Charges from group: Sensor Dampener Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("scanResolutionBonus", module.getModifiedChargeAttr("scanResolutionBonusBonus"))
diff --git a/eos/effects/effect3598.py b/eos/effects/effect3598.py
deleted file mode 100644
index a74e9d0bc..000000000
--- a/eos/effects/effect3598.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptSensorBoosterMaxTargetRangeBonusBonus
-#
-# Used by:
-# Charges from group: Sensor Booster Script (3 of 3)
-# Charges from group: Sensor Dampener Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxTargetRangeBonus", module.getModifiedChargeAttr("maxTargetRangeBonusBonus"))
diff --git a/eos/effects/effect3599.py b/eos/effects/effect3599.py
deleted file mode 100644
index ff256a748..000000000
--- a/eos/effects/effect3599.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptTrackingComputerTrackingSpeedBonusBonus
-#
-# Used by:
-# Charges from group: Tracking Disruption Script (2 of 2)
-# Charges from group: Tracking Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("trackingSpeedBonus", module.getModifiedChargeAttr("trackingSpeedBonusBonus"))
diff --git a/eos/effects/effect3600.py b/eos/effects/effect3600.py
deleted file mode 100644
index c3b510a7b..000000000
--- a/eos/effects/effect3600.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptTrackingComputerMaxRangeBonusBonus
-#
-# Used by:
-# Charges from group: Tracking Disruption Script (2 of 2)
-# Charges from group: Tracking Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxRangeBonus", module.getModifiedChargeAttr("maxRangeBonusBonus"))
diff --git a/eos/effects/effect3601.py b/eos/effects/effect3601.py
deleted file mode 100644
index 4c224a0ef..000000000
--- a/eos/effects/effect3601.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# scriptWarpDisruptionFieldGeneratorSetDisallowInEmpireSpace
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.forceItemAttr("disallowInEmpireSpace", module.getModifiedChargeAttr("disallowInEmpireSpace"))
diff --git a/eos/effects/effect3602.py b/eos/effects/effect3602.py
deleted file mode 100644
index 23361f87b..000000000
--- a/eos/effects/effect3602.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# scriptDurationBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("duration", module.getModifiedChargeAttr("durationBonus"))
diff --git a/eos/effects/effect3617.py b/eos/effects/effect3617.py
deleted file mode 100644
index 34ee9918f..000000000
--- a/eos/effects/effect3617.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptSignatureRadiusBonusBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("signatureRadiusBonus", module.getModifiedChargeAttr("signatureRadiusBonusBonus"))
diff --git a/eos/effects/effect3618.py b/eos/effects/effect3618.py
deleted file mode 100644
index dcf4a6c02..000000000
--- a/eos/effects/effect3618.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptMassBonusPercentageBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("massBonusPercentage", module.getModifiedChargeAttr("massBonusPercentageBonus"))
diff --git a/eos/effects/effect3619.py b/eos/effects/effect3619.py
deleted file mode 100644
index 7ead7eb03..000000000
--- a/eos/effects/effect3619.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptSpeedBoostFactorBonusBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("speedBoostFactorBonus", module.getModifiedChargeAttr("speedBoostFactorBonusBonus"))
diff --git a/eos/effects/effect3620.py b/eos/effects/effect3620.py
deleted file mode 100644
index f3d560d76..000000000
--- a/eos/effects/effect3620.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptSpeedFactorBonusBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("speedFactorBonus", module.getModifiedChargeAttr("speedFactorBonusBonus"))
diff --git a/eos/effects/effect3648.py b/eos/effects/effect3648.py
deleted file mode 100644
index cc253590b..000000000
--- a/eos/effects/effect3648.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# scriptWarpScrambleRangeBonus
-#
-# Used by:
-# Charges from group: Warp Disruption Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("warpScrambleRange", module.getModifiedChargeAttr("warpScrambleRangeBonus"))
diff --git a/eos/effects/effect3649.py b/eos/effects/effect3649.py
deleted file mode 100644
index fd2aad0bb..000000000
--- a/eos/effects/effect3649.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusViolatorsLargeEnergyTurretDamage1
-#
-# Used by:
-# Ship: Paladin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolators1"),
-                                  skill="Marauders")
diff --git a/eos/effects/effect3650.py b/eos/effects/effect3650.py
deleted file mode 100644
index cd2c3cf5e..000000000
--- a/eos/effects/effect3650.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewGroupRsdMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Centurion (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/effect3651.py b/eos/effects/effect3651.py
deleted file mode 100644
index a764367c0..000000000
--- a/eos/effects/effect3651.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewGroupTpMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Centurion (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/effect3652.py b/eos/effects/effect3652.py
deleted file mode 100644
index 5fcc86c66..000000000
--- a/eos/effects/effect3652.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewGroupTdMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Centurion (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/effect3653.py b/eos/effects/effect3653.py
deleted file mode 100644
index 11c4f01cb..000000000
--- a/eos/effects/effect3653.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ewGroupEcmBurstMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Centurion (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Projectors",
-                                  "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))
diff --git a/eos/effects/effect3655.py b/eos/effects/effect3655.py
deleted file mode 100644
index 284d5b3ca..000000000
--- a/eos/effects/effect3655.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# gunneryMaxRangeBonusOnline
-#
-# Used by:
-# Modules from group: Tracking Enhancer (10 of 10)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect3656.py b/eos/effects/effect3656.py
deleted file mode 100644
index bec1111d7..000000000
--- a/eos/effects/effect3656.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# gunneryTrackingSpeedBonusOnline
-#
-# Used by:
-# Modules from group: Tracking Enhancer (10 of 10)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect3657.py b/eos/effects/effect3657.py
deleted file mode 100644
index 989f097a8..000000000
--- a/eos/effects/effect3657.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipScanResolutionBonusOnline
-#
-# Used by:
-# Modules from group: Signal Amplifier (7 of 7)
-# Structure Modules from group: Structure Signal Amplifier (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3659.py b/eos/effects/effect3659.py
deleted file mode 100644
index fb6a1520a..000000000
--- a/eos/effects/effect3659.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMaxTargetRangeBonusOnline
-#
-# Used by:
-# Modules from group: Signal Amplifier (7 of 7)
-# Structure Modules from group: Structure Signal Amplifier (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3660.py b/eos/effects/effect3660.py
deleted file mode 100644
index f5ab7cb30..000000000
--- a/eos/effects/effect3660.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMaxLockedTargetsBonusAddOnline
-#
-# Used by:
-# Modules from group: Signal Amplifier (7 of 7)
-# Structure Modules from group: Structure Signal Amplifier (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("maxLockedTargets", module.getModifiedItemAttr("maxLockedTargetsBonus"))
diff --git a/eos/effects/effect3668.py b/eos/effects/effect3668.py
deleted file mode 100644
index 163574ba9..000000000
--- a/eos/effects/effect3668.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# miningLaserRangeBonus
-#
-# Used by:
-# Implants named like: grade Harvest (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mining Laser",
-                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect3669.py b/eos/effects/effect3669.py
deleted file mode 100644
index 9285d51b8..000000000
--- a/eos/effects/effect3669.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# frequencyMiningLaserMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Harvest (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Frequency Mining Laser",
-                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect3670.py b/eos/effects/effect3670.py
deleted file mode 100644
index 781f523f4..000000000
--- a/eos/effects/effect3670.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# stripMinerMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Harvest (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Strip Miner",
-                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect3671.py b/eos/effects/effect3671.py
deleted file mode 100644
index dbfd9f564..000000000
--- a/eos/effects/effect3671.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# gasHarvesterMaxRangeBonus
-#
-# Used by:
-# Implants named like: grade Harvest (10 of 12)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
-                                  "maxRange", implant.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect3672.py b/eos/effects/effect3672.py
deleted file mode 100644
index 0d5a83233..000000000
--- a/eos/effects/effect3672.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusOre
-#
-# Used by:
-# Implants named like: grade Harvest (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "maxRangeBonus", implant.getModifiedItemAttr("implantSetORE"))
diff --git a/eos/effects/effect3677.py b/eos/effects/effect3677.py
deleted file mode 100644
index cad976ce7..000000000
--- a/eos/effects/effect3677.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLargeEnergyTurretMaxRangeAB2
-#
-# Used by:
-# Ship: Apocalypse
-# Ship: Apocalypse Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect3678.py b/eos/effects/effect3678.py
deleted file mode 100644
index 7fa846975..000000000
--- a/eos/effects/effect3678.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusJumpFreighterShieldHP1
-#
-# Used by:
-# Ship: Nomad
-# Ship: Rhea
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"),
-                           skill="Jump Freighters")
diff --git a/eos/effects/effect3679.py b/eos/effects/effect3679.py
deleted file mode 100644
index ecfe3e25a..000000000
--- a/eos/effects/effect3679.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusJumpFreighterArmorHP1
-#
-# Used by:
-# Ship: Anshar
-# Ship: Ark
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"), skill="Jump Freighters")
diff --git a/eos/effects/effect3680.py b/eos/effects/effect3680.py
deleted file mode 100644
index 02d6f9eae..000000000
--- a/eos/effects/effect3680.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterAgilityBonusC1
-#
-# Used by:
-# Ship: Rhea
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusC1"), skill="Caldari Freighter")
diff --git a/eos/effects/effect3681.py b/eos/effects/effect3681.py
deleted file mode 100644
index 99100cf31..000000000
--- a/eos/effects/effect3681.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterAgilityBonusM1
-#
-# Used by:
-# Ship: Nomad
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusM1"), skill="Minmatar Freighter")
diff --git a/eos/effects/effect3682.py b/eos/effects/effect3682.py
deleted file mode 100644
index 54f7e1a62..000000000
--- a/eos/effects/effect3682.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterAgilityBonusG1
-#
-# Used by:
-# Ship: Anshar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusG1"), skill="Gallente Freighter")
diff --git a/eos/effects/effect3683.py b/eos/effects/effect3683.py
deleted file mode 100644
index 8aa4fa822..000000000
--- a/eos/effects/effect3683.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# freighterAgilityBonusA1
-#
-# Used by:
-# Ship: Ark
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusA1"), skill="Amarr Freighter")
diff --git a/eos/effects/effect3686.py b/eos/effects/effect3686.py
deleted file mode 100644
index b2c054606..000000000
--- a/eos/effects/effect3686.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptTrackingComputerFalloffBonusBonus
-#
-# Used by:
-# Charges from group: Tracking Disruption Script (2 of 2)
-# Charges from group: Tracking Script (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("falloffBonus", module.getModifiedChargeAttr("falloffBonusBonus"))
diff --git a/eos/effects/effect3703.py b/eos/effects/effect3703.py
deleted file mode 100644
index b070d3b2c..000000000
--- a/eos/effects/effect3703.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileLauncherSpeedBonusMC2
-#
-# Used by:
-# Ship: Bellicose
-type = "passive"
-
-
-def handler(fit, ship, context):
-    groups = ("Missile Launcher Rapid Light", "Missile Launcher Heavy", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3705.py b/eos/effects/effect3705.py
deleted file mode 100644
index ab847b685..000000000
--- a/eos/effects/effect3705.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridTurretROFBonusGC2
-#
-# Used by:
-# Ship: Exequror Navy Issue
-# Ship: Phobos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect3706.py b/eos/effects/effect3706.py
deleted file mode 100644
index 9d45c3e24..000000000
--- a/eos/effects/effect3706.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusProjectileTrackingMC2
-#
-# Used by:
-# Ship: Stabber Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect3726.py b/eos/effects/effect3726.py
deleted file mode 100644
index d185a5002..000000000
--- a/eos/effects/effect3726.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# agilityMultiplierEffectPassive
-#
-# Used by:
-# Modules named like: Polycarbon Engine Housing (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("agilityBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect3727.py b/eos/effects/effect3727.py
deleted file mode 100644
index 3d0b1c6d1..000000000
--- a/eos/effects/effect3727.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# velocityBonusPassive
-#
-# Used by:
-# Modules named like: Polycarbon Engine Housing (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("implantBonusVelocity"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3739.py b/eos/effects/effect3739.py
deleted file mode 100644
index 9c4a20c03..000000000
--- a/eos/effects/effect3739.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# zColinOrcaTractorRangeBonus
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", "maxRange",
-                                  src.getModifiedItemAttr("roleBonusTractorBeamRange"))
diff --git a/eos/effects/effect3740.py b/eos/effects/effect3740.py
deleted file mode 100644
index 736643324..000000000
--- a/eos/effects/effect3740.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# zColinOrcaTractorVelocityBonus
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", "maxTractorVelocity",
-                                  ship.getModifiedItemAttr("roleBonusTractorBeamVelocity"))
diff --git a/eos/effects/effect3742.py b/eos/effects/effect3742.py
deleted file mode 100644
index 780548d08..000000000
--- a/eos/effects/effect3742.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# cargoAndOreHoldCapacityBonusICS1
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("specialOreHoldCapacity",
-                           src.getModifiedItemAttr("shipBonusICS1"),
-                           skill="Industrial Command Ships")
-
-    fit.ship.boostItemAttr("capacity",
-                           src.getModifiedItemAttr("shipBonusICS1"),
-                           skill="Industrial Command Ships")
diff --git a/eos/effects/effect3744.py b/eos/effects/effect3744.py
deleted file mode 100644
index 0e1140e0e..000000000
--- a/eos/effects/effect3744.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# miningForemanBurstBonusICS2
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration",
-                                  src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
diff --git a/eos/effects/effect3745.py b/eos/effects/effect3745.py
deleted file mode 100644
index a1eb01fea..000000000
--- a/eos/effects/effect3745.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# zColinOrcaSurveyScannerBonus
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner", "surveyScanRange",
-                                  src.getModifiedItemAttr("roleBonusSurveyScannerRange"))
diff --git a/eos/effects/effect3765.py b/eos/effects/effect3765.py
deleted file mode 100644
index 6e26dc922..000000000
--- a/eos/effects/effect3765.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# covertOpsStealthBomberSiegeMissileLauncherPowerNeedBonus
-#
-# Used by:
-# Ships from group: Stealth Bomber (5 of 5)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
-                                     "power", ship.getModifiedItemAttr("stealthBomberLauncherPower"))
diff --git a/eos/effects/effect3766.py b/eos/effects/effect3766.py
deleted file mode 100644
index 73157a691..000000000
--- a/eos/effects/effect3766.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# interceptorMWDSignatureRadiusBonus
-#
-# Used by:
-# Ships from group: Interceptor (10 of 10)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterceptor"),
-                                  skill="Interceptors")
diff --git a/eos/effects/effect3767.py b/eos/effects/effect3767.py
deleted file mode 100644
index af5122311..000000000
--- a/eos/effects/effect3767.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipsHeavyMissileExplosionVelocityCS2
-#
-# Used by:
-# Ship: Claymore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                    skill="Command Ships")
diff --git a/eos/effects/effect3771.py b/eos/effects/effect3771.py
deleted file mode 100644
index 0b5d23866..000000000
--- a/eos/effects/effect3771.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# armorHPBonusAddPassive
-#
-# Used by:
-# Subsystems from group: Defensive Systems (9 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd") or 0)
diff --git a/eos/effects/effect3773.py b/eos/effects/effect3773.py
deleted file mode 100644
index 33f3fc576..000000000
--- a/eos/effects/effect3773.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# hardPointModifierEffect
-#
-# Used by:
-# Subsystems from group: Offensive Systems (12 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("turretSlotsLeft", module.getModifiedItemAttr("turretHardPointModifier"))
-    fit.ship.increaseItemAttr("launcherSlotsLeft", module.getModifiedItemAttr("launcherHardPointModifier"))
diff --git a/eos/effects/effect3774.py b/eos/effects/effect3774.py
deleted file mode 100644
index e4bfe2afb..000000000
--- a/eos/effects/effect3774.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# slotModifier
-#
-# Used by:
-# Items from category: Subsystem (48 of 48)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("hiSlots", module.getModifiedItemAttr("hiSlotModifier"))
-    fit.ship.increaseItemAttr("medSlots", module.getModifiedItemAttr("medSlotModifier"))
-    fit.ship.increaseItemAttr("lowSlots", module.getModifiedItemAttr("lowSlotModifier"))
diff --git a/eos/effects/effect3782.py b/eos/effects/effect3782.py
deleted file mode 100644
index bbaaddd28..000000000
--- a/eos/effects/effect3782.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# powerOutputAddPassive
-#
-# Used by:
-# Subsystems from group: Offensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("powerOutput", module.getModifiedItemAttr("powerOutput"))
diff --git a/eos/effects/effect3783.py b/eos/effects/effect3783.py
deleted file mode 100644
index 16c38b5c8..000000000
--- a/eos/effects/effect3783.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# cpuOutputAddCpuOutputPassive
-#
-# Used by:
-# Subsystems from group: Offensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("cpuOutput", module.getModifiedItemAttr("cpuOutput"))
diff --git a/eos/effects/effect3797.py b/eos/effects/effect3797.py
deleted file mode 100644
index 704fa8177..000000000
--- a/eos/effects/effect3797.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# droneBandwidthAddPassive
-#
-# Used by:
-# Subsystems from group: Offensive Systems (12 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("droneBandwidth", module.getModifiedItemAttr("droneBandwidth"))
diff --git a/eos/effects/effect3799.py b/eos/effects/effect3799.py
deleted file mode 100644
index 83222cb93..000000000
--- a/eos/effects/effect3799.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# droneCapacityAdddroneCapacityPassive
-#
-# Used by:
-# Subsystems from group: Offensive Systems (12 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("droneCapacity", module.getModifiedItemAttr("droneCapacity"))
diff --git a/eos/effects/effect38.py b/eos/effects/effect38.py
deleted file mode 100644
index 898cd270f..000000000
--- a/eos/effects/effect38.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# empWave
-#
-# Used by:
-# Modules from group: Smart Bomb (118 of 118)
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect3807.py b/eos/effects/effect3807.py
deleted file mode 100644
index 2b999329f..000000000
--- a/eos/effects/effect3807.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# maxTargetRangeAddPassive
-#
-# Used by:
-# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRange"))
diff --git a/eos/effects/effect3808.py b/eos/effects/effect3808.py
deleted file mode 100644
index 5282f3ce1..000000000
--- a/eos/effects/effect3808.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# signatureRadiusAddPassive
-#
-# Used by:
-# Subsystems from group: Defensive Systems (8 of 12)
-# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadius"))
diff --git a/eos/effects/effect3810.py b/eos/effects/effect3810.py
deleted file mode 100644
index 8d7ee24bd..000000000
--- a/eos/effects/effect3810.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capacityAddPassive
-#
-# Used by:
-# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
-# Subsystem: Legion Defensive - Nanobot Injector
-type = "passive"
-
-
-def handler(fit, subsystem, context):
-    fit.ship.increaseItemAttr("capacity", subsystem.getModifiedItemAttr("cargoCapacityAdd") or 0)
diff --git a/eos/effects/effect3811.py b/eos/effects/effect3811.py
deleted file mode 100644
index 47cc811f5..000000000
--- a/eos/effects/effect3811.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# capacitorCapacityAddPassive
-#
-# Used by:
-# Items from category: Subsystem (20 of 48)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacity") or 0)
diff --git a/eos/effects/effect3831.py b/eos/effects/effect3831.py
deleted file mode 100644
index d5c520560..000000000
--- a/eos/effects/effect3831.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shieldCapacityAddPassive
-#
-# Used by:
-# Subsystems from group: Defensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("shieldCapacity", module.getModifiedItemAttr("shieldCapacity"))
diff --git a/eos/effects/effect3857.py b/eos/effects/effect3857.py
deleted file mode 100644
index 4b0812554..000000000
--- a/eos/effects/effect3857.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrPropulsionMaxVelocity
-#
-# Used by:
-# Subsystem: Legion Propulsion - Intercalated Nanofibers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"),
-                           skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect3859.py b/eos/effects/effect3859.py
deleted file mode 100644
index b883e9b9d..000000000
--- a/eos/effects/effect3859.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariPropulsionMaxVelocity
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Chassis Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion"),
-                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect3860.py b/eos/effects/effect3860.py
deleted file mode 100644
index d7101727d..000000000
--- a/eos/effects/effect3860.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarPropulsionMaxVelocity
-#
-# Used by:
-# Subsystem: Loki Propulsion - Intercalated Nanofibers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"),
-                           skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect3861.py b/eos/effects/effect3861.py
deleted file mode 100644
index 1e9775eab..000000000
--- a/eos/effects/effect3861.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarPropulsionAfterburnerSpeedFactor
-#
-# Used by:
-# Subsystem: Loki Propulsion - Wake Limiter
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"),
-                                  skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect3863.py b/eos/effects/effect3863.py
deleted file mode 100644
index c97944920..000000000
--- a/eos/effects/effect3863.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariPropulsionAfterburnerSpeedFactor
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Fuel Catalyst
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"),
-                                  skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect3864.py b/eos/effects/effect3864.py
deleted file mode 100644
index 994733a04..000000000
--- a/eos/effects/effect3864.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrPropulsionAfterburnerSpeedFactor
-#
-# Used by:
-# Subsystem: Legion Propulsion - Wake Limiter
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"),
-                                  skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect3865.py b/eos/effects/effect3865.py
deleted file mode 100644
index 426d8a119..000000000
--- a/eos/effects/effect3865.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrPropulsion2Agility
-#
-# Used by:
-# Subsystem: Legion Propulsion - Intercalated Nanofibers
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion2"),
-                           skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect3866.py b/eos/effects/effect3866.py
deleted file mode 100644
index c923e51bd..000000000
--- a/eos/effects/effect3866.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariPropulsion2Agility
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Chassis Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"),
-                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect3867.py b/eos/effects/effect3867.py
deleted file mode 100644
index 5e060b092..000000000
--- a/eos/effects/effect3867.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallentePropulsion2Agility
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Hyperspatial Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusGallentePropulsion2"),
-                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect3868.py b/eos/effects/effect3868.py
deleted file mode 100644
index 1a01b509b..000000000
--- a/eos/effects/effect3868.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarPropulsion2Agility
-#
-# Used by:
-# Subsystem: Loki Propulsion - Intercalated Nanofibers
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion2"),
-                           skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect3869.py b/eos/effects/effect3869.py
deleted file mode 100644
index 94bbfe321..000000000
--- a/eos/effects/effect3869.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarPropulsion2MWDPenalty
-#
-# Used by:
-# Subsystem: Loki Propulsion - Wake Limiter
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion2"),
-                                  skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect3872.py b/eos/effects/effect3872.py
deleted file mode 100644
index ceb76ccea..000000000
--- a/eos/effects/effect3872.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrPropulsion2MWDPenalty
-#
-# Used by:
-# Subsystem: Legion Propulsion - Wake Limiter
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion2"),
-                                  skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect3875.py b/eos/effects/effect3875.py
deleted file mode 100644
index 7a9b3fed0..000000000
--- a/eos/effects/effect3875.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusGallentePropulsionABMWDCapNeed
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Localized Injectors
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "capacitorNeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"),
-                                  skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect3893.py b/eos/effects/effect3893.py
deleted file mode 100644
index 0266d09e8..000000000
--- a/eos/effects/effect3893.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCoreScanStrengthLADAR
-#
-# Used by:
-# Subsystem: Loki Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanLadarStrength", src.getModifiedItemAttr("subsystemBonusMinmatarCore"),
-                           skill="Minmatar Core Systems")
diff --git a/eos/effects/effect3895.py b/eos/effects/effect3895.py
deleted file mode 100644
index 793b071ac..000000000
--- a/eos/effects/effect3895.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCoreScanStrengthMagnetometric
-#
-# Used by:
-# Subsystem: Proteus Core - Electronic Efficiency Gate
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanMagnetometricStrength", src.getModifiedItemAttr("subsystemBonusGallenteCore"),
-                           skill="Gallente Core Systems")
diff --git a/eos/effects/effect3897.py b/eos/effects/effect3897.py
deleted file mode 100644
index b21cd5754..000000000
--- a/eos/effects/effect3897.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusCaldariCoreScanStrengthGravimetric
-#
-# Used by:
-# Subsystem: Tengu Core - Electronic Efficiency Gate
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanGravimetricStrength", src.getModifiedItemAttr("subsystemBonusCaldariCore"), skill="Caldari Core Systems")
diff --git a/eos/effects/effect39.py b/eos/effects/effect39.py
deleted file mode 100644
index 38b53c1fc..000000000
--- a/eos/effects/effect39.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# warpDisrupt
-#
-# Used by:
-# Modules named like: Warp Disruptor (28 of 28)
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    if "projected" in context:
-        fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
diff --git a/eos/effects/effect3900.py b/eos/effects/effect3900.py
deleted file mode 100644
index 8c0c2bd82..000000000
--- a/eos/effects/effect3900.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCoreScanStrengthRADAR
-#
-# Used by:
-# Subsystem: Legion Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanRadarStrength", src.getModifiedItemAttr("subsystemBonusAmarrCore"),
-                           skill="Amarr Core Systems")
diff --git a/eos/effects/effect391.py b/eos/effects/effect391.py
deleted file mode 100644
index 965ade57d..000000000
--- a/eos/effects/effect391.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# astrogeologyMiningAmountBonusPostPercentMiningAmountLocationShipModulesRequiringMining
-#
-# Used by:
-# Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3)
-# Implant: Michi's Excavation Augmentor
-# Skill: Astrogeology
-# Skill: Mining
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", container.getModifiedItemAttr("miningAmountBonus") * level)
diff --git a/eos/effects/effect392.py b/eos/effects/effect392.py
deleted file mode 100644
index 3f01c5422..000000000
--- a/eos/effects/effect392.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# mechanicHullHpBonusPostPercentHpShip
-#
-# Used by:
-# Implants named like: Inherent Implants 'Noble' Mechanic MC (6 of 6)
-# Modules named like: Transverse Bulkhead (8 of 8)
-# Skill: Mechanics
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("hp", container.getModifiedItemAttr("hullHpBonus") * level)
diff --git a/eos/effects/effect394.py b/eos/effects/effect394.py
deleted file mode 100644
index 6f68c7292..000000000
--- a/eos/effects/effect394.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# navigationVelocityBonusPostPercentMaxVelocityShip
-#
-# Used by:
-# Modules from group: Rig Anchor (4 of 4)
-# Implants named like: Agency 'Overclocker' SB Dose (4 of 4)
-# Implants named like: grade Snake (16 of 18)
-# Modules named like: Auxiliary Thrusters (8 of 8)
-# Implant: Quafe Zero
-# Skill: Navigation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    amount = container.getModifiedItemAttr("velocityBonus") or 0
-    fit.ship.boostItemAttr("maxVelocity", amount * level,
-                           stackingPenalties="skill" not in context and "implant" not in context and "booster" not in context)
diff --git a/eos/effects/effect395.py b/eos/effects/effect395.py
deleted file mode 100644
index b2f81c56e..000000000
--- a/eos/effects/effect395.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# evasiveManeuveringAgilityBonusPostPercentAgilityShip
-#
-# Used by:
-# Modules from group: Rig Anchor (4 of 4)
-# Implants named like: Eifyr and Co. 'Rogue' Evasive Maneuvering EM (6 of 6)
-# Implants named like: grade Nomad (10 of 12)
-# Modules named like: Low Friction Nozzle Joints (8 of 8)
-# Implant: Genolution Core Augmentation CA-4
-# Skill: Evasive Maneuvering
-# Skill: Spaceship Command
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("agility", container.getModifiedItemAttr("agilityBonus") * level,
-                           stackingPenalties="skill" not in context and "implant" not in context)
diff --git a/eos/effects/effect3959.py b/eos/effects/effect3959.py
deleted file mode 100644
index 0ead0d3d7..000000000
--- a/eos/effects/effect3959.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusAmarrDefensiveArmorRepairAmount
-#
-# Used by:
-# Subsystem: Legion Defensive - Covert Reconfiguration
-# Subsystem: Legion Defensive - Nanobot Injector
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
-                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/effect396.py b/eos/effects/effect396.py
deleted file mode 100644
index 46d6f847e..000000000
--- a/eos/effects/effect396.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# energyGridUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringEnergyGridUpgrades
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Energy Grid Upgrades EU (6 of 6)
-# Modules named like: Powergrid Subroutine Maximizer (8 of 8)
-# Skill: Energy Grid Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Grid Upgrades"),
-                                  "cpu", container.getModifiedItemAttr("cpuNeedBonus") * level)
diff --git a/eos/effects/effect3961.py b/eos/effects/effect3961.py
deleted file mode 100644
index 6d9639e83..000000000
--- a/eos/effects/effect3961.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusGallenteDefensiveArmorRepairAmount
-#
-# Used by:
-# Subsystem: Proteus Defensive - Covert Reconfiguration
-# Subsystem: Proteus Defensive - Nanobot Injector
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
-                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/effect3962.py b/eos/effects/effect3962.py
deleted file mode 100644
index 0c43a70d4..000000000
--- a/eos/effects/effect3962.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemBonusMinmatarDefensiveShieldArmorRepairAmount
-#
-# Used by:
-# Subsystem: Loki Defensive - Adaptive Defense Node
-# Subsystem: Loki Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
-                                  skill="Minmatar Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
-                                  skill="Minmatar Defensive Systems")
diff --git a/eos/effects/effect3964.py b/eos/effects/effect3964.py
deleted file mode 100644
index ec7bff89c..000000000
--- a/eos/effects/effect3964.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusCaldariDefensiveShieldBoostAmount
-#
-# Used by:
-# Subsystem: Tengu Defensive - Amplification Node
-# Subsystem: Tengu Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
-                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/effect397.py b/eos/effects/effect397.py
deleted file mode 100644
index 7a6b5a0d5..000000000
--- a/eos/effects/effect397.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# electronicsCpuOutputBonusPostPercentCpuOutputLocationShipGroupComputer
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' CPU Management EE (6 of 6)
-# Modules named like: Processor Overclocking Unit (8 of 8)
-# Subsystems named like: Core Electronic Efficiency Gate (2 of 2)
-# Implant: Genolution Core Augmentation CA-2
-# Skill: CPU Management
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("cpuOutput", container.getModifiedItemAttr("cpuOutputBonus2") * level)
diff --git a/eos/effects/effect3976.py b/eos/effects/effect3976.py
deleted file mode 100644
index 50ce1043f..000000000
--- a/eos/effects/effect3976.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariDefensiveShieldHP
-#
-# Used by:
-# Subsystem: Tengu Defensive - Supplemental Screening
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("shieldCapacity", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"),
-                           skill="Caldari Defensive Systems")
diff --git a/eos/effects/effect3979.py b/eos/effects/effect3979.py
deleted file mode 100644
index 5e0b76798..000000000
--- a/eos/effects/effect3979.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusMinmatarDefensiveShieldArmorHP
-#
-# Used by:
-# Subsystem: Loki Defensive - Augmented Durability
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
-                           skill="Minmatar Defensive Systems")
-    fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive"),
-                           skill="Minmatar Defensive Systems")
diff --git a/eos/effects/effect3980.py b/eos/effects/effect3980.py
deleted file mode 100644
index e200be121..000000000
--- a/eos/effects/effect3980.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteDefensiveArmorHP
-#
-# Used by:
-# Subsystem: Proteus Defensive - Augmented Plating
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"),
-                           skill="Gallente Defensive Systems")
diff --git a/eos/effects/effect3982.py b/eos/effects/effect3982.py
deleted file mode 100644
index d28928667..000000000
--- a/eos/effects/effect3982.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrDefensiveArmorHP
-#
-# Used by:
-# Subsystem: Legion Defensive - Augmented Plating
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"),
-                           skill="Amarr Defensive Systems")
diff --git a/eos/effects/effect3992.py b/eos/effects/effect3992.py
deleted file mode 100644
index ffe1b6873..000000000
--- a/eos/effects/effect3992.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemShieldHP
-#
-# Used by:
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("shieldCapacity", beacon.getModifiedItemAttr("shieldCapacityMultiplier"))
diff --git a/eos/effects/effect3993.py b/eos/effects/effect3993.py
deleted file mode 100644
index b54077e9d..000000000
--- a/eos/effects/effect3993.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemTargetingRange
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("maxTargetRange", beacon.getModifiedItemAttr("maxTargetRangeMultiplier"),
-                              stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect3995.py b/eos/effects/effect3995.py
deleted file mode 100644
index f00bb35be..000000000
--- a/eos/effects/effect3995.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemSignatureRadius
-#
-# Used by:
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("signatureRadius", beacon.getModifiedItemAttr("signatureRadiusMultiplier"),
-                              stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect3996.py b/eos/effects/effect3996.py
deleted file mode 100644
index 901d4f7f8..000000000
--- a/eos/effects/effect3996.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemArmorEmResistance
-#
-# Used by:
-# Celestials named like: Incursion Effect (2 of 2)
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", beacon.getModifiedItemAttr("armorEmDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3997.py b/eos/effects/effect3997.py
deleted file mode 100644
index ccd8104d5..000000000
--- a/eos/effects/effect3997.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemArmorExplosiveResistance
-#
-# Used by:
-# Celestials named like: Incursion Effect (2 of 2)
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance",
-                           beacon.getModifiedItemAttr("armorExplosiveDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3998.py b/eos/effects/effect3998.py
deleted file mode 100644
index 845b03da6..000000000
--- a/eos/effects/effect3998.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemArmorKineticResistance
-#
-# Used by:
-# Celestials named like: Incursion Effect (2 of 2)
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance",
-                           beacon.getModifiedItemAttr("armorKineticDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect3999.py b/eos/effects/effect3999.py
deleted file mode 100644
index 0a5eb0be6..000000000
--- a/eos/effects/effect3999.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemArmorThermalResistance
-#
-# Used by:
-# Celestials named like: Incursion Effect (2 of 2)
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance",
-                           beacon.getModifiedItemAttr("armorThermalDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect4.py b/eos/effects/effect4.py
deleted file mode 100644
index 808e2f1b0..000000000
--- a/eos/effects/effect4.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shieldBoosting
-#
-# Used by:
-# Modules from group: Shield Booster (97 of 97)
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("shieldBonus")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("shieldRepair", amount / speed)
diff --git a/eos/effects/effect4002.py b/eos/effects/effect4002.py
deleted file mode 100644
index 9870b420d..000000000
--- a/eos/effects/effect4002.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemMissileVelocity
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "maxVelocity", beacon.getModifiedItemAttr("missileVelocityMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4003.py b/eos/effects/effect4003.py
deleted file mode 100644
index b10fbf8eb..000000000
--- a/eos/effects/effect4003.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemMaxVelocity
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"),
-                              stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4016.py b/eos/effects/effect4016.py
deleted file mode 100644
index 3b701166a..000000000
--- a/eos/effects/effect4016.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageMultiplierGunnery
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                     "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect4017.py b/eos/effects/effect4017.py
deleted file mode 100644
index ada3a084a..000000000
--- a/eos/effects/effect4017.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageThermalMissiles
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4018.py b/eos/effects/effect4018.py
deleted file mode 100644
index 6a9485f88..000000000
--- a/eos/effects/effect4018.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageEmMissiles
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "emDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4019.py b/eos/effects/effect4019.py
deleted file mode 100644
index da1cfab94..000000000
--- a/eos/effects/effect4019.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageExplosiveMissiles
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4020.py b/eos/effects/effect4020.py
deleted file mode 100644
index 7609052aa..000000000
--- a/eos/effects/effect4020.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageKineticMissiles
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4021.py b/eos/effects/effect4021.py
deleted file mode 100644
index 6e4cac6f4..000000000
--- a/eos/effects/effect4021.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageDrones
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Drones"),
-                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                    stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4022.py b/eos/effects/effect4022.py
deleted file mode 100644
index 6aff80eb7..000000000
--- a/eos/effects/effect4022.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemTracking
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                     "trackingSpeed", module.getModifiedItemAttr("trackingSpeedMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4023.py b/eos/effects/effect4023.py
deleted file mode 100644
index 3ea6fea6c..000000000
--- a/eos/effects/effect4023.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemAoeVelocity
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "aoeVelocity", beacon.getModifiedItemAttr("aoeVelocityMultiplier"))
diff --git a/eos/effects/effect4033.py b/eos/effects/effect4033.py
deleted file mode 100644
index 3b31dc178..000000000
--- a/eos/effects/effect4033.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemHeatDamage
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "heatDamage" in mod.itemModifiedAttributes,
-                                     "heatDamage", module.getModifiedItemAttr("heatDamageMultiplier"))
diff --git a/eos/effects/effect4034.py b/eos/effects/effect4034.py
deleted file mode 100644
index d70cb74d0..000000000
--- a/eos/effects/effect4034.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadArmor
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadArmorDamageAmount" in mod.itemModifiedAttributes,
-                                     "overloadArmorDamageAmount", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4035.py b/eos/effects/effect4035.py
deleted file mode 100644
index 886aa6865..000000000
--- a/eos/effects/effect4035.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadDamageModifier
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadDamageModifier" in mod.itemModifiedAttributes,
-                                     "overloadDamageModifier", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4036.py b/eos/effects/effect4036.py
deleted file mode 100644
index 7fe9d6e12..000000000
--- a/eos/effects/effect4036.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadDurationBonus
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadDurationBonus" in mod.itemModifiedAttributes,
-                                     "overloadDurationBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4037.py b/eos/effects/effect4037.py
deleted file mode 100644
index 06cd0a1e9..000000000
--- a/eos/effects/effect4037.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadEccmStrength
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadECCMStrenghtBonus" in mod.itemModifiedAttributes,
-                                     "overloadECCMStrenghtBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4038.py b/eos/effects/effect4038.py
deleted file mode 100644
index 8f71dd81c..000000000
--- a/eos/effects/effect4038.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadEcmStrength
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadECMStrenghtBonus" in mod.itemModifiedAttributes,
-                                     "overloadECMStrenghtBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4039.py b/eos/effects/effect4039.py
deleted file mode 100644
index 5d65dfc30..000000000
--- a/eos/effects/effect4039.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadHardening
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadHardeningBonus" in mod.itemModifiedAttributes,
-                                     "overloadHardeningBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4040.py b/eos/effects/effect4040.py
deleted file mode 100644
index 971440693..000000000
--- a/eos/effects/effect4040.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadRange
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadRangeBonus" in mod.itemModifiedAttributes,
-                                     "overloadRangeBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4041.py b/eos/effects/effect4041.py
deleted file mode 100644
index 139c684df..000000000
--- a/eos/effects/effect4041.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadRof
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadRofBonus" in mod.itemModifiedAttributes,
-                                     "overloadRofBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4042.py b/eos/effects/effect4042.py
deleted file mode 100644
index 397c9a00c..000000000
--- a/eos/effects/effect4042.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadSelfDuration
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadSelfDurationBonus" in mod.itemModifiedAttributes,
-                                     "overloadSelfDurationBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4043.py b/eos/effects/effect4043.py
deleted file mode 100644
index d468f3cd6..000000000
--- a/eos/effects/effect4043.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadShieldBonus
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadShieldBonus" in mod.itemModifiedAttributes,
-                                     "overloadShieldBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4044.py b/eos/effects/effect4044.py
deleted file mode 100644
index a766bbaa8..000000000
--- a/eos/effects/effect4044.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemOverloadSpeedFactor
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: "overloadSpeedFactorBonus" in mod.itemModifiedAttributes,
-                                     "overloadSpeedFactorBonus", module.getModifiedItemAttr("overloadBonusMultiplier"))
diff --git a/eos/effects/effect4045.py b/eos/effects/effect4045.py
deleted file mode 100644
index 5ccdc6f78..000000000
--- a/eos/effects/effect4045.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemSmartBombRange
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
-                                     "empFieldRange", module.getModifiedItemAttr("empFieldRangeMultiplier"))
diff --git a/eos/effects/effect4046.py b/eos/effects/effect4046.py
deleted file mode 100644
index da11e810c..000000000
--- a/eos/effects/effect4046.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemSmartBombEmDamage
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
-                                     "emDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/effect4047.py b/eos/effects/effect4047.py
deleted file mode 100644
index a12281fe2..000000000
--- a/eos/effects/effect4047.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemSmartBombThermalDamage
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
-                                     "thermalDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/effect4048.py b/eos/effects/effect4048.py
deleted file mode 100644
index 1e7cf7c44..000000000
--- a/eos/effects/effect4048.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemSmartBombKineticDamage
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
-                                     "kineticDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/effect4049.py b/eos/effects/effect4049.py
deleted file mode 100644
index d52964bca..000000000
--- a/eos/effects/effect4049.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemSmartBombExplosiveDamage
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Smart Bomb",
-                                     "explosiveDamage", module.getModifiedItemAttr("smartbombDamageMultiplier"))
diff --git a/eos/effects/effect4054.py b/eos/effects/effect4054.py
deleted file mode 100644
index d4fd39124..000000000
--- a/eos/effects/effect4054.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemSmallEnergyDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect4055.py b/eos/effects/effect4055.py
deleted file mode 100644
index 089c03d46..000000000
--- a/eos/effects/effect4055.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemSmallProjectileDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect4056.py b/eos/effects/effect4056.py
deleted file mode 100644
index fedc2f2cf..000000000
--- a/eos/effects/effect4056.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemSmallHybridDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect4057.py b/eos/effects/effect4057.py
deleted file mode 100644
index b49384777..000000000
--- a/eos/effects/effect4057.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemRocketEmDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                       "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4058.py b/eos/effects/effect4058.py
deleted file mode 100644
index db6d6653e..000000000
--- a/eos/effects/effect4058.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemRocketExplosiveDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4059.py b/eos/effects/effect4059.py
deleted file mode 100644
index 3b539502c..000000000
--- a/eos/effects/effect4059.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemRocketKineticDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4060.py b/eos/effects/effect4060.py
deleted file mode 100644
index db5f65c0f..000000000
--- a/eos/effects/effect4060.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemRocketThermalDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4061.py b/eos/effects/effect4061.py
deleted file mode 100644
index db5e7d254..000000000
--- a/eos/effects/effect4061.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemStandardMissileThermalDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4062.py b/eos/effects/effect4062.py
deleted file mode 100644
index 5e6102aef..000000000
--- a/eos/effects/effect4062.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemStandardMissileEmDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "emDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4063.py b/eos/effects/effect4063.py
deleted file mode 100644
index c53978cf5..000000000
--- a/eos/effects/effect4063.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemStandardMissileExplosiveDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect408.py b/eos/effects/effect408.py
deleted file mode 100644
index e7f214d19..000000000
--- a/eos/effects/effect408.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# largeProjectileTurretDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringLargeProjectileTurret
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Gunslinger' Large Projectile Turret LP (6 of 6)
-# Skill: Large Projectile Turret
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect4086.py b/eos/effects/effect4086.py
deleted file mode 100644
index da585583d..000000000
--- a/eos/effects/effect4086.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemArmorRepairAmount
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Repair Systems") or
-                                                 mod.item.requiresSkill("Capital Repair Systems"),
-                                     "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4088.py b/eos/effects/effect4088.py
deleted file mode 100644
index 4c18e8589..000000000
--- a/eos/effects/effect4088.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemArmorRemoteRepairAmount
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                     "armorDamageAmount",
-                                     module.getModifiedItemAttr("armorDamageAmountMultiplierRemote"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect4089.py b/eos/effects/effect4089.py
deleted file mode 100644
index c8dd29645..000000000
--- a/eos/effects/effect4089.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemShieldRemoteRepairAmount
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                     "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplierRemote"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4090.py b/eos/effects/effect4090.py
deleted file mode 100644
index 63a57c9e2..000000000
--- a/eos/effects/effect4090.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemCapacitorCapacity
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("capacitorCapacity", beacon.getModifiedItemAttr("capacitorCapacityMultiplierSystem"))
diff --git a/eos/effects/effect4091.py b/eos/effects/effect4091.py
deleted file mode 100644
index dd89728ed..000000000
--- a/eos/effects/effect4091.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemCapacitorRecharge
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("rechargeRate", beacon.getModifiedItemAttr("rechargeRateMultiplier"))
diff --git a/eos/effects/effect4093.py b/eos/effects/effect4093.py
deleted file mode 100644
index 3af29dfee..000000000
--- a/eos/effects/effect4093.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrOffensiveEnergyWeaponDamageMultiplier
-#
-# Used by:
-# Subsystem: Legion Offensive - Liquid Crystal Magnifiers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"),
-                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4104.py b/eos/effects/effect4104.py
deleted file mode 100644
index a2d51c087..000000000
--- a/eos/effects/effect4104.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensiveHybridWeaponMaxRange
-#
-# Used by:
-# Subsystem: Tengu Offensive - Magnetic Infusion Basin
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"),
-                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4106.py b/eos/effects/effect4106.py
deleted file mode 100644
index 67900a90b..000000000
--- a/eos/effects/effect4106.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusGallenteOffensiveHybridWeaponFalloff
-#
-# Used by:
-# Subsystem: Proteus Offensive - Hybrid Encoding Platform
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", module.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
-                                  skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect4114.py b/eos/effects/effect4114.py
deleted file mode 100644
index e97198498..000000000
--- a/eos/effects/effect4114.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensiveProjectileWeaponFalloff
-#
-# Used by:
-# Subsystem: Loki Offensive - Projectile Scoping Array
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4115.py b/eos/effects/effect4115.py
deleted file mode 100644
index 4938c002a..000000000
--- a/eos/effects/effect4115.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensiveProjectileWeaponMaxRange
-#
-# Used by:
-# Subsystem: Loki Offensive - Projectile Scoping Array
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4122.py b/eos/effects/effect4122.py
deleted file mode 100644
index 7a7418ff2..000000000
--- a/eos/effects/effect4122.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensive1LauncherROF
-#
-# Used by:
-# Subsystem: Tengu Offensive - Accelerated Ejection Bay
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4135.py b/eos/effects/effect4135.py
deleted file mode 100644
index 8e373b52d..000000000
--- a/eos/effects/effect4135.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemShieldEmResistance
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", beacon.getModifiedItemAttr("shieldEmDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect4136.py b/eos/effects/effect4136.py
deleted file mode 100644
index cc52e5723..000000000
--- a/eos/effects/effect4136.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemShieldExplosiveResistance
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance",
-                           beacon.getModifiedItemAttr("shieldExplosiveDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect4137.py b/eos/effects/effect4137.py
deleted file mode 100644
index 7671d6d13..000000000
--- a/eos/effects/effect4137.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemShieldKineticResistance
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance",
-                           beacon.getModifiedItemAttr("shieldKineticDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect4138.py b/eos/effects/effect4138.py
deleted file mode 100644
index cd58fcdeb..000000000
--- a/eos/effects/effect4138.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemShieldThermalResistance
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance",
-                           beacon.getModifiedItemAttr("shieldThermalDamageResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect414.py b/eos/effects/effect414.py
deleted file mode 100644
index fc4a45d26..000000000
--- a/eos/effects/effect414.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# gunneryTurretSpeeBonusPostPercentSpeedLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Inherent Implants 'Lancer' Gunnery RF (6 of 6)
-# Implant: Pashan's Turret Customization Mindlink
-# Skill: Gunnery
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "speed", container.getModifiedItemAttr("turretSpeeBonus") * level)
diff --git a/eos/effects/effect4152.py b/eos/effects/effect4152.py
deleted file mode 100644
index 081431376..000000000
--- a/eos/effects/effect4152.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrEngineeringHeatDamageReduction
-#
-# Used by:
-# Subsystem: Legion Core - Energy Parasitic Complex
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusAmarrCore"),
-                                  skill="Amarr Core Systems")
diff --git a/eos/effects/effect4153.py b/eos/effects/effect4153.py
deleted file mode 100644
index 187643ef3..000000000
--- a/eos/effects/effect4153.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariEngineeringHeatDamageReduction
-#
-# Used by:
-# Subsystem: Tengu Core - Obfuscation Manifold
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusCaldariCore"),
-                                  skill="Caldari Core Systems")
diff --git a/eos/effects/effect4154.py b/eos/effects/effect4154.py
deleted file mode 100644
index d68012583..000000000
--- a/eos/effects/effect4154.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusGallenteEngineeringHeatDamageReduction
-#
-# Used by:
-# Subsystem: Proteus Core - Friction Extension Processor
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusGallenteCore"),
-                                  skill="Gallente Core Systems")
diff --git a/eos/effects/effect4155.py b/eos/effects/effect4155.py
deleted file mode 100644
index 2af4c13ca..000000000
--- a/eos/effects/effect4155.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarEngineeringHeatDamageReduction
-#
-# Used by:
-# Subsystem: Loki Core - Immobility Drivers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  module.getModifiedItemAttr("subsystemBonusMinmatarCore"),
-                                  skill="Minmatar Core Systems")
diff --git a/eos/effects/effect4158.py b/eos/effects/effect4158.py
deleted file mode 100644
index b3895bbec..000000000
--- a/eos/effects/effect4158.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariCoreCapacitorCapacity
-#
-# Used by:
-# Subsystem: Tengu Core - Augmented Graviton Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("subsystemBonusCaldariCore"),
-                           skill="Caldari Core Systems")
diff --git a/eos/effects/effect4159.py b/eos/effects/effect4159.py
deleted file mode 100644
index 373d62290..000000000
--- a/eos/effects/effect4159.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusAmarrCoreCapacitorCapacity
-#
-# Used by:
-# Subsystem: Legion Core - Augmented Antimatter Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("subsystemBonusAmarrCore"), skill="Amarr Core Systems")
diff --git a/eos/effects/effect4161.py b/eos/effects/effect4161.py
deleted file mode 100644
index 81724b690..000000000
--- a/eos/effects/effect4161.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# baseMaxScanDeviationModifierRequiringAstrometrics
-#
-# Used by:
-# Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3)
-# Skill: Astrometric Pinpointing
-# Skill: Astrometrics
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseMaxScanDeviation",
-                                    container.getModifiedItemAttr("maxScanDeviationModifier") * level)
diff --git a/eos/effects/effect4162.py b/eos/effects/effect4162.py
deleted file mode 100644
index 1c302d261..000000000
--- a/eos/effects/effect4162.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# baseSensorStrengthModifierRequiringAstrometrics
-#
-# Used by:
-# Modules from group: Scan Probe Launcher (4 of 7)
-# Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
-# Implants named like: grade Virtue (10 of 12)
-# Modules named like: Gravity Capacitor Upgrade (8 of 8)
-# Skill: Astrometric Rangefinding
-# Skill: Astrometrics
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context or "implant" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", container.getModifiedItemAttr("scanStrengthBonus") * level,
-                                    stackingPenalties=penalized)
diff --git a/eos/effects/effect4165.py b/eos/effects/effect4165.py
deleted file mode 100644
index 0e61528b2..000000000
--- a/eos/effects/effect4165.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusScanProbeStrengthCF
-#
-# Used by:
-# Ship: Heron
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusCF2"),
-                                    skill="Caldari Frigate")
diff --git a/eos/effects/effect4166.py b/eos/effects/effect4166.py
deleted file mode 100644
index 8caaf2411..000000000
--- a/eos/effects/effect4166.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusScanProbeStrengthMF
-#
-# Used by:
-# Ship: Probe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusMF2"),
-                                    skill="Minmatar Frigate")
diff --git a/eos/effects/effect4167.py b/eos/effects/effect4167.py
deleted file mode 100644
index aed2e3d3a..000000000
--- a/eos/effects/effect4167.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusScanProbeStrengthGF
-#
-# Used by:
-# Ship: Imicus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusGF2"),
-                                    skill="Gallente Frigate")
diff --git a/eos/effects/effect4168.py b/eos/effects/effect4168.py
deleted file mode 100644
index 77feea510..000000000
--- a/eos/effects/effect4168.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCoverOpsScanProbeStrength2
-#
-# Used by:
-# Ships from group: Covert Ops (8 of 8)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect4187.py b/eos/effects/effect4187.py
deleted file mode 100644
index b390e901e..000000000
--- a/eos/effects/effect4187.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserAmarrHeatDamage
-#
-# Used by:
-# Ship: Legion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserAmarr1"),
-                                  skill="Amarr Strategic Cruiser")
diff --git a/eos/effects/effect4188.py b/eos/effects/effect4188.py
deleted file mode 100644
index 8edf19db3..000000000
--- a/eos/effects/effect4188.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserCaldariHeatDamage
-#
-# Used by:
-# Ship: Tengu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserCaldari1"),
-                                  skill="Caldari Strategic Cruiser")
diff --git a/eos/effects/effect4189.py b/eos/effects/effect4189.py
deleted file mode 100644
index dc7f7bd80..000000000
--- a/eos/effects/effect4189.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserGallenteHeatDamage
-#
-# Used by:
-# Ship: Proteus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserGallente1"),
-                                  skill="Gallente Strategic Cruiser")
diff --git a/eos/effects/effect4190.py b/eos/effects/effect4190.py
deleted file mode 100644
index f97b203cc..000000000
--- a/eos/effects/effect4190.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserMinmatarHeatDamage
-#
-# Used by:
-# Ship: Loki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserMinmatar1"),
-                                  skill="Minmatar Strategic Cruiser")
diff --git a/eos/effects/effect4215.py b/eos/effects/effect4215.py
deleted file mode 100644
index 4062932dd..000000000
--- a/eos/effects/effect4215.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrOffensive2EnergyWeaponCapacitorNeed
-#
-# Used by:
-# Subsystem: Legion Offensive - Liquid Crystal Magnifiers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"),
-                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4216.py b/eos/effects/effect4216.py
deleted file mode 100644
index c3597aead..000000000
--- a/eos/effects/effect4216.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCore2EnergyVampireAmount
-#
-# Used by:
-# Subsystem: Legion Core - Energy Parasitic Complex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrCore2"), skill="Amarr Core Systems")
diff --git a/eos/effects/effect4217.py b/eos/effects/effect4217.py
deleted file mode 100644
index e9cd100c1..000000000
--- a/eos/effects/effect4217.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCore2EnergyDestabilizerAmount
-#
-# Used by:
-# Subsystem: Legion Core - Energy Parasitic Complex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrCore2"), skill="Amarr Core Systems")
diff --git a/eos/effects/effect4248.py b/eos/effects/effect4248.py
deleted file mode 100644
index ba959521c..000000000
--- a/eos/effects/effect4248.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# subsystemBonusCaldariOffensive2MissileLauncherKineticDamage
-#
-# Used by:
-# Subsystem: Tengu Offensive - Accelerated Ejection Bay
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "kineticDamage", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
-                                    skill="Caldari Offensive Systems")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
-                                    skill="Caldari Offensive Systems")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
-                                    skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4250.py b/eos/effects/effect4250.py
deleted file mode 100644
index 4f1abbb8d..000000000
--- a/eos/effects/effect4250.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# subsystemBonusGallenteOffensiveDroneDamageHP
-#
-# Used by:
-# Subsystem: Proteus Offensive - Drone Synthesis Projector
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "armorHP", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
-                                 skill="Gallente Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "hp", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
-                                 skill="Gallente Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "damageMultiplier", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
-                                 skill="Gallente Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "shieldCapacity", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"),
-                                 skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect4251.py b/eos/effects/effect4251.py
deleted file mode 100644
index c68ff8976..000000000
--- a/eos/effects/effect4251.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive2ProjectileWeaponDamageMultiplier
-#
-# Used by:
-# Subsystem: Loki Offensive - Projectile Scoping Array
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4256.py b/eos/effects/effect4256.py
deleted file mode 100644
index 29e71d306..000000000
--- a/eos/effects/effect4256.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusMinmatarOffensive2MissileLauncherROF
-#
-# Used by:
-# Subsystem: Loki Offensive - Launcher Efficiency Configuration
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4264.py b/eos/effects/effect4264.py
deleted file mode 100644
index d32fce7ac..000000000
--- a/eos/effects/effect4264.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCoreCapacitorRecharge
-#
-# Used by:
-# Subsystem: Loki Core - Augmented Nuclear Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("rechargeRate", src.getModifiedItemAttr("subsystemBonusMinmatarCore"),
-                           skill="Minmatar Core Systems")
diff --git a/eos/effects/effect4265.py b/eos/effects/effect4265.py
deleted file mode 100644
index 52c020b91..000000000
--- a/eos/effects/effect4265.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCoreCapacitorRecharge
-#
-# Used by:
-# Subsystem: Proteus Core - Augmented Fusion Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("rechargeRate", src.getModifiedItemAttr("subsystemBonusGallenteCore"),
-                           skill="Gallente Core Systems")
diff --git a/eos/effects/effect4269.py b/eos/effects/effect4269.py
deleted file mode 100644
index 2374304e5..000000000
--- a/eos/effects/effect4269.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCore3ScanResolution
-#
-# Used by:
-# Subsystem: Legion Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("subsystemBonusAmarrCore3"),
-                           skill="Amarr Core Systems")
diff --git a/eos/effects/effect4270.py b/eos/effects/effect4270.py
deleted file mode 100644
index 3fb57e5e6..000000000
--- a/eos/effects/effect4270.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCore3ScanResolution
-#
-# Used by:
-# Subsystem: Loki Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("subsystemBonusMinmatarCore3"),
-                           skill="Minmatar Core Systems")
diff --git a/eos/effects/effect4271.py b/eos/effects/effect4271.py
deleted file mode 100644
index 4aa3ad96c..000000000
--- a/eos/effects/effect4271.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusCaldariCore2MaxTargetingRange
-#
-# Used by:
-# Subsystem: Tengu Core - Electronic Efficiency Gate
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
diff --git a/eos/effects/effect4272.py b/eos/effects/effect4272.py
deleted file mode 100644
index 9e2e880f4..000000000
--- a/eos/effects/effect4272.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCore2MaxTargetingRange
-#
-# Used by:
-# Subsystem: Proteus Core - Electronic Efficiency Gate
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusGallenteCore2"),
-                           skill="Gallente Core Systems")
diff --git a/eos/effects/effect4273.py b/eos/effects/effect4273.py
deleted file mode 100644
index 0d93f558b..000000000
--- a/eos/effects/effect4273.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCore2WarpScrambleRange
-#
-# Used by:
-# Subsystem: Proteus Core - Friction Extension Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "maxRange",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteCore2"), skill="Gallente Core Systems")
diff --git a/eos/effects/effect4274.py b/eos/effects/effect4274.py
deleted file mode 100644
index 1b05d6864..000000000
--- a/eos/effects/effect4274.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCore2StasisWebifierRange
-#
-# Used by:
-# Subsystem: Loki Core - Immobility Drivers
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", src.getModifiedItemAttr("subsystemBonusMinmatarCore2"), skill="Minmatar Core Systems")
diff --git a/eos/effects/effect4275.py b/eos/effects/effect4275.py
deleted file mode 100644
index 3e0d5f181..000000000
--- a/eos/effects/effect4275.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariPropulsion2WarpSpeed
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"),
-                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect4277.py b/eos/effects/effect4277.py
deleted file mode 100644
index f267ba0bd..000000000
--- a/eos/effects/effect4277.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallentePropulsionWarpCapacitor
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusGallentePropulsion"),
-                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect4278.py b/eos/effects/effect4278.py
deleted file mode 100644
index 043a3d962..000000000
--- a/eos/effects/effect4278.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallentePropulsion2WarpSpeed
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusGallentePropulsion2"),
-                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect4280.py b/eos/effects/effect4280.py
deleted file mode 100644
index ce8ba7370..000000000
--- a/eos/effects/effect4280.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemAgility
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("agility", beacon.getModifiedItemAttr("agilityMultiplier"), stackingPenalties=True)
diff --git a/eos/effects/effect4282.py b/eos/effects/effect4282.py
deleted file mode 100644
index 23b44db1e..000000000
--- a/eos/effects/effect4282.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusGallenteOffensive2HybridWeaponDamageMultiplier
-#
-# Used by:
-# Subsystem: Proteus Offensive - Hybrid Encoding Platform
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive2"),
-                                  skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect4283.py b/eos/effects/effect4283.py
deleted file mode 100644
index 830e6ae1b..000000000
--- a/eos/effects/effect4283.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensive2HybridWeaponDamageMultiplier
-#
-# Used by:
-# Subsystem: Tengu Offensive - Magnetic Infusion Basin
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
-                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4286.py b/eos/effects/effect4286.py
deleted file mode 100644
index 39804e030..000000000
--- a/eos/effects/effect4286.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrOffensive2RemoteArmorRepairCapUse
-#
-# Used by:
-# Subsystem: Legion Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4288.py b/eos/effects/effect4288.py
deleted file mode 100644
index 4fbccf015..000000000
--- a/eos/effects/effect4288.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteOffensive2RemoteArmorRepairCapUse
-#
-# Used by:
-# Subsystem: Proteus Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteOffensive2"), skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect4290.py b/eos/effects/effect4290.py
deleted file mode 100644
index 451744d1a..000000000
--- a/eos/effects/effect4290.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive2RemoteRepCapUse
-#
-# Used by:
-# Subsystem: Loki Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "capacitorNeed", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4292.py b/eos/effects/effect4292.py
deleted file mode 100644
index 9d327606c..000000000
--- a/eos/effects/effect4292.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensive2RemoteShieldBoosterCapUse
-#
-# Used by:
-# Subsystem: Tengu Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"),
-                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4321.py b/eos/effects/effect4321.py
deleted file mode 100644
index afa67dbaa..000000000
--- a/eos/effects/effect4321.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# subsystemBonusCaldariCore2ECMStrengthRange
-#
-# Used by:
-# Subsystem: Tengu Core - Obfuscation Manifold
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanLadarStrengthBonus",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanRadarStrengthBonus",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "maxRange",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanGravimetricStrengthBonus",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanMagnetometricStrengthBonus",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems")
diff --git a/eos/effects/effect4327.py b/eos/effects/effect4327.py
deleted file mode 100644
index 26618a998..000000000
--- a/eos/effects/effect4327.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# subsystemBonusAmarrOffensive3DroneDamageHP
-#
-# Used by:
-# Subsystem: Legion Offensive - Assault Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "hp", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "armorHP", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "shieldCapacity", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "damageMultiplier", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4330.py b/eos/effects/effect4330.py
deleted file mode 100644
index 7d001910c..000000000
--- a/eos/effects/effect4330.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrOffensive3EnergyWeaponMaxRange
-#
-# Used by:
-# Subsystem: Legion Offensive - Liquid Crystal Magnifiers
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", module.getModifiedItemAttr("subsystemBonusAmarrOffensive3"),
-                                  skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4331.py b/eos/effects/effect4331.py
deleted file mode 100644
index dbe5e88db..000000000
--- a/eos/effects/effect4331.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensive3HMLHAMVelocity
-#
-# Used by:
-# Subsystem: Tengu Offensive - Accelerated Ejection Bay
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles") or mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", src.getModifiedItemAttr("subsystemBonusCaldariOffensive3"),
-                                    skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect4342.py b/eos/effects/effect4342.py
deleted file mode 100644
index 4417e41cb..000000000
--- a/eos/effects/effect4342.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCore2MaxTargetingRange
-#
-# Used by:
-# Subsystem: Loki Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusMinmatarCore2"),
-                           skill="Minmatar Core Systems")
diff --git a/eos/effects/effect4343.py b/eos/effects/effect4343.py
deleted file mode 100644
index 855c5f401..000000000
--- a/eos/effects/effect4343.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCore2MaxTargetingRange
-#
-# Used by:
-# Subsystem: Legion Core - Dissolution Sequencer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusAmarrCore2"),
-                           skill="Amarr Core Systems")
diff --git a/eos/effects/effect4347.py b/eos/effects/effect4347.py
deleted file mode 100644
index 75e20dfca..000000000
--- a/eos/effects/effect4347.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusGallenteOffensive3TurretTracking
-#
-# Used by:
-# Subsystem: Proteus Offensive - Drone Synthesis Projector
-# Subsystem: Proteus Offensive - Hybrid Encoding Platform
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", module.getModifiedItemAttr("subsystemBonusGallenteOffensive3"),
-                                  skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect4351.py b/eos/effects/effect4351.py
deleted file mode 100644
index 86f3f5476..000000000
--- a/eos/effects/effect4351.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive3TurretTracking
-#
-# Used by:
-# Subsystem: Loki Offensive - Projectile Scoping Array
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect4358.py b/eos/effects/effect4358.py
deleted file mode 100644
index 5300152bc..000000000
--- a/eos/effects/effect4358.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ecmRangeBonusModuleEffect
-#
-# Used by:
-# Modules from group: ECM Stabilizer (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", module.getModifiedItemAttr("ecmRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4360.py b/eos/effects/effect4360.py
deleted file mode 100644
index 7eb49ec46..000000000
--- a/eos/effects/effect4360.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusAmarrOffensiveMissileLauncherROF
-#
-# Used by:
-# Subsystem: Legion Offensive - Assault Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4362.py b/eos/effects/effect4362.py
deleted file mode 100644
index ac51a389f..000000000
--- a/eos/effects/effect4362.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# subsystemBonusAmarrOffensive2MissileDamage
-#
-# Used by:
-# Subsystem: Legion Offensive - Assault Optimization
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4366.py b/eos/effects/effect4366.py
deleted file mode 100644
index 858d70ab9..000000000
--- a/eos/effects/effect4366.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMediumHybridDmgCC2
-#
-# Used by:
-# Ship: Falcon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect4369.py b/eos/effects/effect4369.py
deleted file mode 100644
index cd29dad70..000000000
--- a/eos/effects/effect4369.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusWarpBubbleImmune
-#
-# Used by:
-# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.forceItemAttr("warpBubbleImmune", module.getModifiedItemAttr("warpBubbleImmuneModifier"))
diff --git a/eos/effects/effect4370.py b/eos/effects/effect4370.py
deleted file mode 100644
index d046a9c67..000000000
--- a/eos/effects/effect4370.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# caldariShipEwFalloffRangeCC2
-#
-# Used by:
-# Ship: Blackbird
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCC2"),
-                                  skill="Caldari Cruiser")
diff --git a/eos/effects/effect4372.py b/eos/effects/effect4372.py
deleted file mode 100644
index 6e17fdbe1..000000000
--- a/eos/effects/effect4372.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# caldariShipEwFalloffRangeCB3
-#
-# Used by:
-# Ship: Scorpion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCB3"),
-                                  skill="Caldari Battleship")
diff --git a/eos/effects/effect4373.py b/eos/effects/effect4373.py
deleted file mode 100644
index 8133970bc..000000000
--- a/eos/effects/effect4373.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# subSystemBonusAmarrOffensiveCommandBursts
-#
-# Used by:
-# Subsystem: Legion Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect4377.py b/eos/effects/effect4377.py
deleted file mode 100644
index a52c4046d..000000000
--- a/eos/effects/effect4377.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusTorpedoVelocityGF2
-#
-# Used by:
-# Ship: Nemesis
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4378.py b/eos/effects/effect4378.py
deleted file mode 100644
index cf5a4385a..000000000
--- a/eos/effects/effect4378.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTorpedoVelocityMF2
-#
-# Used by:
-# Ship: Hound
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4379.py b/eos/effects/effect4379.py
deleted file mode 100644
index 0109217d5..000000000
--- a/eos/effects/effect4379.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTorpedoVelocity2AF
-#
-# Used by:
-# Ship: Purifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect4380.py b/eos/effects/effect4380.py
deleted file mode 100644
index 5c779651b..000000000
--- a/eos/effects/effect4380.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTorpedoVelocityCF2
-#
-# Used by:
-# Ship: Manticore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect4384.py b/eos/effects/effect4384.py
deleted file mode 100644
index 8f73c136a..000000000
--- a/eos/effects/effect4384.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteReconBonusHeavyMissileVelocity
-#
-# Used by:
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1"),
-                                    skill="Recon Ships")
diff --git a/eos/effects/effect4385.py b/eos/effects/effect4385.py
deleted file mode 100644
index fc223a167..000000000
--- a/eos/effects/effect4385.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteReconBonusHeavyAssaultMissileVelocity
-#
-# Used by:
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1"),
-                                    skill="Recon Ships")
diff --git a/eos/effects/effect4393.py b/eos/effects/effect4393.py
deleted file mode 100644
index 358023fee..000000000
--- a/eos/effects/effect4393.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusEliteCover2TorpedoThermalDamage
-#
-# Used by:
-# Ship: Nemesis
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect4394.py b/eos/effects/effect4394.py
deleted file mode 100644
index 89697d829..000000000
--- a/eos/effects/effect4394.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEliteCover2TorpedoEMDamage
-#
-# Used by:
-# Ship: Purifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "emDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"), skill="Covert Ops")
diff --git a/eos/effects/effect4395.py b/eos/effects/effect4395.py
deleted file mode 100644
index 779189de1..000000000
--- a/eos/effects/effect4395.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusEliteCover2TorpedoExplosiveDamage
-#
-# Used by:
-# Ship: Hound
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect4396.py b/eos/effects/effect4396.py
deleted file mode 100644
index 5ed5f7a69..000000000
--- a/eos/effects/effect4396.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEliteCover2TorpedoKineticDamage
-#
-# Used by:
-# Ship: Manticore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect4397.py b/eos/effects/effect4397.py
deleted file mode 100644
index d7cd8a67e..000000000
--- a/eos/effects/effect4397.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusGFTorpedoExplosionVelocity
-#
-# Used by:
-# Ship: Nemesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4398.py b/eos/effects/effect4398.py
deleted file mode 100644
index c546c4716..000000000
--- a/eos/effects/effect4398.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMF1TorpedoExplosionVelocity
-#
-# Used by:
-# Ship: Hound
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4399.py b/eos/effects/effect4399.py
deleted file mode 100644
index 41a8b9db8..000000000
--- a/eos/effects/effect4399.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCF1TorpedoExplosionVelocity
-#
-# Used by:
-# Ship: Manticore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect4400.py b/eos/effects/effect4400.py
deleted file mode 100644
index d3be58566..000000000
--- a/eos/effects/effect4400.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAF1TorpedoExplosionVelocity
-#
-# Used by:
-# Ship: Purifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect4413.py b/eos/effects/effect4413.py
deleted file mode 100644
index 7fe141ec6..000000000
--- a/eos/effects/effect4413.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusGF1TorpedoFlightTime
-#
-# Used by:
-# Ship: Nemesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4415.py b/eos/effects/effect4415.py
deleted file mode 100644
index 539d8a205..000000000
--- a/eos/effects/effect4415.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMF1TorpedoFlightTime
-#
-# Used by:
-# Ship: Hound
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4416.py b/eos/effects/effect4416.py
deleted file mode 100644
index 2f00bd515..000000000
--- a/eos/effects/effect4416.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCF1TorpedoFlightTime
-#
-# Used by:
-# Ship: Manticore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect4417.py b/eos/effects/effect4417.py
deleted file mode 100644
index 09b679710..000000000
--- a/eos/effects/effect4417.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAF1TorpedoFlightTime
-#
-# Used by:
-# Ship: Purifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect4451.py b/eos/effects/effect4451.py
deleted file mode 100644
index 94069c92f..000000000
--- a/eos/effects/effect4451.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# ScanRadarStrengthModifierEffect
-#
-# Used by:
-# Implants named like: Low grade Grail (5 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanRadarStrength", implant.getModifiedItemAttr("scanRadarStrengthModifier"))
diff --git a/eos/effects/effect4452.py b/eos/effects/effect4452.py
deleted file mode 100644
index 43c9aeafd..000000000
--- a/eos/effects/effect4452.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# ScanLadarStrengthModifierEffect
-#
-# Used by:
-# Implants named like: Low grade Jackal (5 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanLadarStrength", implant.getModifiedItemAttr("scanLadarStrengthModifier"))
diff --git a/eos/effects/effect4453.py b/eos/effects/effect4453.py
deleted file mode 100644
index 64388c877..000000000
--- a/eos/effects/effect4453.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# ScanGravimetricStrengthModifierEffect
-#
-# Used by:
-# Implants named like: Low grade Talon (5 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanGravimetricStrength", implant.getModifiedItemAttr("scanGravimetricStrengthModifier"))
diff --git a/eos/effects/effect4454.py b/eos/effects/effect4454.py
deleted file mode 100644
index a4c66463f..000000000
--- a/eos/effects/effect4454.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ScanMagnetometricStrengthModifierEffect
-#
-# Used by:
-# Implants named like: Low grade Spur (5 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.ship.increaseItemAttr("scanMagnetometricStrength",
-                              implant.getModifiedItemAttr("scanMagnetometricStrengthModifier"))
diff --git a/eos/effects/effect4456.py b/eos/effects/effect4456.py
deleted file mode 100644
index f73c4d6af..000000000
--- a/eos/effects/effect4456.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# federationsetbonus3
-#
-# Used by:
-# Implants named like: High grade Spur (6 of 6)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanMagnetometricStrengthPercent",
-                                             implant.getModifiedItemAttr("implantSetFederationNavy"))
diff --git a/eos/effects/effect4457.py b/eos/effects/effect4457.py
deleted file mode 100644
index bcd755f7f..000000000
--- a/eos/effects/effect4457.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# imperialsetbonus3
-#
-# Used by:
-# Implants named like: High grade Grail (6 of 6)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanRadarStrengthPercent",
-                                             implant.getModifiedItemAttr("implantSetImperialNavy"))
diff --git a/eos/effects/effect4458.py b/eos/effects/effect4458.py
deleted file mode 100644
index c4275fa9b..000000000
--- a/eos/effects/effect4458.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# republicsetbonus3
-#
-# Used by:
-# Implants named like: High grade Jackal (6 of 6)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanLadarStrengthPercent",
-                                             implant.getModifiedItemAttr("implantSetRepublicFleet"))
diff --git a/eos/effects/effect4459.py b/eos/effects/effect4459.py
deleted file mode 100644
index ee4d55f4b..000000000
--- a/eos/effects/effect4459.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# caldarisetbonus3
-#
-# Used by:
-# Implants named like: High grade Talon (6 of 6)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanGravimetricStrengthPercent",
-                                             implant.getModifiedItemAttr("implantSetCaldariNavy"))
diff --git a/eos/effects/effect446.py b/eos/effects/effect446.py
deleted file mode 100644
index d9209c608..000000000
--- a/eos/effects/effect446.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shieldManagementShieldCapacityBonusPostPercentCapacityLocationShipGroupShield
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Shield Management SM (6 of 6)
-# Modules named like: Core Defense Field Extender (8 of 8)
-# Implant: Genolution Core Augmentation CA-3
-# Implant: Sansha Modified 'Gnome' Implant
-# Skill: Shield Management
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("shieldCapacity", container.getModifiedItemAttr("shieldCapacityBonus") * level)
diff --git a/eos/effects/effect4460.py b/eos/effects/effect4460.py
deleted file mode 100644
index fc14ae72d..000000000
--- a/eos/effects/effect4460.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# imperialsetLGbonus
-#
-# Used by:
-# Implants named like: Low grade Grail (6 of 6)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanRadarStrengthModifier",
-                                             implant.getModifiedItemAttr("implantSetLGImperialNavy"))
diff --git a/eos/effects/effect4461.py b/eos/effects/effect4461.py
deleted file mode 100644
index a393582ba..000000000
--- a/eos/effects/effect4461.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# federationsetLGbonus
-#
-# Used by:
-# Implants named like: Low grade Spur (6 of 6)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanMagnetometricStrengthModifier",
-                                             implant.getModifiedItemAttr("implantSetLGFederationNavy"))
diff --git a/eos/effects/effect4462.py b/eos/effects/effect4462.py
deleted file mode 100644
index ed684aa94..000000000
--- a/eos/effects/effect4462.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# caldarisetLGbonus
-#
-# Used by:
-# Implants named like: Low grade Talon (6 of 6)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanGravimetricStrengthModifier",
-                                             implant.getModifiedItemAttr("implantSetLGCaldariNavy"))
diff --git a/eos/effects/effect4463.py b/eos/effects/effect4463.py
deleted file mode 100644
index c853ebed7..000000000
--- a/eos/effects/effect4463.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# republicsetLGbonus
-#
-# Used by:
-# Implants named like: Low grade Jackal (6 of 6)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
-                                             "scanLadarStrengthModifier",
-                                             implant.getModifiedItemAttr("implantSetLGRepublicFleet"))
diff --git a/eos/effects/effect4464.py b/eos/effects/effect4464.py
deleted file mode 100644
index d4eb0ef4a..000000000
--- a/eos/effects/effect4464.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileRofMF
-#
-# Used by:
-# Ship: Claw
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusMF"), stackingPenalties=True, skill="Minmatar Frigate")
diff --git a/eos/effects/effect4471.py b/eos/effects/effect4471.py
deleted file mode 100644
index 410425e26..000000000
--- a/eos/effects/effect4471.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusStasisMF2
-#
-# Used by:
-# Ship: Caedes
-# Ship: Cruor
-# Ship: Freki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4472.py b/eos/effects/effect4472.py
deleted file mode 100644
index 4a236b998..000000000
--- a/eos/effects/effect4472.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileDmgMC
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect4473.py b/eos/effects/effect4473.py
deleted file mode 100644
index 7b2c31830..000000000
--- a/eos/effects/effect4473.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipVelocityBonusATC1
-#
-# Used by:
-# Ship: Adrestia
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/effect4474.py b/eos/effects/effect4474.py
deleted file mode 100644
index 0cc9e309a..000000000
--- a/eos/effects/effect4474.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMTMaxRangeBonusATC
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/effect4475.py b/eos/effects/effect4475.py
deleted file mode 100644
index 199209b3a..000000000
--- a/eos/effects/effect4475.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMTFalloffBonusATC
-#
-# Used by:
-# Ship: Mimir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/effect4476.py b/eos/effects/effect4476.py
deleted file mode 100644
index 737efa570..000000000
--- a/eos/effects/effect4476.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMTFalloffBonusATF
-#
-# Used by:
-# Ship: Freki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4477.py b/eos/effects/effect4477.py
deleted file mode 100644
index e59725ea0..000000000
--- a/eos/effects/effect4477.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMTMaxRangeBonusATF
-#
-# Used by:
-# Ship: Freki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4478.py b/eos/effects/effect4478.py
deleted file mode 100644
index 2b3561611..000000000
--- a/eos/effects/effect4478.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAfterburnerCapNeedATF
-#
-# Used by:
-# Ship: Freki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusATF1"))
diff --git a/eos/effects/effect4479.py b/eos/effects/effect4479.py
deleted file mode 100644
index 4fc7124c5..000000000
--- a/eos/effects/effect4479.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSurveyProbeExplosionDelaySkillSurveyCovertOps3
-#
-# Used by:
-# Ships from group: Covert Ops (5 of 8)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Survey Probe",
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusCovertOps3"),
-                                    skill="Covert Ops")
diff --git a/eos/effects/effect4482.py b/eos/effects/effect4482.py
deleted file mode 100644
index 99b829ab7..000000000
--- a/eos/effects/effect4482.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipETOptimalRange2AF
-#
-# Used by:
-# Ship: Imperial Navy Slicer
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect4484.py b/eos/effects/effect4484.py
deleted file mode 100644
index 18a7dfc80..000000000
--- a/eos/effects/effect4484.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipPTurretFalloffBonusGB
-#
-# Used by:
-# Ship: Machariel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect4485.py b/eos/effects/effect4485.py
deleted file mode 100644
index b0d4a1f79..000000000
--- a/eos/effects/effect4485.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusStasisWebSpeedFactorMB
-#
-# Used by:
-# Ship: Vindicator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "speedFactor", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect4489.py b/eos/effects/effect4489.py
deleted file mode 100644
index dfc06475e..000000000
--- a/eos/effects/effect4489.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# superWeaponAmarr
-#
-# Used by:
-# Module: 'Judgment' Electromagnetic Doomsday
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect4490.py b/eos/effects/effect4490.py
deleted file mode 100644
index a7ea155e2..000000000
--- a/eos/effects/effect4490.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# superWeaponCaldari
-#
-# Used by:
-# Module: 'Oblivion' Kinetic Doomsday
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect4491.py b/eos/effects/effect4491.py
deleted file mode 100644
index 21d330213..000000000
--- a/eos/effects/effect4491.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# superWeaponGallente
-#
-# Used by:
-# Module: 'Aurora Ominae' Thermal Doomsday
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect4492.py b/eos/effects/effect4492.py
deleted file mode 100644
index 25b0b57ef..000000000
--- a/eos/effects/effect4492.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# superWeaponMinmatar
-#
-# Used by:
-# Module: 'Gjallarhorn' Explosive Doomsday
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect4510.py b/eos/effects/effect4510.py
deleted file mode 100644
index 03a6c3198..000000000
--- a/eos/effects/effect4510.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipStasisWebStrengthBonusMC2
-#
-# Used by:
-# Ship: Victor
-# Ship: Vigilant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "speedFactor", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect4512.py b/eos/effects/effect4512.py
deleted file mode 100644
index ba5f3f80d..000000000
--- a/eos/effects/effect4512.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipPTurretFalloffBonusGC
-#
-# Used by:
-# Ship: Cynabal
-# Ship: Moracha
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect4513.py b/eos/effects/effect4513.py
deleted file mode 100644
index 09822f202..000000000
--- a/eos/effects/effect4513.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipStasisWebStrengthBonusMF2
-#
-# Used by:
-# Ship: Daredevil
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "speedFactor", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4515.py b/eos/effects/effect4515.py
deleted file mode 100644
index 39ec4e71d..000000000
--- a/eos/effects/effect4515.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipFalloffBonusMF
-#
-# Used by:
-# Ship: Chremoas
-# Ship: Dramiel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect4516.py b/eos/effects/effect4516.py
deleted file mode 100644
index 61fefdc54..000000000
--- a/eos/effects/effect4516.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHTurretFalloffBonusGC
-#
-# Used by:
-# Ship: Victor
-# Ship: Vigilant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect4527.py b/eos/effects/effect4527.py
deleted file mode 100644
index 00532b254..000000000
--- a/eos/effects/effect4527.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# gunneryFalloffBonusOnline
-#
-# Used by:
-# Modules from group: Tracking Enhancer (10 of 10)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4555.py b/eos/effects/effect4555.py
deleted file mode 100644
index 2c847d0c1..000000000
--- a/eos/effects/effect4555.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalLauncherSkillCruiseCitadelEmDamage1
-#
-# Used by:
-# Skill: XL Cruise Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
-                                    "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect4556.py b/eos/effects/effect4556.py
deleted file mode 100644
index 2b52bfcb3..000000000
--- a/eos/effects/effect4556.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalLauncherSkillCruiseCitadelExplosiveDamage1
-#
-# Used by:
-# Skill: XL Cruise Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
-                                    "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect4557.py b/eos/effects/effect4557.py
deleted file mode 100644
index e51cad250..000000000
--- a/eos/effects/effect4557.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalLauncherSkillCruiseCitadelKineticDamage1
-#
-# Used by:
-# Skill: XL Cruise Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
-                                    "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect4558.py b/eos/effects/effect4558.py
deleted file mode 100644
index 097a6d2b2..000000000
--- a/eos/effects/effect4558.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# capitalLauncherSkillCruiseCitadelThermalDamage1
-#
-# Used by:
-# Skill: XL Cruise Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
-                                    "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect4559.py b/eos/effects/effect4559.py
deleted file mode 100644
index ef6c60e3b..000000000
--- a/eos/effects/effect4559.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# gunneryMaxRangeFalloffTrackingSpeedBonus
-#
-# Used by:
-# Modules from group: Tracking Computer (11 of 11)
-type = "active"
-
-
-def handler(fit, module, context):
-    for attr in ("maxRange", "falloff", "trackingSpeed"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      attr, module.getModifiedItemAttr("%sBonus" % attr),
-                                      stackingPenalties=True)
diff --git a/eos/effects/effect4575.py b/eos/effects/effect4575.py
deleted file mode 100644
index f9efed36c..000000000
--- a/eos/effects/effect4575.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# industrialCoreEffect2
-#
-# Used by:
-# Variations of module: Industrial Core I (2 of 2)
-type = "active"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    fit.extraAttributes["siege"] = True
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
-    fit.ship.multiplyItemAttr("mass", src.getModifiedItemAttr("siegeMassMultiplier"))
-    fit.ship.multiplyItemAttr("scanResolution",
-                              src.getModifiedItemAttr("scanResolutionMultiplier"),
-                              stackingPenalties=True)
-
-    #  Remote Shield Repper Bonuses
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "duration",
-                                  src.getModifiedItemAttr("industrialCoreRemoteLogisticsDurationBonus"),
-                                  )
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "maxRange",
-                                  src.getModifiedItemAttr("industrialCoreRemoteLogisticsRangeBonus"),
-                                  stackingPenalties=True
-                                  )
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "capacitorNeed",
-                                  src.getModifiedItemAttr("industrialCoreRemoteLogisticsDurationBonus")
-                                  )
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "falloffEffectiveness",
-                                  src.getModifiedItemAttr("industrialCoreRemoteLogisticsRangeBonus"),
-                                  stackingPenalties=True
-                                  )
-
-    #  Local Shield Repper Bonuses
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
-                                  "duration",
-                                  src.getModifiedItemAttr("industrialCoreLocalLogisticsDurationBonus"),
-                                  )
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
-                                  "shieldBonus",
-                                  src.getModifiedItemAttr("industrialCoreLocalLogisticsAmountBonus"),
-                                  stackingPenalties=True
-                                  )
-
-    # Mining Burst Bonuses
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"),
-                                  "warfareBuff1Value",
-                                  src.getModifiedItemAttr("industrialCoreBonusMiningBurstStrength"),
-                                  )
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"),
-                                  "warfareBuff2Value",
-                                  src.getModifiedItemAttr("industrialCoreBonusMiningBurstStrength"),
-                                  )
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"),
-                                  "warfareBuff3Value",
-                                  src.getModifiedItemAttr("industrialCoreBonusMiningBurstStrength"),
-                                  )
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"),
-                                  "warfareBuff4Value",
-                                  src.getModifiedItemAttr("industrialCoreBonusMiningBurstStrength"),
-                                  )
-
-    #  Command Burst Range Bonus
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"),
-                                  "maxRange",
-                                  src.getModifiedItemAttr("industrialCoreBonusCommandBurstRange"),
-                                  stackingPenalties=True
-                                  )
-
-    # Drone Bonuses
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Ice Harvesting Drone Operation"),
-                                 "duration",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneIceHarvesting"),
-                                 )
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneMining"),
-                                 )
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneVelocity"),
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneDamageHP"),
-                                 stackingPenalties=True
-                                 )
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneDamageHP"),
-                                 )
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneDamageHP"),
-                                 )
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp",
-                                 src.getModifiedItemAttr("industrialCoreBonusDroneDamageHP"),
-                                 )
-
-    #  Todo: remote impedance (no reps, etc)
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
-    fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus"))
-    fit.ship.increaseItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering"))
-    fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus"))
-    fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus"))
-    fit.ship.increaseItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking"))
diff --git a/eos/effects/effect4576.py b/eos/effects/effect4576.py
deleted file mode 100644
index b1c5b908d..000000000
--- a/eos/effects/effect4576.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkFalloffBonus1
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect4577.py b/eos/effects/effect4577.py
deleted file mode 100644
index e13cef64b..000000000
--- a/eos/effects/effect4577.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogisticsTrackingLinkFalloffBonus2
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect4579.py b/eos/effects/effect4579.py
deleted file mode 100644
index 7f060a291..000000000
--- a/eos/effects/effect4579.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# droneRigStasisWebSpeedFactorBonus
-#
-# Used by:
-# Modules named like: Stasis Drone Augmentor (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Stasis Webifying Drone",
-                                 "speedFactor", module.getModifiedItemAttr("webSpeedFactorBonus"))
diff --git a/eos/effects/effect4619.py b/eos/effects/effect4619.py
deleted file mode 100644
index 5f71d4b0f..000000000
--- a/eos/effects/effect4619.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneDamageGF2
-#
-# Used by:
-# Ship: Utu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4620.py b/eos/effects/effect4620.py
deleted file mode 100644
index 77fd29e73..000000000
--- a/eos/effects/effect4620.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusWarpScramblerMaxRangeGF2
-#
-# Used by:
-# Ship: Garmur
-# Ship: Utu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4621.py b/eos/effects/effect4621.py
deleted file mode 100644
index d6dfc2597..000000000
--- a/eos/effects/effect4621.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusHeatDamageATF1
-#
-# Used by:
-# Ship: Cambion
-# Ship: Etana
-# Ship: Utu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusATF1"))
diff --git a/eos/effects/effect4622.py b/eos/effects/effect4622.py
deleted file mode 100644
index e1312bf05..000000000
--- a/eos/effects/effect4622.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSmallHybridMaxRangeATF2
-#
-# Used by:
-# Ship: Utu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4623.py b/eos/effects/effect4623.py
deleted file mode 100644
index 5d0131952..000000000
--- a/eos/effects/effect4623.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSmallHybridTrackingSpeedATF2
-#
-# Used by:
-# Ship: Utu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4624.py b/eos/effects/effect4624.py
deleted file mode 100644
index 9b6e8a4ec..000000000
--- a/eos/effects/effect4624.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHybridTrackingATC2
-#
-# Used by:
-# Ship: Adrestia
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/effect4625.py b/eos/effects/effect4625.py
deleted file mode 100644
index b60d60618..000000000
--- a/eos/effects/effect4625.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHybridFalloffATC2
-#
-# Used by:
-# Ship: Adrestia
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/effect4626.py b/eos/effects/effect4626.py
deleted file mode 100644
index 84afce09b..000000000
--- a/eos/effects/effect4626.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusWarpScramblerMaxRangeGC2
-#
-# Used by:
-# Ship: Adrestia
-# Ship: Orthrus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect4635.py b/eos/effects/effect4635.py
deleted file mode 100644
index 0541914fc..000000000
--- a/eos/effects/effect4635.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusMaraudersCruiseAndTorpedoDamageRole1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("em", "explosive", "kinetic", "thermal")
-    for damageType in damageTypes:
-        fit.modules.filteredChargeBoost(
-            lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
-            "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect4636.py b/eos/effects/effect4636.py
deleted file mode 100644
index 240b2f5ca..000000000
--- a/eos/effects/effect4636.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusAoeVelocityCruiseAndTorpedoCB2
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
-        "aoeVelocity", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect4637.py b/eos/effects/effect4637.py
deleted file mode 100644
index e3b31c683..000000000
--- a/eos/effects/effect4637.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipCruiseAndTorpedoVelocityBonusCB3
-#
-# Used by:
-# Ship: Golem
-# Ship: Widow
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"),
-        "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/effect4640.py b/eos/effects/effect4640.py
deleted file mode 100644
index d19155457..000000000
--- a/eos/effects/effect4640.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipArmorEMAndExpAndkinAndThmResistanceAC2
-#
-# Used by:
-# Ships named like: Stratios (2 of 2)
-# Ship: Sacrilege
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
-    for damageType in damageTypes:
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAC2"),
-                               skill="Amarr Cruiser")
diff --git a/eos/effects/effect4643.py b/eos/effects/effect4643.py
deleted file mode 100644
index c75875c24..000000000
--- a/eos/effects/effect4643.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipHeavyAssaultMissileEMAndExpAndKinAndThmDmgAC1
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("em", "explosive", "kinetic", "thermal")
-    for damageType in damageTypes:
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusAC"),
-                                        skill="Amarr Cruiser")
diff --git a/eos/effects/effect4645.py b/eos/effects/effect4645.py
deleted file mode 100644
index e3aa5470f..000000000
--- a/eos/effects/effect4645.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusHeavyGunshipHeavyAndHeavyAssaultAndAssaultMissileLauncherROF
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    groups = ("Missile Launcher Rapid Light", "Missile Launcher Heavy Assault", "Missile Launcher Heavy")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                  skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect4648.py b/eos/effects/effect4648.py
deleted file mode 100644
index 6fb22fc13..000000000
--- a/eos/effects/effect4648.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusBlackOpsECMGravAndLadarAndMagnetometricAndRadarStrength1
-#
-# Used by:
-# Ship: Widow
-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 == "ECM", "scan{0}StrengthBonus".format(type),
-                                      ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/effect4649.py b/eos/effects/effect4649.py
deleted file mode 100644
index 755ca5cae..000000000
--- a/eos/effects/effect4649.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipCruiseAndSiegeLauncherROFBonus2CB
-#
-# Used by:
-# Ship: Widow
-type = "passive"
-
-
-def handler(fit, ship, context):
-    affectedGroups = ("Missile Launcher Cruise", "Missile Launcher Torpedo")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in affectedGroups,
-                                  "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect4667.py b/eos/effects/effect4667.py
deleted file mode 100644
index 5b405a371..000000000
--- a/eos/effects/effect4667.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusNoctisSalvageCycle
-#
-# Used by:
-# Ship: Noctis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1"),
-                                  skill="ORE Industrial")
diff --git a/eos/effects/effect4668.py b/eos/effects/effect4668.py
deleted file mode 100644
index b9ea733b9..000000000
--- a/eos/effects/effect4668.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusNoctisTractorCycle
-#
-# Used by:
-# Ship: Noctis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1"),
-                                  skill="ORE Industrial")
diff --git a/eos/effects/effect4669.py b/eos/effects/effect4669.py
deleted file mode 100644
index 28c2f237a..000000000
--- a/eos/effects/effect4669.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusNoctisTractorVelocity
-#
-# Used by:
-# Ship: Noctis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxTractorVelocity", ship.getModifiedItemAttr("shipBonusOreIndustrial2"),
-                                  skill="ORE Industrial")
diff --git a/eos/effects/effect4670.py b/eos/effects/effect4670.py
deleted file mode 100644
index ab2254345..000000000
--- a/eos/effects/effect4670.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusNoctisTractorRange
-#
-# Used by:
-# Ship: Noctis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusOreIndustrial2"),
-                                  skill="ORE Industrial")
diff --git a/eos/effects/effect4728.py b/eos/effects/effect4728.py
deleted file mode 100644
index 39c120f49..000000000
--- a/eos/effects/effect4728.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# OffensiveDefensiveReduction
-#
-# Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
-# Celestials named like: Incursion ship attributes effects (3 of 3)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    damages = ("em", "thermal", "kinetic", "explosive")
-    for damage in damages:
-        # Nerf missile damage
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                        "{0}Damage".format(damage),
-                                        beacon.getModifiedItemAttr("systemEffectDamageReduction"))
-        # Nerf smartbomb damage
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Smart Bomb",
-                                      "{0}Damage".format(damage),
-                                      beacon.getModifiedItemAttr("systemEffectDamageReduction"))
-        # Nerf armor resistances
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damage.capitalize()),
-                               beacon.getModifiedItemAttr("armor{0}DamageResistanceBonus".format(damage.capitalize())))
-        # Nerf shield resistances
-        fit.ship.boostItemAttr("shield{0}DamageResonance".format(damage.capitalize()),
-                               beacon.getModifiedItemAttr("shield{0}DamageResistanceBonus".format(damage.capitalize())))
-    # Nerf drone damage output
-    fit.drones.filteredItemBoost(lambda drone: True,
-                                 "damageMultiplier", beacon.getModifiedItemAttr("systemEffectDamageReduction"))
-    # Nerf turret damage output
-    fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill("Gunnery"),
-                                  "damageMultiplier", beacon.getModifiedItemAttr("systemEffectDamageReduction"))
diff --git a/eos/effects/effect4760.py b/eos/effects/effect4760.py
deleted file mode 100644
index 050e87d91..000000000
--- a/eos/effects/effect4760.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariPropulsionWarpCapacitor
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion"),
-                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect4775.py b/eos/effects/effect4775.py
deleted file mode 100644
index 529e6651e..000000000
--- a/eos/effects/effect4775.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyNeutralizerTransferAmountBonusAF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonus2AF"),
-                                  skill="Amarr Frigate")
diff --git a/eos/effects/effect4782.py b/eos/effects/effect4782.py
deleted file mode 100644
index 85f5ba924..000000000
--- a/eos/effects/effect4782.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSmallEnergyWeaponOptimalRangeATF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4789.py b/eos/effects/effect4789.py
deleted file mode 100644
index 483f39915..000000000
--- a/eos/effects/effect4789.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSmallEnergyTurretDamageATF1
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusATF1"))
diff --git a/eos/effects/effect4793.py b/eos/effects/effect4793.py
deleted file mode 100644
index bf2b11b02..000000000
--- a/eos/effects/effect4793.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileLauncherHeavyROFATC1
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/effect4794.py b/eos/effects/effect4794.py
deleted file mode 100644
index cc18bb8ed..000000000
--- a/eos/effects/effect4794.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileLauncherAssaultROFATC1
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
-                                  "speed", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/effect4795.py b/eos/effects/effect4795.py
deleted file mode 100644
index ae3dc443d..000000000
--- a/eos/effects/effect4795.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileLauncherHeavyAssaultROFATC1
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("shipBonusATC1"))
diff --git a/eos/effects/effect4799.py b/eos/effects/effect4799.py
deleted file mode 100644
index dc9741208..000000000
--- a/eos/effects/effect4799.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusBlackOpsECMBurstGravAndLadarAndMagnetoAndRadar
-#
-# Used by:
-# Ship: Widow
-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),
-                                      ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")
diff --git a/eos/effects/effect48.py b/eos/effects/effect48.py
deleted file mode 100644
index 42dcaca89..000000000
--- a/eos/effects/effect48.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# powerBooster
-#
-# Used by:
-# Modules from group: Capacitor Booster (59 of 59)
-type = "active"
-
-
-def handler(fit, module, context):
-    # Set reload time to 10 seconds
-    module.reloadTime = 10000
-    # Make so that reloads are always taken into account during clculations
-    module.forceReload = True
-
-    if module.charge is None:
-        return
-    capAmount = module.getModifiedChargeAttr("capacitorBonus") or 0
-    module.itemModifiedAttributes["capacitorNeed"] = -capAmount
diff --git a/eos/effects/effect4804.py b/eos/effects/effect4804.py
deleted file mode 100644
index 376039994..000000000
--- a/eos/effects/effect4804.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# dataMiningSkillBoostAccessDifficultyBonusAbsolutePercent
-#
-# Used by:
-# Skill: Archaeology
-# Skill: Hacking
-# Skill: Salvaging
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill(skill), "accessDifficultyBonus",
-                                     skill.getModifiedItemAttr("accessDifficultyBonusAbsolutePercent") * skill.level)
diff --git a/eos/effects/effect4809.py b/eos/effects/effect4809.py
deleted file mode 100644
index 35bac7668..000000000
--- a/eos/effects/effect4809.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ecmGravimetricStrengthBonusPercent
-#
-# Used by:
-# Modules from group: ECM Stabilizer (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanGravimetricStrengthBonus", module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4810.py b/eos/effects/effect4810.py
deleted file mode 100644
index 1ff5830a8..000000000
--- a/eos/effects/effect4810.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ecmLadarStrengthBonusPercent
-#
-# Used by:
-# Modules from group: ECM Stabilizer (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanLadarStrengthBonus", module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4811.py b/eos/effects/effect4811.py
deleted file mode 100644
index 84eb6163d..000000000
--- a/eos/effects/effect4811.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# ecmMagnetometricStrengthBonusPercent
-#
-# Used by:
-# Modules from group: ECM Stabilizer (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanMagnetometricStrengthBonus",
-                                  module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4812.py b/eos/effects/effect4812.py
deleted file mode 100644
index a70573cdc..000000000
--- a/eos/effects/effect4812.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ecmRadarStrengthBonusPercent
-#
-# Used by:
-# Modules from group: ECM Stabilizer (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "scanRadarStrengthBonus", module.getModifiedItemAttr("ecmStrengthBonusPercent"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect4814.py b/eos/effects/effect4814.py
deleted file mode 100644
index b823680ed..000000000
--- a/eos/effects/effect4814.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# jumpPortalConsumptionBonusPercentSkill
-#
-# Used by:
-# Skill: Jump Portal Generation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "consumptionQuantity",
-                                  skill.getModifiedItemAttr("consumptionQuantityBonusPercent") * skill.level)
diff --git a/eos/effects/effect4817.py b/eos/effects/effect4817.py
deleted file mode 100644
index ecf0ee4cf..000000000
--- a/eos/effects/effect4817.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# salvagerModuleDurationReduction
-#
-# Used by:
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Salvager",
-                                  "duration", implant.getModifiedItemAttr("durationBonus"))
diff --git a/eos/effects/effect4820.py b/eos/effects/effect4820.py
deleted file mode 100644
index 9bed34c1d..000000000
--- a/eos/effects/effect4820.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# bcLargeEnergyTurretPowerNeedBonus
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                     "power", ship.getModifiedItemAttr("bcLargeTurretPower"))
diff --git a/eos/effects/effect4821.py b/eos/effects/effect4821.py
deleted file mode 100644
index c35072878..000000000
--- a/eos/effects/effect4821.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# bcLargeHybridTurretPowerNeedBonus
-#
-# Used by:
-# Ship: Naga
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                     "power", ship.getModifiedItemAttr("bcLargeTurretPower"))
diff --git a/eos/effects/effect4822.py b/eos/effects/effect4822.py
deleted file mode 100644
index c37e55b8f..000000000
--- a/eos/effects/effect4822.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# bcLargeProjectileTurretPowerNeedBonus
-#
-# Used by:
-# Ship: Tornado
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                     "power", ship.getModifiedItemAttr("bcLargeTurretPower"))
diff --git a/eos/effects/effect4823.py b/eos/effects/effect4823.py
deleted file mode 100644
index a59ed687e..000000000
--- a/eos/effects/effect4823.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# bcLargeEnergyTurretCPUNeedBonus
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                     "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))
diff --git a/eos/effects/effect4824.py b/eos/effects/effect4824.py
deleted file mode 100644
index 299c31845..000000000
--- a/eos/effects/effect4824.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# bcLargeHybridTurretCPUNeedBonus
-#
-# Used by:
-# Ship: Naga
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                     "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))
diff --git a/eos/effects/effect4825.py b/eos/effects/effect4825.py
deleted file mode 100644
index fc0dfc50a..000000000
--- a/eos/effects/effect4825.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# bcLargeProjectileTurretCPUNeedBonus
-#
-# Used by:
-# Ship: Tornado
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                     "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))
diff --git a/eos/effects/effect4826.py b/eos/effects/effect4826.py
deleted file mode 100644
index a4e3036f3..000000000
--- a/eos/effects/effect4826.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# bcLargeEnergyTurretCapacitorNeedBonus
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                     "capacitorNeed", ship.getModifiedItemAttr("bcLargeTurretCap"))
diff --git a/eos/effects/effect4827.py b/eos/effects/effect4827.py
deleted file mode 100644
index 04ea48c8f..000000000
--- a/eos/effects/effect4827.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# bcLargeHybridTurretCapacitorNeedBonus
-#
-# Used by:
-# Ship: Naga
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                     "capacitorNeed", ship.getModifiedItemAttr("bcLargeTurretCap"))
diff --git a/eos/effects/effect485.py b/eos/effects/effect485.py
deleted file mode 100644
index 991640a10..000000000
--- a/eos/effects/effect485.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# energysystemsoperationCapRechargeBonusPostPercentRechargeRateLocationShipGroupCapacitor
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Capacitor Systems Operation EO (6 of 6)
-# Modules named like: Capacitor Control Circuit (8 of 8)
-# Implant: Genolution Core Augmentation CA-2
-# Skill: Capacitor Systems Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("rechargeRate", container.getModifiedItemAttr("capRechargeBonus") * level)
diff --git a/eos/effects/effect486.py b/eos/effects/effect486.py
deleted file mode 100644
index 919fc8b79..000000000
--- a/eos/effects/effect486.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shieldOperationRechargeratebonusPostPercentRechargeRateLocationShipGroupShield
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Shield Operation SP (6 of 6)
-# Modules named like: Core Defense Field Purger (8 of 8)
-# Implant: Sansha Modified 'Gnome' Implant
-# Skill: Shield Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("shieldRechargeRate", container.getModifiedItemAttr("rechargeratebonus") * level)
diff --git a/eos/effects/effect4867.py b/eos/effects/effect4867.py
deleted file mode 100644
index 183356391..000000000
--- a/eos/effects/effect4867.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# setBonusChristmasPowergrid
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "powerEngineeringOutputBonus",
-                                             implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect4868.py b/eos/effects/effect4868.py
deleted file mode 100644
index cb2a90ce1..000000000
--- a/eos/effects/effect4868.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# setBonusChristmasCapacitorCapacity
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "capacitorCapacityBonus",
-                                             implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect4869.py b/eos/effects/effect4869.py
deleted file mode 100644
index 2c7d06990..000000000
--- a/eos/effects/effect4869.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasCPUOutput
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "cpuOutputBonus2", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect4871.py b/eos/effects/effect4871.py
deleted file mode 100644
index 39e0d41b4..000000000
--- a/eos/effects/effect4871.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasCapacitorRecharge2
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "capRechargeBonus", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect4896.py b/eos/effects/effect4896.py
deleted file mode 100644
index a2e993f1b..000000000
--- a/eos/effects/effect4896.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneHitpointsGF2
-#
-# Used by:
-# Ship: Ishkur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4897.py b/eos/effects/effect4897.py
deleted file mode 100644
index 89cdf8e30..000000000
--- a/eos/effects/effect4897.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneArmorHitpointsGF2
-#
-# Used by:
-# Ship: Ishkur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect4898.py b/eos/effects/effect4898.py
deleted file mode 100644
index 4a4ca98ae..000000000
--- a/eos/effects/effect4898.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneShieldHitpointsGF2
-#
-# Used by:
-# Ship: Ishkur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect490.py b/eos/effects/effect490.py
deleted file mode 100644
index a6c38728b..000000000
--- a/eos/effects/effect490.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# engineeringPowerEngineeringOutputBonusPostPercentPowerOutputLocationShipGroupPowerCore
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Power Grid Management EG (6 of 6)
-# Modules named like: Ancillary Current Router (8 of 8)
-# Subsystems named like: Core Augmented Reactor (4 of 4)
-# Implant: Genolution Core Augmentation CA-1
-# Skill: Power Grid Management
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("powerOutput", container.getModifiedItemAttr("powerEngineeringOutputBonus") * level)
diff --git a/eos/effects/effect4901.py b/eos/effects/effect4901.py
deleted file mode 100644
index b99ef42a4..000000000
--- a/eos/effects/effect4901.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileSpeedBonusAF
-#
-# Used by:
-# Ship: Vengeance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect4902.py b/eos/effects/effect4902.py
deleted file mode 100644
index 2c5ce0bbc..000000000
--- a/eos/effects/effect4902.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# MWDSignatureRadiusRoleBonus
-#
-# Used by:
-# Ships from group: Assault Frigate (8 of 12)
-# Ships from group: Command Destroyer (4 of 4)
-# Ships from group: Heavy Assault Cruiser (8 of 11)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("MWDSignatureRadiusBonus"))
diff --git a/eos/effects/effect4906.py b/eos/effects/effect4906.py
deleted file mode 100644
index 2718a3789..000000000
--- a/eos/effects/effect4906.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageFighters
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Fighters"),
-                                    "damageMultiplier", beacon.getModifiedItemAttr("damageMultiplierMultiplier"),
-                                    stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4911.py b/eos/effects/effect4911.py
deleted file mode 100644
index f66994415..000000000
--- a/eos/effects/effect4911.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# modifyShieldRechargeRatePassive
-#
-# Used by:
-# Modules named like: Processor Overclocking Unit (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("shieldRechargeRate", module.getModifiedItemAttr("shieldRechargeRateMultiplier"))
diff --git a/eos/effects/effect4921.py b/eos/effects/effect4921.py
deleted file mode 100644
index c8797d7d0..000000000
--- a/eos/effects/effect4921.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# microJumpDrive
-#
-# Used by:
-# Modules from group: Micro Jump Drive (2 of 2)
-type = "active"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonusPercent"))
diff --git a/eos/effects/effect4923.py b/eos/effects/effect4923.py
deleted file mode 100644
index ec949212a..000000000
--- a/eos/effects/effect4923.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillMJDdurationBonus
-#
-# Used by:
-# Skill: Micro Jump Drive Operation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"),
-                                  "duration", skill.getModifiedItemAttr("durationBonus") * skill.level)
diff --git a/eos/effects/effect4928.py b/eos/effects/effect4928.py
deleted file mode 100644
index 25a4335a6..000000000
--- a/eos/effects/effect4928.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# adaptiveArmorHardener
-#
-# Used by:
-# Module: Reactive Armor Hardener
-from logbook import Logger
-import eos.config
-
-pyfalog = Logger(__name__)
-
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    damagePattern = fit.damagePattern
-    # pyfalog.debug("==============================")
-
-    static_adaptive_behavior = eos.config.settings['useStaticAdaptiveArmorHardener']
-
-    if (damagePattern.emAmount == damagePattern.thermalAmount == damagePattern.kineticAmount == damagePattern.explosiveAmount) and static_adaptive_behavior:
-        # pyfalog.debug("Setting adaptivearmorhardener resists to uniform profile.")
-        for attr in ("armorEmDamageResonance", "armorThermalDamageResonance", "armorKineticDamageResonance", "armorExplosiveDamageResonance"):
-            fit.ship.multiplyItemAttr(attr, module.getModifiedItemAttr(attr), stackingPenalties=True, penaltyGroup="preMul")
-        return
-
-    # Skip if there is no damage pattern. Example: projected ships or fleet boosters
-    if damagePattern:
-
-        # Populate a tuple with the damage profile modified by current armor resists.
-        baseDamageTaken = (
-            damagePattern.emAmount * fit.ship.getModifiedItemAttr('armorEmDamageResonance'),
-            damagePattern.thermalAmount * fit.ship.getModifiedItemAttr('armorThermalDamageResonance'),
-            damagePattern.kineticAmount * fit.ship.getModifiedItemAttr('armorKineticDamageResonance'),
-            damagePattern.explosiveAmount * fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'),
-        )
-        # pyfalog.debug("Damage Adjusted for Armor Resists: %f/%f/%f/%f" % (baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3]))
-
-        resistanceShiftAmount = module.getModifiedItemAttr(
-            'resistanceShiftAmount') / 100  # The attribute is in percent and we want a fraction
-        RAHResistance = [
-            module.getModifiedItemAttr('armorEmDamageResonance'),
-            module.getModifiedItemAttr('armorThermalDamageResonance'),
-            module.getModifiedItemAttr('armorKineticDamageResonance'),
-            module.getModifiedItemAttr('armorExplosiveDamageResonance'),
-        ]
-
-        # Simulate RAH cycles until the RAH either stops changing or enters a loop.
-        # The number of iterations is limited to prevent an infinite loop if something goes wrong.
-        cycleList = []
-        loopStart = -20
-        for num in range(50):
-            # pyfalog.debug("Starting cycle %d." % num)
-            # The strange order is to emulate the ingame sorting when different types have taken the same amount of damage.
-            # This doesn't take into account stacking penalties. In a few cases fitting a Damage Control causes an inaccurate result.
-            damagePattern_tuples = [
-                (0, baseDamageTaken[0] * RAHResistance[0], RAHResistance[0]),
-                (3, baseDamageTaken[3] * RAHResistance[3], RAHResistance[3]),
-                (2, baseDamageTaken[2] * RAHResistance[2], RAHResistance[2]),
-                (1, baseDamageTaken[1] * RAHResistance[1], RAHResistance[1]),
-            ]
-
-            # Sort the tuple to drop the highest damage value to the bottom
-            sortedDamagePattern_tuples = sorted(damagePattern_tuples, key=lambda damagePattern: damagePattern[1])
-
-            if sortedDamagePattern_tuples[2][1] == 0:
-                # One damage type: the top damage type takes from the other three
-                # Since the resistances not taking damage will end up going to the type taking damage we just do the whole thing at once.
-                change0 = 1 - sortedDamagePattern_tuples[0][2]
-                change1 = 1 - sortedDamagePattern_tuples[1][2]
-                change2 = 1 - sortedDamagePattern_tuples[2][2]
-                change3 = -(change0 + change1 + change2)
-            elif sortedDamagePattern_tuples[1][1] == 0:
-                # Two damage types: the top two damage types take from the other two
-                # Since the resistances not taking damage will end up going equally to the types taking damage we just do the whole thing at once.
-                change0 = 1 - sortedDamagePattern_tuples[0][2]
-                change1 = 1 - sortedDamagePattern_tuples[1][2]
-                change2 = -(change0 + change1) / 2
-                change3 = -(change0 + change1) / 2
-            else:
-                # Three or four damage types: the top two damage types take from the other two
-                change0 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[0][2])
-                change1 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[1][2])
-                change2 = -(change0 + change1) / 2
-                change3 = -(change0 + change1) / 2
-
-            RAHResistance[sortedDamagePattern_tuples[0][0]] = sortedDamagePattern_tuples[0][2] + change0
-            RAHResistance[sortedDamagePattern_tuples[1][0]] = sortedDamagePattern_tuples[1][2] + change1
-            RAHResistance[sortedDamagePattern_tuples[2][0]] = sortedDamagePattern_tuples[2][2] + change2
-            RAHResistance[sortedDamagePattern_tuples[3][0]] = sortedDamagePattern_tuples[3][2] + change3
-            # pyfalog.debug("Resistances shifted to %f/%f/%f/%f" % ( RAHResistance[0], RAHResistance[1], RAHResistance[2], RAHResistance[3]))
-
-            # See if the current RAH profile has been encountered before, indicating a loop.
-            for i, val in enumerate(cycleList):
-                tolerance = 1e-06
-                if abs(RAHResistance[0] - val[0]) <= tolerance and \
-                            abs(RAHResistance[1] - val[1]) <= tolerance and \
-                            abs(RAHResistance[2] - val[2]) <= tolerance and \
-                            abs(RAHResistance[3] - val[3]) <= tolerance:
-                    loopStart = i
-                    # pyfalog.debug("Loop found: %d-%d" % (loopStart, num))
-                    break
-            if loopStart >= 0:
-                break
-
-            cycleList.append(list(RAHResistance))
-
-        # if loopStart < 0:
-            # pyfalog.error("Reactive Armor Hardener failed to find equilibrium. Damage profile after armor: {0}/{1}/{2}/{3}".format(
-            #             baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3]))
-
-        # Average the profiles in the RAH loop, or the last 20 if it didn't find a loop.
-        loopCycles = cycleList[loopStart:]
-        numCycles = len(loopCycles)
-        average = [0, 0, 0, 0]
-        for cycle in loopCycles:
-            for i in range(4):
-                average[i] += cycle[i]
-
-        for i in range(4):
-            average[i] = round(average[i] / numCycles, 3)
-
-        # Set the new resistances
-        # pyfalog.debug("Setting new resist profile: %f/%f/%f/%f" % ( average[0], average[1], average[2],average[3]))
-        for i, attr in enumerate((
-                'armorEmDamageResonance', 'armorThermalDamageResonance', 'armorKineticDamageResonance',
-                'armorExplosiveDamageResonance')):
-            module.increaseItemAttr(attr, average[i] - module.getModifiedItemAttr(attr))
-            fit.ship.multiplyItemAttr(attr, average[i], stackingPenalties=True, penaltyGroup="preMul")
diff --git a/eos/effects/effect4934.py b/eos/effects/effect4934.py
deleted file mode 100644
index e4da7c41d..000000000
--- a/eos/effects/effect4934.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorRepairingGF2
-#
-# Used by:
-# Ship: Incursus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2"),
-                                  skill="Gallente Frigate")
diff --git a/eos/effects/effect4936.py b/eos/effects/effect4936.py
deleted file mode 100644
index 0cbbd439c..000000000
--- a/eos/effects/effect4936.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# fueledShieldBoosting
-#
-# Used by:
-# Modules from group: Ancillary Shield Booster (8 of 8)
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("shieldBonus")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("shieldRepair", amount / speed)
diff --git a/eos/effects/effect494.py b/eos/effects/effect494.py
deleted file mode 100644
index f47c47264..000000000
--- a/eos/effects/effect494.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# warpDriveOperationWarpCapacitorNeedBonusPostPercentWarpCapacitorNeedLocationShipGroupPropulsion
-#
-# Used by:
-# Modules named like: Warp Core Optimizer (8 of 8)
-# Skill: Warp Drive Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("warpCapacitorNeed", container.getModifiedItemAttr("warpCapacitorNeedBonus") * level,
-                           stackingPenalties="skill" not in context)
diff --git a/eos/effects/effect4941.py b/eos/effects/effect4941.py
deleted file mode 100644
index 3ea6ddc9f..000000000
--- a/eos/effects/effect4941.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDamageBonusCF2
-#
-# Used by:
-# Ship: Griffin Navy Issue
-# Ship: Merlin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect4942.py b/eos/effects/effect4942.py
deleted file mode 100644
index a9369bee5..000000000
--- a/eos/effects/effect4942.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# targetBreaker
-#
-# Used by:
-# Module: Target Spectrum Breaker
-type = "active"
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect4945.py b/eos/effects/effect4945.py
deleted file mode 100644
index 13cee98c8..000000000
--- a/eos/effects/effect4945.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillTargetBreakerDurationBonus2
-#
-# Used by:
-# Skill: Target Breaker Amplification
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Breaker",
-                                  "duration", skill.getModifiedItemAttr("durationBonus") * skill.level)
diff --git a/eos/effects/effect4946.py b/eos/effects/effect4946.py
deleted file mode 100644
index 1bd8dbdfe..000000000
--- a/eos/effects/effect4946.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillTargetBreakerCapNeedBonus2
-#
-# Used by:
-# Skill: Target Breaker Amplification
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Breaker",
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/effect4950.py b/eos/effects/effect4950.py
deleted file mode 100644
index be92006c9..000000000
--- a/eos/effects/effect4950.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldBoosterMB1a
-#
-# Used by:
-# Ship: Maelstrom
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect4951.py b/eos/effects/effect4951.py
deleted file mode 100644
index 30432474d..000000000
--- a/eos/effects/effect4951.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shieldBoostAmplifierPassiveBooster
-#
-# Used by:
-# Implants named like: Agency 'Hardshell' TB Dose (4 of 4)
-# Implants named like: Blue Pill Booster (5 of 5)
-# Implant: Antipharmakon Thureo
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
-        "shieldBonus", container.getModifiedItemAttr("shieldBoostMultiplier"))
diff --git a/eos/effects/effect4961.py b/eos/effects/effect4961.py
deleted file mode 100644
index 707e2dbbb..000000000
--- a/eos/effects/effect4961.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemShieldRepairAmountShieldSkills
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Operation") or
-                                                 mod.item.requiresSkill("Capital Shield Operation"),
-                                     "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect4967.py b/eos/effects/effect4967.py
deleted file mode 100644
index 4840594c1..000000000
--- a/eos/effects/effect4967.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shieldBoosterDurationBonusShieldSkills
-#
-# Used by:
-# Modules named like: Core Defense Operational Solidifier (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
-        "duration", module.getModifiedItemAttr("durationSkillBonus"))
diff --git a/eos/effects/effect4970.py b/eos/effects/effect4970.py
deleted file mode 100644
index 4c9726ea9..000000000
--- a/eos/effects/effect4970.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# boosterShieldBoostAmountPenaltyShieldSkills
-#
-# Used by:
-# Implants named like: Crash Booster (3 of 4)
-# Implants named like: Frentix Booster (3 of 4)
-# Implants named like: Mindflood Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Shield Boost"
-
-# Attribute that this effect targets
-attr = "boosterShieldBoostAmountPenalty"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), "shieldBonus",
-                                  src.getModifiedItemAttr("boosterShieldBoostAmountPenalty"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "shieldBonus",
-                                  src.getModifiedItemAttr("boosterShieldBoostAmountPenalty"))
diff --git a/eos/effects/effect4972.py b/eos/effects/effect4972.py
deleted file mode 100644
index 1f9169e7e..000000000
--- a/eos/effects/effect4972.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusAssaultShipLightMissileROF
-#
-# Used by:
-# Ship: Cambion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Light",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect4973.py b/eos/effects/effect4973.py
deleted file mode 100644
index 4d7622063..000000000
--- a/eos/effects/effect4973.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusAssaultShipRocketROF
-#
-# Used by:
-# Ship: Cambion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rocket",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect4974.py b/eos/effects/effect4974.py
deleted file mode 100644
index 4856571cf..000000000
--- a/eos/effects/effect4974.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusMarauderShieldBonus2a
-#
-# Used by:
-# Ship: Golem
-# Ship: Vargur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("eliteBonusViolators2"), skill="Marauders")
diff --git a/eos/effects/effect4975.py b/eos/effects/effect4975.py
deleted file mode 100644
index c07b02c44..000000000
--- a/eos/effects/effect4975.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileKineticlATF2
-#
-# Used by:
-# Ship: Cambion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusATF2"))
diff --git a/eos/effects/effect4976.py b/eos/effects/effect4976.py
deleted file mode 100644
index 00ced0d4f..000000000
--- a/eos/effects/effect4976.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# skillReactiveArmorHardenerDurationBonus
-#
-# Used by:
-# Skill: Resistance Phasing
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "duration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "duration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect4989.py b/eos/effects/effect4989.py
deleted file mode 100644
index 9593201fc..000000000
--- a/eos/effects/effect4989.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# missileSkillAoeCloudSizeBonusAllIncludingCapitals
-#
-# Used by:
-# Implants named like: Crash Booster (4 of 4)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", implant.getModifiedItemAttr("aoeCloudSizeBonus"))
diff --git a/eos/effects/effect4990.py b/eos/effects/effect4990.py
deleted file mode 100644
index 4372da104..000000000
--- a/eos/effects/effect4990.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyTCapNeedBonusRookie
-#
-# Used by:
-# Ship: Hematos
-# Ship: Impairor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("rookieSETCapBonus"))
diff --git a/eos/effects/effect4991.py b/eos/effects/effect4991.py
deleted file mode 100644
index d32fd04e7..000000000
--- a/eos/effects/effect4991.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSETDmgBonusRookie
-#
-# Used by:
-# Ship: Hematos
-# Ship: Immolator
-# Ship: Impairor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("rookieSETDamageBonus"))
diff --git a/eos/effects/effect4994.py b/eos/effects/effect4994.py
deleted file mode 100644
index 41cb429c6..000000000
--- a/eos/effects/effect4994.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipArmorEMResistanceRookie
-#
-# Used by:
-# Ship: Devoter
-# Ship: Gold Magnate
-# Ship: Impairor
-# Ship: Phobos
-# Ship: Silver Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/effect4995.py b/eos/effects/effect4995.py
deleted file mode 100644
index a3ffd9333..000000000
--- a/eos/effects/effect4995.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipArmorEXResistanceRookie
-#
-# Used by:
-# Ship: Devoter
-# Ship: Gold Magnate
-# Ship: Impairor
-# Ship: Phobos
-# Ship: Silver Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/effect4996.py b/eos/effects/effect4996.py
deleted file mode 100644
index 9932056eb..000000000
--- a/eos/effects/effect4996.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipArmorKNResistanceRookie
-#
-# Used by:
-# Ship: Devoter
-# Ship: Gold Magnate
-# Ship: Impairor
-# Ship: Phobos
-# Ship: Silver Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/effect4997.py b/eos/effects/effect4997.py
deleted file mode 100644
index 3c4a8f289..000000000
--- a/eos/effects/effect4997.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipArmorTHResistanceRookie
-#
-# Used by:
-# Ship: Devoter
-# Ship: Gold Magnate
-# Ship: Impairor
-# Ship: Phobos
-# Ship: Silver Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("rookieArmorResistanceBonus"))
diff --git a/eos/effects/effect4999.py b/eos/effects/effect4999.py
deleted file mode 100644
index 417e8cc67..000000000
--- a/eos/effects/effect4999.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridRangeBonusRookie
-#
-# Used by:
-# Ship: Ibis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("rookieSHTOptimalBonus"))
diff --git a/eos/effects/effect50.py b/eos/effects/effect50.py
deleted file mode 100644
index bebf517a7..000000000
--- a/eos/effects/effect50.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modifyShieldRechargeRate
-#
-# Used by:
-# Modules from group: Capacitor Power Relay (20 of 20)
-# Modules from group: Power Diagnostic System (23 of 23)
-# Modules from group: Reactor Control Unit (22 of 22)
-# Modules from group: Shield Recharger (4 of 4)
-# Modules named like: Flux Coil (12 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("shieldRechargeRate", module.getModifiedItemAttr("shieldRechargeRateMultiplier") or 1)
diff --git a/eos/effects/effect5000.py b/eos/effects/effect5000.py
deleted file mode 100644
index 4ab352344..000000000
--- a/eos/effects/effect5000.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileKineticDamageRookie
-#
-# Used by:
-# Ship: Ibis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("rookieMissileKinDamageBonus"))
diff --git a/eos/effects/effect5008.py b/eos/effects/effect5008.py
deleted file mode 100644
index 7005269f0..000000000
--- a/eos/effects/effect5008.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldEMResistanceRookie
-#
-# Used by:
-# Ships from group: Heavy Interdiction Cruiser (3 of 5)
-# Ship: Ibis
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/effect5009.py b/eos/effects/effect5009.py
deleted file mode 100644
index fc80e979d..000000000
--- a/eos/effects/effect5009.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldExplosiveResistanceRookie
-#
-# Used by:
-# Ships from group: Heavy Interdiction Cruiser (3 of 5)
-# Ship: Ibis
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/effect5011.py b/eos/effects/effect5011.py
deleted file mode 100644
index 1d9a00d39..000000000
--- a/eos/effects/effect5011.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldKineticResistanceRookie
-#
-# Used by:
-# Ships from group: Heavy Interdiction Cruiser (3 of 5)
-# Ship: Ibis
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/effect5012.py b/eos/effects/effect5012.py
deleted file mode 100644
index 6b270aa7d..000000000
--- a/eos/effects/effect5012.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldThermalResistanceRookie
-#
-# Used by:
-# Ships from group: Heavy Interdiction Cruiser (3 of 5)
-# Ship: Ibis
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("rookieShieldResistBonus"))
diff --git a/eos/effects/effect5013.py b/eos/effects/effect5013.py
deleted file mode 100644
index 5603af34a..000000000
--- a/eos/effects/effect5013.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSHTDmgBonusRookie
-#
-# Used by:
-# Ship: Velator
-# Ship: Violator
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("rookieSHTDamageBonus"))
diff --git a/eos/effects/effect5014.py b/eos/effects/effect5014.py
deleted file mode 100644
index 23c9a4b5b..000000000
--- a/eos/effects/effect5014.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusDroneDamageMultiplierRookie
-#
-# Used by:
-# Ship: Gnosis
-# Ship: Praxis
-# Ship: Sunesis
-# Ship: Taipan
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("rookieDroneBonus"))
diff --git a/eos/effects/effect5015.py b/eos/effects/effect5015.py
deleted file mode 100644
index 82fb26288..000000000
--- a/eos/effects/effect5015.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEwRemoteSensorDampenerMaxTargetRangeBonusRookie
-#
-# Used by:
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxTargetRangeBonus", ship.getModifiedItemAttr("rookieDampStrengthBonus"))
diff --git a/eos/effects/effect5016.py b/eos/effects/effect5016.py
deleted file mode 100644
index 6cc41c30d..000000000
--- a/eos/effects/effect5016.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEwRemoteSensorDampenerScanResolutionBonusRookie
-#
-# Used by:
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "scanResolutionBonus", ship.getModifiedItemAttr("rookieDampStrengthBonus"))
diff --git a/eos/effects/effect5017.py b/eos/effects/effect5017.py
deleted file mode 100644
index 91a18b03d..000000000
--- a/eos/effects/effect5017.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorRepairingRookie
-#
-# Used by:
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("rookieArmorRepBonus"))
diff --git a/eos/effects/effect5018.py b/eos/effects/effect5018.py
deleted file mode 100644
index b0634e3f3..000000000
--- a/eos/effects/effect5018.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipVelocityBonusRookie
-#
-# Used by:
-# Ship: Reaper
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("rookieShipVelocityBonus"))
diff --git a/eos/effects/effect5019.py b/eos/effects/effect5019.py
deleted file mode 100644
index 92b3330dc..000000000
--- a/eos/effects/effect5019.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# minmatarShipEwTargetPainterRookie
-#
-# Used by:
-# Ship: Reaper
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("rookieTargetPainterStrengthBonus"))
diff --git a/eos/effects/effect5020.py b/eos/effects/effect5020.py
deleted file mode 100644
index 3646da72c..000000000
--- a/eos/effects/effect5020.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSPTDmgBonusRookie
-#
-# Used by:
-# Ship: Echo
-# Ship: Reaper
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("rookieSPTDamageBonus"))
diff --git a/eos/effects/effect5021.py b/eos/effects/effect5021.py
deleted file mode 100644
index 55cf58a78..000000000
--- a/eos/effects/effect5021.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldBoostRookie
-#
-# Used by:
-# Ship: Immolator
-# Ship: Reaper
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("rookieShieldBoostBonus"))
diff --git a/eos/effects/effect5028.py b/eos/effects/effect5028.py
deleted file mode 100644
index 312932605..000000000
--- a/eos/effects/effect5028.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipECMScanStrengthBonusRookie
-#
-# Used by:
-# Ship: Ibis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("Gravimetric", "Ladar", "Radar", "Magnetometric"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                      "scan{0}StrengthBonus".format(type),
-                                      ship.getModifiedItemAttr("rookieECMStrengthBonus"))
diff --git a/eos/effects/effect5029.py b/eos/effects/effect5029.py
deleted file mode 100644
index 789754258..000000000
--- a/eos/effects/effect5029.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusDroneMiningAmountRole
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount",
-                                 src.getModifiedItemAttr("roleBonusDroneMiningYield"),
-                                 )
diff --git a/eos/effects/effect5030.py b/eos/effects/effect5030.py
deleted file mode 100644
index 5e0be29e2..000000000
--- a/eos/effects/effect5030.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusMiningDroneAmountPercentRookie
-#
-# Used by:
-# Ship: Gnosis
-# Ship: Praxis
-# Ship: Taipan
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount", container.getModifiedItemAttr("rookieDroneBonus"))
diff --git a/eos/effects/effect5035.py b/eos/effects/effect5035.py
deleted file mode 100644
index 3862e2144..000000000
--- a/eos/effects/effect5035.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusDroneHitpointsRookie
-#
-# Used by:
-# Variations of ship: Procurer (2 of 2)
-# Ship: Gnosis
-# Ship: Praxis
-# Ship: Sunesis
-# Ship: Taipan
-# Ship: Velator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for type in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     type, ship.getModifiedItemAttr("rookieDroneBonus"))
diff --git a/eos/effects/effect5036.py b/eos/effects/effect5036.py
deleted file mode 100644
index c5cdf079c..000000000
--- a/eos/effects/effect5036.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSalvageCycleAF
-#
-# Used by:
-# Ship: Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect504.py b/eos/effects/effect504.py
deleted file mode 100644
index ba150045c..000000000
--- a/eos/effects/effect504.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# scoutDroneOperationDroneRangeBonusModAddDroneControlDistanceChar
-#
-# Used by:
-# Modules named like: Drone Control Range Augmentor (8 of 8)
-# Skills named like: Drone Avionics (2 of 2)
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    amount = container.getModifiedItemAttr("droneRangeBonus") * level
-    fit.extraAttributes.increase("droneControlRange", amount)
diff --git a/eos/effects/effect5045.py b/eos/effects/effect5045.py
deleted file mode 100644
index 88802e78e..000000000
--- a/eos/effects/effect5045.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSalvageCycleCF
-#
-# Used by:
-# Ship: Heron
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5048.py b/eos/effects/effect5048.py
deleted file mode 100644
index 60dd7e948..000000000
--- a/eos/effects/effect5048.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSalvageCycleGF
-#
-# Used by:
-# Ship: Imicus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusGF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5051.py b/eos/effects/effect5051.py
deleted file mode 100644
index 738c4e6eb..000000000
--- a/eos/effects/effect5051.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSalvageCycleMF
-#
-# Used by:
-# Ship: Probe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5055.py b/eos/effects/effect5055.py
deleted file mode 100644
index 2b2cc75c8..000000000
--- a/eos/effects/effect5055.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# iceHarvesterDurationMultiplier
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                     "duration", ship.getModifiedItemAttr("iceHarvestCycleBonus"))
diff --git a/eos/effects/effect5058.py b/eos/effects/effect5058.py
deleted file mode 100644
index 13b45eb39..000000000
--- a/eos/effects/effect5058.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# miningYieldMultiplyPassive
-#
-# Used by:
-# Variations of ship: Venture (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Mining"),
-                                     "miningAmount", module.getModifiedItemAttr("miningAmountMultiplier"))
diff --git a/eos/effects/effect5059.py b/eos/effects/effect5059.py
deleted file mode 100644
index 2e099cc24..000000000
--- a/eos/effects/effect5059.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusIceHarvesterDurationORE3
-#
-# Used by:
-# Ships from group: Exhumer (3 of 3)
-# Ships from group: Mining Barge (3 of 3)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", container.getModifiedItemAttr("shipBonusORE3"), skill="Mining Barge")
diff --git a/eos/effects/effect506.py b/eos/effects/effect506.py
deleted file mode 100644
index bdc5f5269..000000000
--- a/eos/effects/effect506.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# fuelConservationCapNeedBonusPostPercentCapacitorNeedLocationShipModulesRequiringAfterburner
-#
-# Used by:
-# Skill: Afterburner
-# Skill: Fuel Conservation
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)
diff --git a/eos/effects/effect5066.py b/eos/effects/effect5066.py
deleted file mode 100644
index da9b2c09f..000000000
--- a/eos/effects/effect5066.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusTargetPainterOptimalMF1
-#
-# Used by:
-# Ship: Hyena
-# Ship: Vigil
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5067.py b/eos/effects/effect5067.py
deleted file mode 100644
index fccf39e52..000000000
--- a/eos/effects/effect5067.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusOreHoldORE2
-#
-# Used by:
-# Variations of ship: Retriever (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusORE2"), skill="Mining Barge")
diff --git a/eos/effects/effect5068.py b/eos/effects/effect5068.py
deleted file mode 100644
index 901026323..000000000
--- a/eos/effects/effect5068.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusShieldCapacityORE2
-#
-# Used by:
-# Variations of ship: Procurer (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("shipBonusORE2"), skill="Mining Barge")
diff --git a/eos/effects/effect5069.py b/eos/effects/effect5069.py
deleted file mode 100644
index 97a255397..000000000
--- a/eos/effects/effect5069.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# mercoxitCrystalBonus
-#
-# Used by:
-# Module: Medium Mercoxit Mining Crystal Optimization I
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Mercoxit Processing"),
-                                    "specialisationAsteroidYieldMultiplier",
-                                    module.getModifiedItemAttr("miningAmountBonus"))
diff --git a/eos/effects/effect507.py b/eos/effects/effect507.py
deleted file mode 100644
index ac11238db..000000000
--- a/eos/effects/effect507.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# longRangeTargetingMaxTargetRangeBonusPostPercentMaxTargetRangeLocationShipGroupElectronic
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Long Range Targeting LT (6 of 6)
-# Skill: Long Range Targeting
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.ship.boostItemAttr("maxTargetRange", container.getModifiedItemAttr("maxTargetRangeBonus") * level)
diff --git a/eos/effects/effect5079.py b/eos/effects/effect5079.py
deleted file mode 100644
index c5a047761..000000000
--- a/eos/effects/effect5079.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileKineticDamageCF2
-#
-# Used by:
-# Ship: Garmur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect508.py b/eos/effects/effect508.py
deleted file mode 100644
index c7ad6a186..000000000
--- a/eos/effects/effect508.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipPDmgBonusMF
-#
-# Used by:
-# Ship: Cheetah
-# Ship: Freki
-# Ship: Republic Fleet Firetail
-# Ship: Rifter
-# Ship: Slasher
-# Ship: Stiletto
-# Ship: Wolf
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5080.py b/eos/effects/effect5080.py
deleted file mode 100644
index 1e884505d..000000000
--- a/eos/effects/effect5080.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipMissileVelocityCF
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-# Ship: Crow
-# Ship: Kestrel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5081.py b/eos/effects/effect5081.py
deleted file mode 100644
index 6a0c0e916..000000000
--- a/eos/effects/effect5081.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# maxTargetingRangeBonusPostPercentPassive
-#
-# Used by:
-# Modules named like: Ionic Field Projector (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect5087.py b/eos/effects/effect5087.py
deleted file mode 100644
index 62058ca89..000000000
--- a/eos/effects/effect5087.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusDroneHitpointsGF
-#
-# Used by:
-# Ship: Astero
-# Ship: Maulus Navy Issue
-# Ship: Tristan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for layer in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     layer, ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5090.py b/eos/effects/effect5090.py
deleted file mode 100644
index ced5d2799..000000000
--- a/eos/effects/effect5090.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldBoostMF
-#
-# Used by:
-# Ship: Breacher
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect51.py b/eos/effects/effect51.py
deleted file mode 100644
index 95814ce8c..000000000
--- a/eos/effects/effect51.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# modifyPowerRechargeRate
-#
-# Used by:
-# Modules from group: Capacitor Flux Coil (6 of 6)
-# Modules from group: Capacitor Power Relay (20 of 20)
-# Modules from group: Capacitor Recharger (18 of 18)
-# Modules from group: Power Diagnostic System (23 of 23)
-# Modules from group: Reactor Control Unit (22 of 22)
-# Modules from group: Shield Power Relay (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("rechargeRate", module.getModifiedItemAttr("capacitorRechargeRateMultiplier"))
diff --git a/eos/effects/effect5103.py b/eos/effects/effect5103.py
deleted file mode 100644
index 61732a557..000000000
--- a/eos/effects/effect5103.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferCapNeedCF
-#
-# Used by:
-# Variations of ship: Bantam (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5104.py b/eos/effects/effect5104.py
deleted file mode 100644
index 164975e92..000000000
--- a/eos/effects/effect5104.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferBoostAmountCF2
-#
-# Used by:
-# Variations of ship: Bantam (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5105.py b/eos/effects/effect5105.py
deleted file mode 100644
index 3f164c524..000000000
--- a/eos/effects/effect5105.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferCapNeedMF
-#
-# Used by:
-# Variations of ship: Burst (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5106.py b/eos/effects/effect5106.py
deleted file mode 100644
index a1c552524..000000000
--- a/eos/effects/effect5106.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferBoostAmountMF2
-#
-# Used by:
-# Variations of ship: Burst (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5107.py b/eos/effects/effect5107.py
deleted file mode 100644
index b4bc7bbff..000000000
--- a/eos/effects/effect5107.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRemoteArmorRepairCapNeedGF
-#
-# Used by:
-# Variations of ship: Navitas (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5108.py b/eos/effects/effect5108.py
deleted file mode 100644
index d1cba9063..000000000
--- a/eos/effects/effect5108.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteArmorRepairAmountGF2
-#
-# Used by:
-# Variations of ship: Navitas (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusGF2"),
-                                  skill="Gallente Frigate")
diff --git a/eos/effects/effect5109.py b/eos/effects/effect5109.py
deleted file mode 100644
index 41c5b3e47..000000000
--- a/eos/effects/effect5109.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteArmorRepairCapNeedAF
-#
-# Used by:
-# Ship: Deacon
-# Ship: Inquisitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect511.py b/eos/effects/effect511.py
deleted file mode 100644
index ecac0f30c..000000000
--- a/eos/effects/effect511.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipEnergyTCapNeedBonusAF
-#
-# Used by:
-# Ship: Crusader
-# Ship: Executioner
-# Ship: Gold Magnate
-# Ship: Punisher
-# Ship: Retribution
-# Ship: Silver Magnate
-# Ship: Tormentor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5110.py b/eos/effects/effect5110.py
deleted file mode 100644
index 68da161e5..000000000
--- a/eos/effects/effect5110.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteArmorRepairAmount2AF
-#
-# Used by:
-# Ship: Deacon
-# Ship: Inquisitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5111.py b/eos/effects/effect5111.py
deleted file mode 100644
index b98c308e0..000000000
--- a/eos/effects/effect5111.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneTrackingGF
-#
-# Used by:
-# Ship: Maulus Navy Issue
-# Ship: Tristan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5119.py b/eos/effects/effect5119.py
deleted file mode 100644
index e3df5259c..000000000
--- a/eos/effects/effect5119.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusScanProbeStrength2AF
-#
-# Used by:
-# Ship: Magnate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonus2AF"),
-                                    skill="Amarr Frigate")
diff --git a/eos/effects/effect512.py b/eos/effects/effect512.py
deleted file mode 100644
index d99426da0..000000000
--- a/eos/effects/effect512.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipSHTDmgBonusGF
-#
-# Used by:
-# Variations of ship: Incursus (3 of 3)
-# Ship: Atron
-# Ship: Federation Navy Comet
-# Ship: Helios
-# Ship: Pacifier
-# Ship: Taranis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5121.py b/eos/effects/effect5121.py
deleted file mode 100644
index b863b95ec..000000000
--- a/eos/effects/effect5121.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyTransferArrayTransferAmountBonus
-#
-# Used by:
-# Ship: Augoror
-# Ship: Osprey
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("energyTransferAmountBonus"))
diff --git a/eos/effects/effect5122.py b/eos/effects/effect5122.py
deleted file mode 100644
index 89d41277d..000000000
--- a/eos/effects/effect5122.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferCapneedMC1
-#
-# Used by:
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect5123.py b/eos/effects/effect5123.py
deleted file mode 100644
index d8d32bf66..000000000
--- a/eos/effects/effect5123.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRemoteArmorRepairCapNeedAC1
-#
-# Used by:
-# Ship: Augoror
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5124.py b/eos/effects/effect5124.py
deleted file mode 100644
index b671bc196..000000000
--- a/eos/effects/effect5124.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRemoteArmorRepairAmountAC2
-#
-# Used by:
-# Ship: Augoror
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5125.py b/eos/effects/effect5125.py
deleted file mode 100644
index ec701a318..000000000
--- a/eos/effects/effect5125.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRemoteArmorRepairAmountGC2
-#
-# Used by:
-# Ship: Exequror
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusGC2"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect5126.py b/eos/effects/effect5126.py
deleted file mode 100644
index 734821576..000000000
--- a/eos/effects/effect5126.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferBoostAmountCC2
-#
-# Used by:
-# Ship: Osprey
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5127.py b/eos/effects/effect5127.py
deleted file mode 100644
index 901826281..000000000
--- a/eos/effects/effect5127.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldTransferBoostAmountMC2
-#
-# Used by:
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect5128.py b/eos/effects/effect5128.py
deleted file mode 100644
index 2c87e50e9..000000000
--- a/eos/effects/effect5128.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEwRemoteSensorDampenerOptimalBonusGC1
-#
-# Used by:
-# Ship: Celestis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5129.py b/eos/effects/effect5129.py
deleted file mode 100644
index e1f9fcb2d..000000000
--- a/eos/effects/effect5129.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# minmatarShipEwTargetPainterMC1
-#
-# Used by:
-# Ship: Bellicose
-# Ship: Rapier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC"),
-                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/effect5131.py b/eos/effects/effect5131.py
deleted file mode 100644
index bda638ace..000000000
--- a/eos/effects/effect5131.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipMissileRofCC
-#
-# Used by:
-# Ships named like: Caracal (2 of 2)
-# Ship: Enforcer
-type = "passive"
-
-
-def handler(fit, ship, context):
-    groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "speed", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5132.py b/eos/effects/effect5132.py
deleted file mode 100644
index 85f4a70f8..000000000
--- a/eos/effects/effect5132.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipPTurretFalloffBonusMC2
-#
-# Used by:
-# Ship: Enforcer
-# Ship: Stabber
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect5133.py b/eos/effects/effect5133.py
deleted file mode 100644
index 1cc54e2c7..000000000
--- a/eos/effects/effect5133.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHTDamageBonusCC
-#
-# Used by:
-# Ship: Moa
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5136.py b/eos/effects/effect5136.py
deleted file mode 100644
index 8cdb47763..000000000
--- a/eos/effects/effect5136.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipMETCDamageBonusAC
-#
-# Used by:
-# Ship: Augoror Navy Issue
-# Ship: Enforcer
-# Ship: Maller
-# Ship: Omen Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5139.py b/eos/effects/effect5139.py
deleted file mode 100644
index ca0981dc7..000000000
--- a/eos/effects/effect5139.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMiningBonusOREfrig1
-#
-# Used by:
-# Variations of ship: Venture (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", module.getModifiedItemAttr("shipBonusOREfrig1"),
-                                  skill="Mining Frigate")
diff --git a/eos/effects/effect514.py b/eos/effects/effect514.py
deleted file mode 100644
index 5ecc4f4a2..000000000
--- a/eos/effects/effect514.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipSETDmgBonusAF
-#
-# Used by:
-# Ship: Executioner
-# Ship: Gold Magnate
-# Ship: Silver Magnate
-# Ship: Tormentor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5142.py b/eos/effects/effect5142.py
deleted file mode 100644
index c62e662e5..000000000
--- a/eos/effects/effect5142.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# GCHYieldMultiplyPassive
-#
-# Used by:
-# Ship: Prospect
-# Ship: Venture
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
-                                     "miningAmount", module.getModifiedItemAttr("miningAmountMultiplier"))
diff --git a/eos/effects/effect5153.py b/eos/effects/effect5153.py
deleted file mode 100644
index cc6e55c5d..000000000
--- a/eos/effects/effect5153.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileVelocityPirateFactionRocket
-#
-# Used by:
-# Ship: Corax
-# Ship: Talwar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5156.py b/eos/effects/effect5156.py
deleted file mode 100644
index 23749fa44..000000000
--- a/eos/effects/effect5156.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipGCHYieldBonusOREfrig2
-#
-# Used by:
-# Ship: Prospect
-# Ship: Venture
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gas Cloud Harvester",
-                                  "duration", module.getModifiedItemAttr("shipBonusOREfrig2"), skill="Mining Frigate")
diff --git a/eos/effects/effect516.py b/eos/effects/effect516.py
deleted file mode 100644
index 00e4ac757..000000000
--- a/eos/effects/effect516.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipTCapNeedBonusAC
-#
-# Used by:
-# Ship: Devoter
-# Ship: Omen
-# Ship: Zealot
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5162.py b/eos/effects/effect5162.py
deleted file mode 100644
index a8baab0f4..000000000
--- a/eos/effects/effect5162.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# skillReactiveArmorHardenerCapNeedBonus
-#
-# Used by:
-# Skill: Resistance Phasing
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "capacitorNeed",
-                                  src.getModifiedItemAttr("capNeedBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "capacitorNeed",
-                                  src.getModifiedItemAttr("capNeedBonus") * lvl)
diff --git a/eos/effects/effect5165.py b/eos/effects/effect5165.py
deleted file mode 100644
index a9960c71a..000000000
--- a/eos/effects/effect5165.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneMWDboostrole
-#
-# Used by:
-# Ship: Algos
-# Ship: Dragoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5168.py b/eos/effects/effect5168.py
deleted file mode 100644
index 1e9deef53..000000000
--- a/eos/effects/effect5168.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# droneSalvageBonus
-#
-# Used by:
-# Skill: Salvage Drone Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.drones.filteredItemIncrease(lambda drone: drone.item.requiresSkill("Salvage Drone Operation"),
-                                    "accessDifficultyBonus",
-                                    container.getModifiedItemAttr("accessDifficultyBonus") * container.level)
diff --git a/eos/effects/effect5180.py b/eos/effects/effect5180.py
deleted file mode 100644
index 244f84e2a..000000000
--- a/eos/effects/effect5180.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# sensorCompensationSensorStrengthBonusGravimetric
-#
-# Used by:
-# Skill: Gravimetric Sensor Compensation
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.ship.boostItemAttr("scanGravimetricStrength",
-                           container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/effect5181.py b/eos/effects/effect5181.py
deleted file mode 100644
index b046ce046..000000000
--- a/eos/effects/effect5181.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# sensorCompensationSensorStrengthBonusLadar
-#
-# Used by:
-# Skill: Ladar Sensor Compensation
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.ship.boostItemAttr("scanLadarStrength", container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/effect5182.py b/eos/effects/effect5182.py
deleted file mode 100644
index 6306a2df6..000000000
--- a/eos/effects/effect5182.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# sensorCompensationSensorStrengthBonusMagnetometric
-#
-# Used by:
-# Skill: Magnetometric Sensor Compensation
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.ship.boostItemAttr("scanMagnetometricStrength",
-                           container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/effect5183.py b/eos/effects/effect5183.py
deleted file mode 100644
index 2df326dca..000000000
--- a/eos/effects/effect5183.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# sensorCompensationSensorStrengthBonusRadar
-#
-# Used by:
-# Skill: Radar Sensor Compensation
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.ship.boostItemAttr("scanRadarStrength", container.getModifiedItemAttr("sensorStrengthBonus") * container.level)
diff --git a/eos/effects/effect5185.py b/eos/effects/effect5185.py
deleted file mode 100644
index e48b89b06..000000000
--- a/eos/effects/effect5185.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipEnergyVampireAmountBonusFixedAF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("shipBonus2AF"),
-                                  skill="Amarr Frigate")
diff --git a/eos/effects/effect5187.py b/eos/effects/effect5187.py
deleted file mode 100644
index 0152e33bd..000000000
--- a/eos/effects/effect5187.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEwRemoteSensorDampenerFalloffBonusGC1
-#
-# Used by:
-# Ship: Celestis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusGC"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect5188.py b/eos/effects/effect5188.py
deleted file mode 100644
index 147d91b3c..000000000
--- a/eos/effects/effect5188.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# trackingSpeedBonusEffectHybrids
-#
-# Used by:
-# Modules named like: Hybrid Metastasis Adjuster (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect5189.py b/eos/effects/effect5189.py
deleted file mode 100644
index da849e037..000000000
--- a/eos/effects/effect5189.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# trackingSpeedBonusEffectLasers
-#
-# Used by:
-# Modules named like: Energy Metastasis Adjuster (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect5190.py b/eos/effects/effect5190.py
deleted file mode 100644
index ed2c4d323..000000000
--- a/eos/effects/effect5190.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# trackingSpeedBonusEffectProjectiles
-#
-# Used by:
-# Modules named like: Projectile Metastasis Adjuster (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect5201.py b/eos/effects/effect5201.py
deleted file mode 100644
index f7bfd67ee..000000000
--- a/eos/effects/effect5201.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# armorUpgradesMassPenaltyReductionBonus
-#
-# Used by:
-# Skill: Armor Layering
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Reinforcer",
-                                  "massAddition", container.getModifiedItemAttr("massPenaltyReduction") * level)
diff --git a/eos/effects/effect5205.py b/eos/effects/effect5205.py
deleted file mode 100644
index c901d1374..000000000
--- a/eos/effects/effect5205.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSETTrackingBonusRookie
-#
-# Used by:
-# Ship: Immolator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("rookieSETTracking"))
diff --git a/eos/effects/effect5206.py b/eos/effects/effect5206.py
deleted file mode 100644
index 771ffbc65..000000000
--- a/eos/effects/effect5206.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSETOptimalBonusRookie
-#
-# Used by:
-# Ship: Immolator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("rookieSETOptimal"))
diff --git a/eos/effects/effect5207.py b/eos/effects/effect5207.py
deleted file mode 100644
index fbbe40fc0..000000000
--- a/eos/effects/effect5207.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipNOSTransferAmountBonusRookie
-#
-# Used by:
-# Ship: Hematos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", ship.getModifiedItemAttr("rookieNosDrain"))
diff --git a/eos/effects/effect5208.py b/eos/effects/effect5208.py
deleted file mode 100644
index 3a98a9e7c..000000000
--- a/eos/effects/effect5208.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipNeutDestabilizationAmountBonusRookie
-#
-# Used by:
-# Ship: Hematos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("rookieNeutDrain"))
diff --git a/eos/effects/effect5209.py b/eos/effects/effect5209.py
deleted file mode 100644
index d8f5468c8..000000000
--- a/eos/effects/effect5209.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipWebVelocityBonusRookie
-#
-# Used by:
-# Ship: Hematos
-# Ship: Violator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "speedFactor", ship.getModifiedItemAttr("rookieWebAmount"))
diff --git a/eos/effects/effect521.py b/eos/effects/effect521.py
deleted file mode 100644
index 644ee7a88..000000000
--- a/eos/effects/effect521.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHRangeBonusCC
-#
-# Used by:
-# Ship: Eagle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5212.py b/eos/effects/effect5212.py
deleted file mode 100644
index 0bb5910d9..000000000
--- a/eos/effects/effect5212.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipDroneMWDSpeedBonusRookie
-#
-# Used by:
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda mod: True,
-                                 "maxVelocity", ship.getModifiedItemAttr("rookieDroneMWDspeed"))
diff --git a/eos/effects/effect5213.py b/eos/effects/effect5213.py
deleted file mode 100644
index 998eb54e8..000000000
--- a/eos/effects/effect5213.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRocketMaxVelocityBonusRookie
-#
-# Used by:
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "maxVelocity", ship.getModifiedItemAttr("rookieRocketVelocity"))
diff --git a/eos/effects/effect5214.py b/eos/effects/effect5214.py
deleted file mode 100644
index 9d3630a61..000000000
--- a/eos/effects/effect5214.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipLightMissileMaxVelocityBonusRookie
-#
-# Used by:
-# Ship: Taipan
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("rookieLightMissileVelocity"))
diff --git a/eos/effects/effect5215.py b/eos/effects/effect5215.py
deleted file mode 100644
index 48b2da45f..000000000
--- a/eos/effects/effect5215.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSHTTrackingSpeedBonusRookie
-#
-# Used by:
-# Ship: Violator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("rookieSHTTracking"))
diff --git a/eos/effects/effect5216.py b/eos/effects/effect5216.py
deleted file mode 100644
index b4083f4d3..000000000
--- a/eos/effects/effect5216.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSHTFalloffBonusRookie
-#
-# Used by:
-# Ship: Violator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("rookieSHTFalloff"))
diff --git a/eos/effects/effect5217.py b/eos/effects/effect5217.py
deleted file mode 100644
index c6a0bca15..000000000
--- a/eos/effects/effect5217.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSPTTrackingSpeedBonusRookie
-#
-# Used by:
-# Ship: Echo
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("rookieSPTTracking"))
diff --git a/eos/effects/effect5218.py b/eos/effects/effect5218.py
deleted file mode 100644
index 0509c7dde..000000000
--- a/eos/effects/effect5218.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSPTFalloffBonusRookie
-#
-# Used by:
-# Ship: Echo
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("rookieSPTFalloff"))
diff --git a/eos/effects/effect5219.py b/eos/effects/effect5219.py
deleted file mode 100644
index a7c289fea..000000000
--- a/eos/effects/effect5219.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSPTOptimalRangeBonusRookie
-#
-# Used by:
-# Ship: Echo
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("rookieSPTOptimal"))
diff --git a/eos/effects/effect5220.py b/eos/effects/effect5220.py
deleted file mode 100644
index f8c60bd63..000000000
--- a/eos/effects/effect5220.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5221.py b/eos/effects/effect5221.py
deleted file mode 100644
index 4aff9d4a1..000000000
--- a/eos/effects/effect5221.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyAssaultMissileEMDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5222.py b/eos/effects/effect5222.py
deleted file mode 100644
index bbc9b2a43..000000000
--- a/eos/effects/effect5222.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyAssaultMissileKinDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5223.py b/eos/effects/effect5223.py
deleted file mode 100644
index 928d0a52c..000000000
--- a/eos/effects/effect5223.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyAssaultMissileThermDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5224.py b/eos/effects/effect5224.py
deleted file mode 100644
index be21d8f51..000000000
--- a/eos/effects/effect5224.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyAssaultMissileExpDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5225.py b/eos/effects/effect5225.py
deleted file mode 100644
index 2b3003818..000000000
--- a/eos/effects/effect5225.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyMissileEMDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5226.py b/eos/effects/effect5226.py
deleted file mode 100644
index 73ca9bf7f..000000000
--- a/eos/effects/effect5226.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyMissileExpDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5227.py b/eos/effects/effect5227.py
deleted file mode 100644
index e1efd07ec..000000000
--- a/eos/effects/effect5227.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyMissileKinDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5228.py b/eos/effects/effect5228.py
deleted file mode 100644
index 28990be6a..000000000
--- a/eos/effects/effect5228.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyMissileThermDmgPirateCruiser
-#
-# Used by:
-# Ship: Gnosis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5229.py b/eos/effects/effect5229.py
deleted file mode 100644
index c57d3adff..000000000
--- a/eos/effects/effect5229.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipScanProbeStrengthBonusPirateCruiser
-#
-# Used by:
-# Ships named like: Stratios (2 of 2)
-# Ship: Astero
-# Ship: Gnosis
-# Ship: Praxis
-# Ship: Sunesis
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", container.getModifiedItemAttr("shipBonusRole8"))
diff --git a/eos/effects/effect5230.py b/eos/effects/effect5230.py
deleted file mode 100644
index 04c2edac3..000000000
--- a/eos/effects/effect5230.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modifyActiveShieldResonancePostPercent
-#
-# Used by:
-# Modules from group: Flex Shield Hardener (5 of 5)
-# Modules from group: Shield Hardener (97 of 97)
-type = "active"
-
-
-def handler(fit, module, context):
-    for damageType in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("shield" + damageType.capitalize() + "DamageResonance",
-                               module.getModifiedItemAttr(damageType + "DamageResistanceBonus"),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect5231.py b/eos/effects/effect5231.py
deleted file mode 100644
index 6a6a9e571..000000000
--- a/eos/effects/effect5231.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modifyActiveArmorResonancePostPercent
-#
-# Used by:
-# Modules from group: Armor Hardener (156 of 156)
-# Modules from group: Flex Armor Hardener (4 of 4)
-type = "active"
-
-
-def handler(fit, module, context):
-    for damageType in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("armor%sDamageResonance" % damageType.capitalize(),
-                               module.getModifiedItemAttr("%sDamageResistanceBonus" % damageType),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect5234.py b/eos/effects/effect5234.py
deleted file mode 100644
index 2c03823e6..000000000
--- a/eos/effects/effect5234.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSmallMissileExpDmgCF2
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-# Ship: Kestrel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5237.py b/eos/effects/effect5237.py
deleted file mode 100644
index 9adc59089..000000000
--- a/eos/effects/effect5237.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSmallMissileKinDmgCF2
-#
-# Used by:
-# Ship: Kestrel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5240.py b/eos/effects/effect5240.py
deleted file mode 100644
index e336853e6..000000000
--- a/eos/effects/effect5240.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSmallMissileThermDmgCF2
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-# Ship: Kestrel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5243.py b/eos/effects/effect5243.py
deleted file mode 100644
index 3a08f5b10..000000000
--- a/eos/effects/effect5243.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSmallMissileEMDmgCF2
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-# Ship: Kestrel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "emDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5259.py b/eos/effects/effect5259.py
deleted file mode 100644
index e7c05671c..000000000
--- a/eos/effects/effect5259.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# reconShipCloakCpuBonus1
-#
-# Used by:
-# Ships from group: Force Recon Ship (7 of 9)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect5260.py b/eos/effects/effect5260.py
deleted file mode 100644
index e34450131..000000000
--- a/eos/effects/effect5260.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# covertOpsCloakCpuPercentBonus1
-#
-# Used by:
-# Ships from group: Covert Ops (6 of 8)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "cpu", ship.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
diff --git a/eos/effects/effect5261.py b/eos/effects/effect5261.py
deleted file mode 100644
index c3aa76e17..000000000
--- a/eos/effects/effect5261.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# CovertCloakCPUAddition
-#
-# Used by:
-# Modules named like: Covert Ops Cloaking Device II (2 of 2)
-# Module: Covert Cynosural Field Generator I
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.increaseItemAttr("cpu", module.getModifiedItemAttr("covertCloakCPUAdd") or 0)
diff --git a/eos/effects/effect5262.py b/eos/effects/effect5262.py
deleted file mode 100644
index 3cbb0e7fb..000000000
--- a/eos/effects/effect5262.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# covertOpsCloakCpuPenalty
-#
-# Used by:
-# Subsystems from group: Defensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                     "covertCloakCPUAdd", module.getModifiedItemAttr("covertCloakCPUPenalty"))
diff --git a/eos/effects/effect5263.py b/eos/effects/effect5263.py
deleted file mode 100644
index aeaf0cc45..000000000
--- a/eos/effects/effect5263.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# covertCynoCpuPenalty
-#
-# Used by:
-# Subsystems from group: Defensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Cynosural Field Theory"),
-                                     "covertCloakCPUAdd", module.getModifiedItemAttr("covertCloakCPUPenalty"))
diff --git a/eos/effects/effect5264.py b/eos/effects/effect5264.py
deleted file mode 100644
index 737970c42..000000000
--- a/eos/effects/effect5264.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# warfareLinkCPUAddition
-#
-# Used by:
-# Modules from group: Command Burst (10 of 10)
-# Modules from group: Gang Coordinator (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.increaseItemAttr("cpu", module.getModifiedItemAttr("warfareLinkCPUAdd") or 0)
diff --git a/eos/effects/effect5265.py b/eos/effects/effect5265.py
deleted file mode 100644
index 894cc58df..000000000
--- a/eos/effects/effect5265.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# warfareLinkCpuPenalty
-#
-# Used by:
-# Subsystems from group: Offensive Systems (8 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"),
-                                     "warfareLinkCPUAdd", module.getModifiedItemAttr("warfareLinkCPUPenalty"))
diff --git a/eos/effects/effect5266.py b/eos/effects/effect5266.py
deleted file mode 100644
index b153efbc3..000000000
--- a/eos/effects/effect5266.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# blockadeRunnerCloakCpuPercentBonus
-#
-# Used by:
-# Ships from group: Blockade Runner (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus"),
-                                  skill="Transport Ships")
diff --git a/eos/effects/effect5267.py b/eos/effects/effect5267.py
deleted file mode 100644
index 1eba7dc3c..000000000
--- a/eos/effects/effect5267.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# drawbackRepairSystemsPGNeed
-#
-# Used by:
-# Modules named like: Auxiliary Nano Pump (6 of 8)
-# Modules named like: Nanobot Accelerator (6 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect5268.py b/eos/effects/effect5268.py
deleted file mode 100644
index e5812f575..000000000
--- a/eos/effects/effect5268.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# drawbackCapRepPGNeed
-#
-# Used by:
-# Variations of module: Capital Auxiliary Nano Pump I (2 of 2)
-# Variations of module: Capital Nanobot Accelerator I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
-                                  "power", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect527.py b/eos/effects/effect527.py
deleted file mode 100644
index fe05cb921..000000000
--- a/eos/effects/effect527.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipVelocityBonusMI
-#
-# Used by:
-# Variations of ship: Mammoth (2 of 2)
-# Ship: Hoarder
-# Ship: Prowler
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusMI"), skill="Minmatar Industrial")
diff --git a/eos/effects/effect5275.py b/eos/effects/effect5275.py
deleted file mode 100644
index 79f9cf1e2..000000000
--- a/eos/effects/effect5275.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# fueledArmorRepair
-#
-# Used by:
-# Modules from group: Ancillary Armor Repairer (7 of 7)
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    if module.charge and module.charge.name == "Nanite Repair Paste":
-        multiplier = 3
-    else:
-        multiplier = 1
-
-    amount = module.getModifiedItemAttr("armorDamageAmount") * multiplier
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    rps = amount / speed
-    fit.extraAttributes.increase("armorRepair", rps)
-    fit.extraAttributes.increase("armorRepairPreSpool", rps)
-    fit.extraAttributes.increase("armorRepairFullSpool", rps)
diff --git a/eos/effects/effect529.py b/eos/effects/effect529.py
deleted file mode 100644
index 8e4dcae18..000000000
--- a/eos/effects/effect529.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipCargoBonusAI
-#
-# Used by:
-# Variations of ship: Sigil (2 of 2)
-# Ship: Bestower
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusAI"), skill="Amarr Industrial")
diff --git a/eos/effects/effect5293.py b/eos/effects/effect5293.py
deleted file mode 100644
index ae8265d4f..000000000
--- a/eos/effects/effect5293.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipLaserCapNeed2AD1
-#
-# Used by:
-# Ship: Coercer
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5294.py b/eos/effects/effect5294.py
deleted file mode 100644
index 03f58cb78..000000000
--- a/eos/effects/effect5294.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipLaserTracking2AD2
-#
-# Used by:
-# Ship: Coercer
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5295.py b/eos/effects/effect5295.py
deleted file mode 100644
index 3112585a8..000000000
--- a/eos/effects/effect5295.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneDamageMultiplierAD1
-#
-# Used by:
-# Variations of ship: Dragoon (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5300.py b/eos/effects/effect5300.py
deleted file mode 100644
index 4015c8f2e..000000000
--- a/eos/effects/effect5300.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusDroneHitpointsAD1
-#
-# Used by:
-# Variations of ship: Dragoon (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
-                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
-                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
-                                 src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5303.py b/eos/effects/effect5303.py
deleted file mode 100644
index ea35b9785..000000000
--- a/eos/effects/effect5303.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridRange1CD1
-#
-# Used by:
-# Ship: Cormorant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5304.py b/eos/effects/effect5304.py
deleted file mode 100644
index 20dc8ef34..000000000
--- a/eos/effects/effect5304.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridTrackingCD2
-#
-# Used by:
-# Ship: Cormorant
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5305.py b/eos/effects/effect5305.py
deleted file mode 100644
index efb861fb9..000000000
--- a/eos/effects/effect5305.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusFrigateSizedMissileKineticDamageCD1
-#
-# Used by:
-# Ship: Corax
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1"),
-                                    skill="Caldari Destroyer")
diff --git a/eos/effects/effect5306.py b/eos/effects/effect5306.py
deleted file mode 100644
index 79de18da3..000000000
--- a/eos/effects/effect5306.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketKineticDmgCD1
-#
-# Used by:
-# Ship: Corax
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1"),
-                                    skill="Caldari Destroyer")
diff --git a/eos/effects/effect5307.py b/eos/effects/effect5307.py
deleted file mode 100644
index 3513d9025..000000000
--- a/eos/effects/effect5307.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAoeVelocityRocketsCD2
-#
-# Used by:
-# Ship: Corax
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5308.py b/eos/effects/effect5308.py
deleted file mode 100644
index c49324439..000000000
--- a/eos/effects/effect5308.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAoeVelocityStandardMissilesCD2
-#
-# Used by:
-# Ship: Corax
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5309.py b/eos/effects/effect5309.py
deleted file mode 100644
index 69a04334d..000000000
--- a/eos/effects/effect5309.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridFallOff1GD1
-#
-# Used by:
-# Ship: Catalyst
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/effect5310.py b/eos/effects/effect5310.py
deleted file mode 100644
index 029dfaa35..000000000
--- a/eos/effects/effect5310.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridTracking1GD2
-#
-# Used by:
-# Variations of ship: Catalyst (2 of 2)
-# Ship: Algos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer")
diff --git a/eos/effects/effect5311.py b/eos/effects/effect5311.py
deleted file mode 100644
index 28ba5adfc..000000000
--- a/eos/effects/effect5311.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneDamageMultiplierGD1
-#
-# Used by:
-# Variations of ship: Algos (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/effect5316.py b/eos/effects/effect5316.py
deleted file mode 100644
index e82e28b1a..000000000
--- a/eos/effects/effect5316.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusDroneHitpointsGD1
-#
-# Used by:
-# Variations of ship: Algos (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
-                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
-                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
-                                 src.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/effect5317.py b/eos/effects/effect5317.py
deleted file mode 100644
index 171332da4..000000000
--- a/eos/effects/effect5317.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipProjectileDamageMD1
-#
-# Used by:
-# Variations of ship: Thrasher (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMD1"),
-                                  skill="Minmatar Destroyer")
diff --git a/eos/effects/effect5318.py b/eos/effects/effect5318.py
deleted file mode 100644
index a2b7e2371..000000000
--- a/eos/effects/effect5318.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileTracking1MD2
-#
-# Used by:
-# Variations of ship: Thrasher (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer")
diff --git a/eos/effects/effect5319.py b/eos/effects/effect5319.py
deleted file mode 100644
index 28ce0aedb..000000000
--- a/eos/effects/effect5319.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusFrigateSizedLightMissileExplosiveDamageMD1
-#
-# Used by:
-# Ship: Talwar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1"),
-                                    skill="Minmatar Destroyer")
diff --git a/eos/effects/effect5320.py b/eos/effects/effect5320.py
deleted file mode 100644
index 73c57b8aa..000000000
--- a/eos/effects/effect5320.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRocketExplosiveDmgMD1
-#
-# Used by:
-# Ship: Talwar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1"),
-                                    skill="Minmatar Destroyer")
diff --git a/eos/effects/effect5321.py b/eos/effects/effect5321.py
deleted file mode 100644
index 2354f22a1..000000000
--- a/eos/effects/effect5321.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMWDSignatureRadiusMD2
-#
-# Used by:
-# Ship: Talwar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMD2"),
-                                  skill="Minmatar Destroyer")
diff --git a/eos/effects/effect5322.py b/eos/effects/effect5322.py
deleted file mode 100644
index 98ccf2fc8..000000000
--- a/eos/effects/effect5322.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorEMResistance1ABC1
-#
-# Used by:
-# Variations of ship: Prophecy (2 of 2)
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
-                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5323.py b/eos/effects/effect5323.py
deleted file mode 100644
index f1a9d3a72..000000000
--- a/eos/effects/effect5323.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorExplosiveResistance1ABC1
-#
-# Used by:
-# Variations of ship: Prophecy (2 of 2)
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
-                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5324.py b/eos/effects/effect5324.py
deleted file mode 100644
index 191e50025..000000000
--- a/eos/effects/effect5324.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorKineticResistance1ABC1
-#
-# Used by:
-# Variations of ship: Prophecy (2 of 2)
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
-                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5325.py b/eos/effects/effect5325.py
deleted file mode 100644
index b03dffabe..000000000
--- a/eos/effects/effect5325.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipArmorThermResistance1ABC1
-#
-# Used by:
-# Variations of ship: Prophecy (2 of 2)
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"),
-                           skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5326.py b/eos/effects/effect5326.py
deleted file mode 100644
index b93e05392..000000000
--- a/eos/effects/effect5326.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneDamageMultiplierABC2
-#
-# Used by:
-# Ship: Prophecy
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"),
-                                 skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5331.py b/eos/effects/effect5331.py
deleted file mode 100644
index b1738a300..000000000
--- a/eos/effects/effect5331.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneHitpointsABC2
-#
-# Used by:
-# Ship: Prophecy
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for layer in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     layer, ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5332.py b/eos/effects/effect5332.py
deleted file mode 100644
index e733f3709..000000000
--- a/eos/effects/effect5332.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLaserCapABC1
-#
-# Used by:
-# Ship: Harbinger
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5333.py b/eos/effects/effect5333.py
deleted file mode 100644
index c750cbd31..000000000
--- a/eos/effects/effect5333.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLaserDamageBonusABC2
-#
-# 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"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5334.py b/eos/effects/effect5334.py
deleted file mode 100644
index 28f6a8c2e..000000000
--- a/eos/effects/effect5334.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridOptimal1CBC1
-#
-# Used by:
-# Variations of ship: Ferox (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5335.py b/eos/effects/effect5335.py
deleted file mode 100644
index 82fe621bc..000000000
--- a/eos/effects/effect5335.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldEmResistance1CBC2
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
-                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5336.py b/eos/effects/effect5336.py
deleted file mode 100644
index c3e3846de..000000000
--- a/eos/effects/effect5336.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldExplosiveResistance1CBC2
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
-                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5337.py b/eos/effects/effect5337.py
deleted file mode 100644
index 8db3ea8be..000000000
--- a/eos/effects/effect5337.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldKineticResistance1CBC2
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
-                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5338.py b/eos/effects/effect5338.py
deleted file mode 100644
index 4268d279f..000000000
--- a/eos/effects/effect5338.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldThermalResistance1CBC2
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"),
-                           skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5339.py b/eos/effects/effect5339.py
deleted file mode 100644
index 4843ac63b..000000000
--- a/eos/effects/effect5339.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusHeavyAssaultMissileKineticDamageCBC1
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1"),
-                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5340.py b/eos/effects/effect5340.py
deleted file mode 100644
index 83f591980..000000000
--- a/eos/effects/effect5340.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusHeavyMissileKineticDamageCBC1
-#
-# Used by:
-# Ship: Drake
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1"),
-                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5341.py b/eos/effects/effect5341.py
deleted file mode 100644
index d99d40c26..000000000
--- a/eos/effects/effect5341.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDmg1GBC1
-#
-# Used by:
-# Variations of ship: Brutix (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1"),
-                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5342.py b/eos/effects/effect5342.py
deleted file mode 100644
index 1c4ca9d09..000000000
--- a/eos/effects/effect5342.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipArmorRepairing1GBC2
-#
-# Used by:
-# Variations of ship: Myrmidon (2 of 2)
-# Ship: Astarte
-# Ship: Brutix
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGBC2"),
-                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5343.py b/eos/effects/effect5343.py
deleted file mode 100644
index b1f3abe8e..000000000
--- a/eos/effects/effect5343.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneDamageMultiplierGBC1
-#
-# Used by:
-# Variations of ship: Myrmidon (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1"),
-                                 skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5348.py b/eos/effects/effect5348.py
deleted file mode 100644
index 36f77064e..000000000
--- a/eos/effects/effect5348.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusDroneHitpointsGBC1
-#
-# Used by:
-# Variations of ship: Myrmidon (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for layer in ("shieldCapacity", "armorHP", "hp"):
-        fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                     layer, ship.getModifiedItemAttr("shipBonusGBC1"), skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5349.py b/eos/effects/effect5349.py
deleted file mode 100644
index 7622c3d1d..000000000
--- a/eos/effects/effect5349.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileLauncherRofMBC2
-#
-# Used by:
-# Variations of ship: Cyclone (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5350.py b/eos/effects/effect5350.py
deleted file mode 100644
index 85820f30e..000000000
--- a/eos/effects/effect5350.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyAssaultMissileLauncherRofMBC2
-#
-# Used by:
-# Variations of ship: Cyclone (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5351.py b/eos/effects/effect5351.py
deleted file mode 100644
index 5f9abe465..000000000
--- a/eos/effects/effect5351.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipShieldBoost1MBC1
-#
-# Used by:
-# Variations of ship: Cyclone (2 of 2)
-# Ship: Sleipnir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMBC1"),
-                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5352.py b/eos/effects/effect5352.py
deleted file mode 100644
index d1d2bb14d..000000000
--- a/eos/effects/effect5352.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusProjectileDamageMBC1
-#
-# 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"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC1"),
-                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5353.py b/eos/effects/effect5353.py
deleted file mode 100644
index da832307f..000000000
--- a/eos/effects/effect5353.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileRof1MBC2
-#
-# Used by:
-# Ship: Hurricane
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5354.py b/eos/effects/effect5354.py
deleted file mode 100644
index facc0461d..000000000
--- a/eos/effects/effect5354.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLargeLaserCapABC1
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5355.py b/eos/effects/effect5355.py
deleted file mode 100644
index ced27165b..000000000
--- a/eos/effects/effect5355.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLargeLaserDamageBonusABC2
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5356.py b/eos/effects/effect5356.py
deleted file mode 100644
index ec1572d8b..000000000
--- a/eos/effects/effect5356.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridRangeBonusCBC1
-#
-# Used by:
-# Ship: Naga
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5357.py b/eos/effects/effect5357.py
deleted file mode 100644
index 50f4304ce..000000000
--- a/eos/effects/effect5357.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDamageBonusCBC2
-#
-# Used by:
-# Ship: Naga
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2"),
-                                  skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5358.py b/eos/effects/effect5358.py
deleted file mode 100644
index ed177a5c9..000000000
--- a/eos/effects/effect5358.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLargeHybridTrackingBonusGBC1
-#
-# Used by:
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC1"),
-                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5359.py b/eos/effects/effect5359.py
deleted file mode 100644
index 7ae28ba58..000000000
--- a/eos/effects/effect5359.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDamageBonusGBC2
-#
-# Used by:
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC2"),
-                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect536.py b/eos/effects/effect536.py
deleted file mode 100644
index 99c14306b..000000000
--- a/eos/effects/effect536.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# cpuMultiplierPostMulCpuOutputShip
-#
-# Used by:
-# Modules from group: CPU Enhancer (19 of 19)
-# Variations of structure module: Standup Co-Processor Array I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("cpuOutput", module.getModifiedItemAttr("cpuMultiplier"))
diff --git a/eos/effects/effect5360.py b/eos/effects/effect5360.py
deleted file mode 100644
index 6df3698af..000000000
--- a/eos/effects/effect5360.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileRofBonusMBC1
-#
-# Used by:
-# Ship: Tornado
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusMBC1"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5361.py b/eos/effects/effect5361.py
deleted file mode 100644
index cd9fc15ae..000000000
--- a/eos/effects/effect5361.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileFalloffBonusMBC2
-#
-# Used by:
-# Ship: Tornado
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect5364.py b/eos/effects/effect5364.py
deleted file mode 100644
index 8307ae2ee..000000000
--- a/eos/effects/effect5364.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# armorAllRepairSystemsAmountBonusPassive
-#
-# Used by:
-# Implants named like: Agency 'Hardshell' TB Dose (4 of 4)
-# 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"),
-        "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus") or 0)
diff --git a/eos/effects/effect5365.py b/eos/effects/effect5365.py
deleted file mode 100644
index 648b65203..000000000
--- a/eos/effects/effect5365.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusViolatorsRepairSystemsArmorDamageAmount2
-#
-# Used by:
-# Ship: Kronos
-# Ship: Paladin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("eliteBonusViolators2"),
-                                  skill="Marauders")
diff --git a/eos/effects/effect5366.py b/eos/effects/effect5366.py
deleted file mode 100644
index c761ad921..000000000
--- a/eos/effects/effect5366.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRepairSystemsBonusATC2
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusATC2"))
diff --git a/eos/effects/effect5367.py b/eos/effects/effect5367.py
deleted file mode 100644
index 09b2fc18d..000000000
--- a/eos/effects/effect5367.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRepairSystemsArmorRepairAmountGB2
-#
-# Used by:
-# Ship: Hyperion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGB2"),
-                                  skill="Gallente Battleship")
diff --git a/eos/effects/effect5378.py b/eos/effects/effect5378.py
deleted file mode 100644
index e7046f2ad..000000000
--- a/eos/effects/effect5378.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeavyMissileAOECloudSizeCBC1
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1"),
-                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5379.py b/eos/effects/effect5379.py
deleted file mode 100644
index 2ef68bd9f..000000000
--- a/eos/effects/effect5379.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeavyAssaultMissileAOECloudSizeCBC1
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1"),
-                                    skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect5380.py b/eos/effects/effect5380.py
deleted file mode 100644
index ee9309f0a..000000000
--- a/eos/effects/effect5380.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridTrackingGBC2
-#
-# Used by:
-# Ship: Brutix Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC2"),
-                                  skill="Gallente Battlecruiser")
diff --git a/eos/effects/effect5381.py b/eos/effects/effect5381.py
deleted file mode 100644
index f88ec12de..000000000
--- a/eos/effects/effect5381.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipEnergyTrackingABC1
-#
-# Used by:
-# Ship: Harbinger Navy Issue
-
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusABC1"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5382.py b/eos/effects/effect5382.py
deleted file mode 100644
index 758ede0d7..000000000
--- a/eos/effects/effect5382.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMETOptimalAC2
-#
-# Used by:
-# Ship: Enforcer
-# Ship: Omen Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5383.py b/eos/effects/effect5383.py
deleted file mode 100644
index 4fb493160..000000000
--- a/eos/effects/effect5383.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileEMDamageCC
-#
-# Used by:
-# Ship: Orthrus
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5384.py b/eos/effects/effect5384.py
deleted file mode 100644
index 175af5266..000000000
--- a/eos/effects/effect5384.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileThermDamageCC
-#
-# Used by:
-# Ship: Orthrus
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5385.py b/eos/effects/effect5385.py
deleted file mode 100644
index 4ba61cc88..000000000
--- a/eos/effects/effect5385.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileExpDamageCC
-#
-# Used by:
-# Ship: Orthrus
-# Ship: Osprey Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5386.py b/eos/effects/effect5386.py
deleted file mode 100644
index 2a9b2ef96..000000000
--- a/eos/effects/effect5386.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileKinDamageCC2
-#
-# Used by:
-# Ship: Rook
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5387.py b/eos/effects/effect5387.py
deleted file mode 100644
index f9cbb40c3..000000000
--- a/eos/effects/effect5387.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyAssaultMissileAOECloudSizeCC2
-#
-# Used by:
-# Ship: Caracal Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5388.py b/eos/effects/effect5388.py
deleted file mode 100644
index 971e15bae..000000000
--- a/eos/effects/effect5388.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHeavyMissileAOECloudSizeCC2
-#
-# Used by:
-# Ship: Caracal Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5389.py b/eos/effects/effect5389.py
deleted file mode 100644
index c33d4f02f..000000000
--- a/eos/effects/effect5389.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneTrackingGC
-#
-# Used by:
-# Ship: Vexor Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5390.py b/eos/effects/effect5390.py
deleted file mode 100644
index 617b0a7a5..000000000
--- a/eos/effects/effect5390.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneMWDboostGC
-#
-# Used by:
-# Ship: Vexor Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5397.py b/eos/effects/effect5397.py
deleted file mode 100644
index 3169597ef..000000000
--- a/eos/effects/effect5397.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# baseMaxScanDeviationModifierModuleOnline2None
-#
-# Used by:
-# Variations of module: Scan Pinpointing Array I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseMaxScanDeviation",
-                                    module.getModifiedItemAttr("maxScanDeviationModifierModule"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect5398.py b/eos/effects/effect5398.py
deleted file mode 100644
index bf561c4a2..000000000
--- a/eos/effects/effect5398.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemScanDurationModuleModifier
-#
-# Used by:
-# Modules from group: Scanning Upgrade Time (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),
-                                  "duration", module.getModifiedItemAttr("scanDurationBonus"))
diff --git a/eos/effects/effect5399.py b/eos/effects/effect5399.py
deleted file mode 100644
index 5d64ab13a..000000000
--- a/eos/effects/effect5399.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# baseSensorStrengthModifierModule
-#
-# Used by:
-# Variations of module: Scan Rangefinding Array I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", module.getModifiedItemAttr("scanStrengthBonusModule"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect5402.py b/eos/effects/effect5402.py
deleted file mode 100644
index a43ad0c44..000000000
--- a/eos/effects/effect5402.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileHeavyAssaultVelocityABC2
-#
-# Used by:
-# Ship: Damnation
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2"),
-                                    skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5403.py b/eos/effects/effect5403.py
deleted file mode 100644
index a2cfa0bef..000000000
--- a/eos/effects/effect5403.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileHeavyVelocityABC2
-#
-# Used by:
-# Ship: Damnation
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2"),
-                                    skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5410.py b/eos/effects/effect5410.py
deleted file mode 100644
index 6517f6351..000000000
--- a/eos/effects/effect5410.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLaserCap1ABC2
-#
-# Used by:
-# Ship: Absolution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC2"),
-                                  skill="Amarr Battlecruiser")
diff --git a/eos/effects/effect5411.py b/eos/effects/effect5411.py
deleted file mode 100644
index 370f666b2..000000000
--- a/eos/effects/effect5411.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileVelocityCD1
-#
-# Used by:
-# Ship: Flycatcher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5417.py b/eos/effects/effect5417.py
deleted file mode 100644
index 3825f9bb3..000000000
--- a/eos/effects/effect5417.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneDamageMultiplierAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5418.py b/eos/effects/effect5418.py
deleted file mode 100644
index 4753c8f3f..000000000
--- a/eos/effects/effect5418.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneArmorHitPointsAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5419.py b/eos/effects/effect5419.py
deleted file mode 100644
index e0ed55589..000000000
--- a/eos/effects/effect5419.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneShieldHitPointsAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect542.py b/eos/effects/effect542.py
deleted file mode 100644
index 84fb447cc..000000000
--- a/eos/effects/effect542.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipCapNeedBonusAB
-#
-# Used by:
-# Variations of ship: Armageddon (3 of 5)
-# Ship: Apocalypse Imperial Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5420.py b/eos/effects/effect5420.py
deleted file mode 100644
index a37f00d0c..000000000
--- a/eos/effects/effect5420.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneStructureHitPointsAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5424.py b/eos/effects/effect5424.py
deleted file mode 100644
index 51045e22f..000000000
--- a/eos/effects/effect5424.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLargeHybridTurretRofGB
-#
-# Used by:
-# Ship: Megathron
-# Ship: Megathron Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5427.py b/eos/effects/effect5427.py
deleted file mode 100644
index 8449ffc78..000000000
--- a/eos/effects/effect5427.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneTrackingGB
-#
-# Used by:
-# Ship: Dominix
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5428.py b/eos/effects/effect5428.py
deleted file mode 100644
index 197aba8ac..000000000
--- a/eos/effects/effect5428.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneOptimalRangeGB
-#
-# Used by:
-# Ship: Dominix
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxRange", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5429.py b/eos/effects/effect5429.py
deleted file mode 100644
index 844746ae1..000000000
--- a/eos/effects/effect5429.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMissileAoeVelocityMB2
-#
-# Used by:
-# Ship: Typhoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5430.py b/eos/effects/effect5430.py
deleted file mode 100644
index 1bf11ce1a..000000000
--- a/eos/effects/effect5430.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusAoeVelocityCruiseMissilesMB2
-#
-# Used by:
-# Ship: Typhoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5431.py b/eos/effects/effect5431.py
deleted file mode 100644
index 0ec7b3b4c..000000000
--- a/eos/effects/effect5431.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLargeEnergyTurretTrackingAB
-#
-# Used by:
-# Ship: Apocalypse
-# Ship: Apocalypse Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5433.py b/eos/effects/effect5433.py
deleted file mode 100644
index 45610c4f9..000000000
--- a/eos/effects/effect5433.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# hackingSkillVirusBonus
-#
-# Used by:
-# Modules named like: Memetic Algorithm Bank (8 of 8)
-# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-# Implant: Poteque 'Prospector' Hacking HC-905
-# Skill: Hacking
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Hacking"),
-                                     "virusCoherence", container.getModifiedItemAttr("virusCoherenceBonus") * level)
diff --git a/eos/effects/effect5437.py b/eos/effects/effect5437.py
deleted file mode 100644
index 9e383ba0a..000000000
--- a/eos/effects/effect5437.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# archaeologySkillVirusBonus
-#
-# Used by:
-# Modules named like: Emission Scope Sharpener (8 of 8)
-# Implant: Poteque 'Prospector' Archaeology AC-905
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-# Skill: Archaeology
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Archaeology"),
-                                     "virusCoherence", container.getModifiedItemAttr("virusCoherenceBonus") * level)
diff --git a/eos/effects/effect5440.py b/eos/effects/effect5440.py
deleted file mode 100644
index 51c946fec..000000000
--- a/eos/effects/effect5440.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemStandardMissileKineticDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5444.py b/eos/effects/effect5444.py
deleted file mode 100644
index ca8a1b166..000000000
--- a/eos/effects/effect5444.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipTorpedoAOECloudSize1CB
-#
-# Used by:
-# Ship: Raven Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5445.py b/eos/effects/effect5445.py
deleted file mode 100644
index e1d7c2557..000000000
--- a/eos/effects/effect5445.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipCruiseMissileAOECloudSize1CB
-#
-# Used by:
-# Ship: Raven Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5456.py b/eos/effects/effect5456.py
deleted file mode 100644
index 268e7d96a..000000000
--- a/eos/effects/effect5456.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipCruiseMissileROFCB
-#
-# Used by:
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise",
-                                  "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5457.py b/eos/effects/effect5457.py
deleted file mode 100644
index 22d81e5fa..000000000
--- a/eos/effects/effect5457.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipTorpedoROFCB
-#
-# Used by:
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
-                                  "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5459.py b/eos/effects/effect5459.py
deleted file mode 100644
index 6307a9224..000000000
--- a/eos/effects/effect5459.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# hackingVirusStrengthBonus
-#
-# Used by:
-# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Hacking"), "virusStrength", src.getModifiedItemAttr("virusStrengthBonus"))
diff --git a/eos/effects/effect5460.py b/eos/effects/effect5460.py
deleted file mode 100644
index 0e60325db..000000000
--- a/eos/effects/effect5460.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# minigameVirusStrengthBonus
-#
-# Used by:
-# Ships from group: Covert Ops (7 of 8)
-# Ships named like: Stratios (2 of 2)
-# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
-# Ship: Astero
-# Ship: Heron
-# Ship: Imicus
-# Ship: Magnate
-# Ship: Nestor
-# Ship: Probe
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemIncrease(
-        lambda mod: (mod.item.requiresSkill("Hacking") or mod.item.requiresSkill("Archaeology")),
-        "virusStrength", container.getModifiedItemAttr("virusStrengthBonus") * level)
diff --git a/eos/effects/effect5461.py b/eos/effects/effect5461.py
deleted file mode 100644
index 266c3776d..000000000
--- a/eos/effects/effect5461.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shieldOperationRechargeratebonusPostPercentOnline
-#
-# Used by:
-# Modules from group: Shield Power Relay (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("shieldRechargeRate", module.getModifiedItemAttr("rechargeratebonus") or 0)
diff --git a/eos/effects/effect5468.py b/eos/effects/effect5468.py
deleted file mode 100644
index 2fccf4074..000000000
--- a/eos/effects/effect5468.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusAgilityCI2
-#
-# Used by:
-# Ship: Badger
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusCI2"), skill="Caldari Industrial")
diff --git a/eos/effects/effect5469.py b/eos/effects/effect5469.py
deleted file mode 100644
index 8273934e5..000000000
--- a/eos/effects/effect5469.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusAgilityMI2
-#
-# Used by:
-# Ship: Wreathe
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusMI2"), skill="Minmatar Industrial")
diff --git a/eos/effects/effect5470.py b/eos/effects/effect5470.py
deleted file mode 100644
index 3fc84bb06..000000000
--- a/eos/effects/effect5470.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusAgilityGI2
-#
-# Used by:
-# Ship: Nereus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial")
diff --git a/eos/effects/effect5471.py b/eos/effects/effect5471.py
deleted file mode 100644
index 16c2537ad..000000000
--- a/eos/effects/effect5471.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusAgilityAI2
-#
-# Used by:
-# Ship: Sigil
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusAI2"), skill="Amarr Industrial")
diff --git a/eos/effects/effect5476.py b/eos/effects/effect5476.py
deleted file mode 100644
index 5c6af2abb..000000000
--- a/eos/effects/effect5476.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusOreCapacityGI2
-#
-# Used by:
-# Ship: Miasmos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"),
-                           skill="Gallente Industrial")
diff --git a/eos/effects/effect5477.py b/eos/effects/effect5477.py
deleted file mode 100644
index 8bb93aaeb..000000000
--- a/eos/effects/effect5477.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAmmoBayMI2
-#
-# Used by:
-# Ship: Hoarder
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialAmmoHoldCapacity", ship.getModifiedItemAttr("shipBonusMI2"),
-                           skill="Minmatar Industrial")
diff --git a/eos/effects/effect5478.py b/eos/effects/effect5478.py
deleted file mode 100644
index dfac42672..000000000
--- a/eos/effects/effect5478.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusPICommoditiesHoldGI2
-#
-# Used by:
-# Ship: Epithal
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialPlanetaryCommoditiesHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"),
-                           skill="Gallente Industrial")
diff --git a/eos/effects/effect5479.py b/eos/effects/effect5479.py
deleted file mode 100644
index 66a78e721..000000000
--- a/eos/effects/effect5479.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMineralBayGI2
-#
-# Used by:
-# Ship: Kryos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("specialMineralHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"),
-                           skill="Gallente Industrial")
diff --git a/eos/effects/effect5480.py b/eos/effects/effect5480.py
deleted file mode 100644
index eb2ae35bc..000000000
--- a/eos/effects/effect5480.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasBonusVelocity
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "implantBonusVelocity", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect5482.py b/eos/effects/effect5482.py
deleted file mode 100644
index d8f472b50..000000000
--- a/eos/effects/effect5482.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasAgilityBonus
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "agilityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect5483.py b/eos/effects/effect5483.py
deleted file mode 100644
index e9212fe68..000000000
--- a/eos/effects/effect5483.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasShieldCapacityBonus
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "shieldCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect5484.py b/eos/effects/effect5484.py
deleted file mode 100644
index b9eb11557..000000000
--- a/eos/effects/effect5484.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusChristmasArmorHPBonus2
-#
-# Used by:
-# Implants named like: Genolution Core Augmentation CA (4 of 4)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Special Edition Implant",
-                                             "armorHpBonus2", implant.getModifiedItemAttr("implantSetChristmas"))
diff --git a/eos/effects/effect5485.py b/eos/effects/effect5485.py
deleted file mode 100644
index 1f7255f44..000000000
--- a/eos/effects/effect5485.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSPTOptimalBonusMF
-#
-# Used by:
-# Ship: Chremoas
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5486.py b/eos/effects/effect5486.py
deleted file mode 100644
index ef47a0f27..000000000
--- a/eos/effects/effect5486.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusProjectileDamageMBC2
-#
-# Used by:
-# Ship: Sleipnir
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC2"),
-                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect549.py b/eos/effects/effect549.py
deleted file mode 100644
index f6809435e..000000000
--- a/eos/effects/effect549.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipPTDmgBonusMB
-#
-# Used by:
-# Variations of ship: Tempest (3 of 4)
-# Ship: Machariel
-# Ship: Panther
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMB"),
-                                  skill="Minmatar Battleship")
diff --git a/eos/effects/effect5496.py b/eos/effects/effect5496.py
deleted file mode 100644
index d57f9df19..000000000
--- a/eos/effects/effect5496.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipHAMRoFCS1
-#
-# Used by:
-# Ship: Claymore
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/effect5497.py b/eos/effects/effect5497.py
deleted file mode 100644
index 2907e0885..000000000
--- a/eos/effects/effect5497.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipHMRoFCS1
-#
-# Used by:
-# Ship: Claymore
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/effect5498.py b/eos/effects/effect5498.py
deleted file mode 100644
index 45b63167c..000000000
--- a/eos/effects/effect5498.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipsHeavyAssaultMissileExplosionVelocityCS2
-#
-# Used by:
-# Ship: Claymore
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                    skill="Command Ships")
diff --git a/eos/effects/effect5499.py b/eos/effects/effect5499.py
deleted file mode 100644
index dc04674b7..000000000
--- a/eos/effects/effect5499.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipsHeavyAssaultMissileExplosionRadiusCS2
-#
-# Used by:
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                    skill="Command Ships")
diff --git a/eos/effects/effect55.py b/eos/effects/effect55.py
deleted file mode 100644
index 65664fa77..000000000
--- a/eos/effects/effect55.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# targetHostiles
-#
-# Used by:
-# Modules from group: Automated Targeting System (6 of 6)
-type = "active"
-
-
-def handler(fit, module, context):
-    # This effect enables the ACTIVE state for auto targeting systems.
-    pass
diff --git a/eos/effects/effect550.py b/eos/effects/effect550.py
deleted file mode 100644
index db7ef2e93..000000000
--- a/eos/effects/effect550.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipHTDmgBonusGB
-#
-# Used by:
-# Ship: Dominix Navy Issue
-# Ship: Hyperion
-# Ship: Kronos
-# Ship: Marshal
-# Ship: Megathron Federate Issue
-# Ship: Sin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB"),
-                                  skill="Gallente Battleship")
diff --git a/eos/effects/effect5500.py b/eos/effects/effect5500.py
deleted file mode 100644
index 7200ea677..000000000
--- a/eos/effects/effect5500.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipsHeavyMissileExplosionRadiusCS2
-#
-# Used by:
-# Ship: Nighthawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                    skill="Command Ships")
diff --git a/eos/effects/effect5501.py b/eos/effects/effect5501.py
deleted file mode 100644
index 5f491a84b..000000000
--- a/eos/effects/effect5501.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipMediumHybridDamageCS2
-#
-# Used by:
-# Ship: Vulture
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                  skill="Command Ships")
diff --git a/eos/effects/effect5502.py b/eos/effects/effect5502.py
deleted file mode 100644
index 5d855b11c..000000000
--- a/eos/effects/effect5502.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipMediumHybridTrackingCS1
-#
-# Used by:
-# Ship: Eos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips1"),
-                                  skill="Command Ships")
diff --git a/eos/effects/effect5503.py b/eos/effects/effect5503.py
deleted file mode 100644
index 7e359e3e0..000000000
--- a/eos/effects/effect5503.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipHeavyDroneTrackingCS2
-#
-# Used by:
-# Ship: Eos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                 skill="Command Ships")
diff --git a/eos/effects/effect5504.py b/eos/effects/effect5504.py
deleted file mode 100644
index 8b105c48a..000000000
--- a/eos/effects/effect5504.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCommandShipHeavyDroneVelocityCS2
-#
-# Used by:
-# Ship: Eos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "maxVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"),
-                                 skill="Command Ships")
diff --git a/eos/effects/effect5505.py b/eos/effects/effect5505.py
deleted file mode 100644
index b7cec2d64..000000000
--- a/eos/effects/effect5505.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCommandShipMediumHybridRoFCS1
-#
-# Used by:
-# Ship: Astarte
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")
diff --git a/eos/effects/effect5514.py b/eos/effects/effect5514.py
deleted file mode 100644
index 866509be5..000000000
--- a/eos/effects/effect5514.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusCommandShipHeavyAssaultMissileDamageCS2
-#
-# Used by:
-# Ship: Damnation
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("em", "explosive", "kinetic", "thermal")
-    for damageType in damageTypes:
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                        "{0}Damage".format(damageType),
-                                        ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/effect5521.py b/eos/effects/effect5521.py
deleted file mode 100644
index f6f10902c..000000000
--- a/eos/effects/effect5521.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusCommandShipHeavyMissileDamageCS2
-#
-# Used by:
-# Ship: Damnation
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("em", "explosive", "kinetic", "thermal")
-    for damageType in damageTypes:
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                        "{0}Damage".format(damageType),
-                                        ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")
diff --git a/eos/effects/effect553.py b/eos/effects/effect553.py
deleted file mode 100644
index 60c79d649..000000000
--- a/eos/effects/effect553.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHTTrackingBonusGB
-#
-# Used by:
-# Ship: Vindicator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5539.py b/eos/effects/effect5539.py
deleted file mode 100644
index adecc7914..000000000
--- a/eos/effects/effect5539.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHMLKineticDamageAC
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5540.py b/eos/effects/effect5540.py
deleted file mode 100644
index 464e8d6ac..000000000
--- a/eos/effects/effect5540.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHMLEMDamageAC
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5541.py b/eos/effects/effect5541.py
deleted file mode 100644
index 663ee7a44..000000000
--- a/eos/effects/effect5541.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHMLThermDamageAC
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5542.py b/eos/effects/effect5542.py
deleted file mode 100644
index c22b7f6ba..000000000
--- a/eos/effects/effect5542.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHMLExploDamageAC
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5552.py b/eos/effects/effect5552.py
deleted file mode 100644
index 1275a2e99..000000000
--- a/eos/effects/effect5552.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusHMLVelocityEliteBonusHeavyGunship1
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect5553.py b/eos/effects/effect5553.py
deleted file mode 100644
index 59e546543..000000000
--- a/eos/effects/effect5553.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusHAMVelocityEliteBonusHeavyGunship1
-#
-# Used by:
-# Ship: Sacrilege
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"),
-                                    skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect5554.py b/eos/effects/effect5554.py
deleted file mode 100644
index 622b593fd..000000000
--- a/eos/effects/effect5554.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusArmorRepAmountGC2
-#
-# Used by:
-# Ship: Deimos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGC2"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect5555.py b/eos/effects/effect5555.py
deleted file mode 100644
index 4f7113218..000000000
--- a/eos/effects/effect5555.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneSpeedGC
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "maxVelocity", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5556.py b/eos/effects/effect5556.py
deleted file mode 100644
index d306134b2..000000000
--- a/eos/effects/effect5556.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDRoneTrackingGC
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5557.py b/eos/effects/effect5557.py
deleted file mode 100644
index 7704bffed..000000000
--- a/eos/effects/effect5557.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSentryDroneOptimalRangeEliteBonusHeavyGunship2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                 skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect5558.py b/eos/effects/effect5558.py
deleted file mode 100644
index aab03ea9e..000000000
--- a/eos/effects/effect5558.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSentryDroneTrackingEliteBonusHeavyGunship2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"),
-                                 skill="Heavy Assault Cruisers")
diff --git a/eos/effects/effect5559.py b/eos/effects/effect5559.py
deleted file mode 100644
index 8acf3337a..000000000
--- a/eos/effects/effect5559.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldBoostAmountMC2
-#
-# Used by:
-# Ship: Vagabond
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect5560.py b/eos/effects/effect5560.py
deleted file mode 100644
index 4f2dd193e..000000000
--- a/eos/effects/effect5560.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# roleBonusMarauderMJDRReactivationDelayBonus
-#
-# Used by:
-# Ships from group: Marauder (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Micro Jump Drive",
-                                  "moduleReactivationDelay", ship.getModifiedItemAttr("roleBonusMarauder"))
diff --git a/eos/effects/effect5564.py b/eos/effects/effect5564.py
deleted file mode 100644
index e83045ae8..000000000
--- a/eos/effects/effect5564.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# subSystemBonusCaldariOffensiveCommandBursts
-#
-# Used by:
-# Subsystem: Tengu Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect5568.py b/eos/effects/effect5568.py
deleted file mode 100644
index dfa14ae83..000000000
--- a/eos/effects/effect5568.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# subSystemBonusGallenteOffensiveCommandBursts
-#
-# Used by:
-# Subsystem: Proteus Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect5570.py b/eos/effects/effect5570.py
deleted file mode 100644
index 50586ca36..000000000
--- a/eos/effects/effect5570.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# subSystemBonusMinmatarOffensiveCommandBursts
-#
-# Used by:
-# Subsystem: Loki Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"),
-                                  "war"
-                                  "fareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect5572.py b/eos/effects/effect5572.py
deleted file mode 100644
index d7bc3fc46..000000000
--- a/eos/effects/effect5572.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# eliteBonusCommandShipArmoredCS3
-#
-# Used by:
-# Ships from group: Command Ship (4 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
diff --git a/eos/effects/effect5573.py b/eos/effects/effect5573.py
deleted file mode 100644
index a17eb44dc..000000000
--- a/eos/effects/effect5573.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# eliteBonusCommandShipSiegeCS3
-#
-# Used by:
-# Ships from group: Command Ship (4 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
diff --git a/eos/effects/effect5574.py b/eos/effects/effect5574.py
deleted file mode 100644
index 345191164..000000000
--- a/eos/effects/effect5574.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# eliteBonusCommandShipSkirmishCS3
-#
-# Used by:
-# Ships from group: Command Ship (4 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
diff --git a/eos/effects/effect5575.py b/eos/effects/effect5575.py
deleted file mode 100644
index 283cc76d6..000000000
--- a/eos/effects/effect5575.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# eliteBonusCommandShipInformationCS3
-#
-# Used by:
-# Ships from group: Command Ship (4 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
diff --git a/eos/effects/effect56.py b/eos/effects/effect56.py
deleted file mode 100644
index 2add2137d..000000000
--- a/eos/effects/effect56.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# powerOutputMultiply
-#
-# Used by:
-# 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: Reactor Control Unit (22 of 22)
-# Variations of structure module: Standup Reactor Control Unit I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
-    # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
-    fit.ship.multiplyItemAttr("powerOutput", module.getModifiedItemAttr("powerOutputMultiplier", None))
diff --git a/eos/effects/effect5607.py b/eos/effects/effect5607.py
deleted file mode 100644
index c792ef48c..000000000
--- a/eos/effects/effect5607.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# capacitorEmissionSystemskill
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Capacitor Emission Systems ES (6 of 6)
-# Modules named like: Egress Port Maximizer (8 of 8)
-# Skill: Capacitor Emission Systems
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
diff --git a/eos/effects/effect5610.py b/eos/effects/effect5610.py
deleted file mode 100644
index 795ddf9ef..000000000
--- a/eos/effects/effect5610.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLargeEnergyTurretMaxRangeAB
-#
-# Used by:
-# Ship: Marshal
-# Ship: Paladin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect5611.py b/eos/effects/effect5611.py
deleted file mode 100644
index f8a66395d..000000000
--- a/eos/effects/effect5611.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHTFalloffGB2
-#
-# Used by:
-# Ship: Kronos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5618.py b/eos/effects/effect5618.py
deleted file mode 100644
index f6c61b3b4..000000000
--- a/eos/effects/effect5618.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusRHMLROF2CB
-#
-# Used by:
-# Ship: Raven
-# Ship: Widow
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5619.py b/eos/effects/effect5619.py
deleted file mode 100644
index a145864d6..000000000
--- a/eos/effects/effect5619.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRHMLROFCB
-#
-# Used by:
-# Ship: Scorpion Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect562.py b/eos/effects/effect562.py
deleted file mode 100644
index e6dfd16a2..000000000
--- a/eos/effects/effect562.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipHTDmgBonusfixedGC
-#
-# Used by:
-# Ship: Adrestia
-# Ship: Arazu
-# Ship: Deimos
-# Ship: Enforcer
-# Ship: Exequror Navy Issue
-# Ship: Guardian-Vexor
-# Ship: Thorax
-# Ship: Vexor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5620.py b/eos/effects/effect5620.py
deleted file mode 100644
index 1f972e2ea..000000000
--- a/eos/effects/effect5620.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRHMLROFMB
-#
-# Used by:
-# Ship: Typhoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5621.py b/eos/effects/effect5621.py
deleted file mode 100644
index 34dc736d2..000000000
--- a/eos/effects/effect5621.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCruiseROFMB
-#
-# Used by:
-# Ship: Typhoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise",
-                                  "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5622.py b/eos/effects/effect5622.py
deleted file mode 100644
index 2695607ea..000000000
--- a/eos/effects/effect5622.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTorpedoROFMB
-#
-# Used by:
-# Ship: Typhoon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
-                                  "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5628.py b/eos/effects/effect5628.py
deleted file mode 100644
index 7a79cd089..000000000
--- a/eos/effects/effect5628.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCruiseMissileEMDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5629.py b/eos/effects/effect5629.py
deleted file mode 100644
index 701dcf7e5..000000000
--- a/eos/effects/effect5629.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusCruiseMissileThermDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5630.py b/eos/effects/effect5630.py
deleted file mode 100644
index 33fa55ff9..000000000
--- a/eos/effects/effect5630.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusCruiseMissileKineticDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5631.py b/eos/effects/effect5631.py
deleted file mode 100644
index d4c413987..000000000
--- a/eos/effects/effect5631.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusCruiseMissileExploDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5632.py b/eos/effects/effect5632.py
deleted file mode 100644
index 75ddfe45e..000000000
--- a/eos/effects/effect5632.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusTorpedoMissileExploDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5633.py b/eos/effects/effect5633.py
deleted file mode 100644
index d0035967d..000000000
--- a/eos/effects/effect5633.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTorpedoMissileEMDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5634.py b/eos/effects/effect5634.py
deleted file mode 100644
index ea7d1baff..000000000
--- a/eos/effects/effect5634.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusTorpedoMissileThermDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5635.py b/eos/effects/effect5635.py
deleted file mode 100644
index 34aaf86f6..000000000
--- a/eos/effects/effect5635.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusTorpedoMissileKineticDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5636.py b/eos/effects/effect5636.py
deleted file mode 100644
index 18cc901a9..000000000
--- a/eos/effects/effect5636.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileEMDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect5637.py b/eos/effects/effect5637.py
deleted file mode 100644
index d4406c6b6..000000000
--- a/eos/effects/effect5637.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusHeavyMissileThermDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5638.py b/eos/effects/effect5638.py
deleted file mode 100644
index 5e2f0da29..000000000
--- a/eos/effects/effect5638.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusHeavyMissileKineticDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5639.py b/eos/effects/effect5639.py
deleted file mode 100644
index 917596584..000000000
--- a/eos/effects/effect5639.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusHeavyMissileExploDmgMB
-#
-# Used by:
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"),
-                                    skill="Minmatar Battleship")
diff --git a/eos/effects/effect5644.py b/eos/effects/effect5644.py
deleted file mode 100644
index 991b62c44..000000000
--- a/eos/effects/effect5644.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileVelocityCC2
-#
-# Used by:
-# Ship: Cerberus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5647.py b/eos/effects/effect5647.py
deleted file mode 100644
index 74269721d..000000000
--- a/eos/effects/effect5647.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# covertOpsCloakCPUPercentRoleBonus
-#
-# Used by:
-# Ships from group: Expedition Frigate (2 of 2)
-# Ship: Astero
-# Ship: Enforcer
-# Ship: Pacifier
-# Ship: Victor
-# Ship: Victorieux Luxury Yacht
-# Ship: Virtuoso
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "cpu", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5650.py b/eos/effects/effect5650.py
deleted file mode 100644
index 651595294..000000000
--- a/eos/effects/effect5650.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipArmorResistanceAF1
-#
-# Used by:
-# Ship: Malediction
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
-    for damageType in damageTypes:
-        fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAF"),
-                               skill="Amarr Frigate")
diff --git a/eos/effects/effect5657.py b/eos/effects/effect5657.py
deleted file mode 100644
index 301cc98c4..000000000
--- a/eos/effects/effect5657.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Interceptor2ShieldResist
-#
-# Used by:
-# Ship: Raptor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    damageTypes = ("Em", "Explosive", "Kinetic", "Thermal")
-    for damageType in damageTypes:
-        fit.ship.boostItemAttr("shield{0}DamageResonance".format(damageType),
-                               ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors")
diff --git a/eos/effects/effect5673.py b/eos/effects/effect5673.py
deleted file mode 100644
index 9d4cfeb97..000000000
--- a/eos/effects/effect5673.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# interceptor2ProjectileDamage
-#
-# Used by:
-# Ship: Claw
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusInterceptor2"),
-                                  skill="Interceptors")
diff --git a/eos/effects/effect5676.py b/eos/effects/effect5676.py
deleted file mode 100644
index b471d2d1d..000000000
--- a/eos/effects/effect5676.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSmallMissileExplosionRadiusCD2
-#
-# Used by:
-# Ship: Flycatcher
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect5688.py b/eos/effects/effect5688.py
deleted file mode 100644
index af169f934..000000000
--- a/eos/effects/effect5688.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMissileVelocityAD2
-#
-# Used by:
-# Ship: Heretic
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5695.py b/eos/effects/effect5695.py
deleted file mode 100644
index 7a1492fc8..000000000
--- a/eos/effects/effect5695.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusInterdictorsArmorResist1
-#
-# Used by:
-# Ship: Heretic
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):
-        fit.ship.boostItemAttr("armor%sDamageResonance" % damageType,
-                               ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/effect57.py b/eos/effects/effect57.py
deleted file mode 100644
index 3c9aeea6d..000000000
--- a/eos/effects/effect57.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shieldCapacityMultiply
-#
-# Used by:
-# Modules from group: Capacitor Power Relay (20 of 20)
-# Modules from group: Power Diagnostic System (23 of 23)
-# Modules from group: Reactor Control Unit (22 of 22)
-# Modules named like: Flux Coil (12 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
-    # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
-    fit.ship.multiplyItemAttr("shieldCapacity", module.getModifiedItemAttr("shieldCapacityMultiplier", None))
diff --git a/eos/effects/effect5717.py b/eos/effects/effect5717.py
deleted file mode 100644
index ce351f428..000000000
--- a/eos/effects/effect5717.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# implantSetWarpSpeed
-#
-# Used by:
-# Implants named like: grade Ascendancy (12 of 12)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
-                                             "WarpSBonus", implant.getModifiedItemAttr("implantSetWarpSpeed"))
diff --git a/eos/effects/effect5721.py b/eos/effects/effect5721.py
deleted file mode 100644
index 10451c94f..000000000
--- a/eos/effects/effect5721.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMETOptimalRangePirateFaction
-#
-# Used by:
-# Ships named like: Stratios (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5722.py b/eos/effects/effect5722.py
deleted file mode 100644
index 0124b48cd..000000000
--- a/eos/effects/effect5722.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridOptimalGD1
-#
-# Used by:
-# Ship: Eris
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer")
diff --git a/eos/effects/effect5723.py b/eos/effects/effect5723.py
deleted file mode 100644
index 5107837b5..000000000
--- a/eos/effects/effect5723.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusInterdictorsMWDSigRadius2
-#
-# Used by:
-# Ships from group: Interdictor (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterdictors2"),
-                                  skill="Interdictors")
diff --git a/eos/effects/effect5724.py b/eos/effects/effect5724.py
deleted file mode 100644
index e6682472b..000000000
--- a/eos/effects/effect5724.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSHTOptimalBonusGF
-#
-# Used by:
-# Ship: Ares
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5725.py b/eos/effects/effect5725.py
deleted file mode 100644
index 3ac0e69fb..000000000
--- a/eos/effects/effect5725.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRemoteRepairAmountPirateFaction
-#
-# Used by:
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5726.py b/eos/effects/effect5726.py
deleted file mode 100644
index 680c7ef2d..000000000
--- a/eos/effects/effect5726.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusLETOptimalRangePirateFaction
-#
-# Used by:
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5733.py b/eos/effects/effect5733.py
deleted file mode 100644
index 3bffe8e41..000000000
--- a/eos/effects/effect5733.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusMaraudersHeavyMissileDamageExpRole1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect5734.py b/eos/effects/effect5734.py
deleted file mode 100644
index 68646cd8d..000000000
--- a/eos/effects/effect5734.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusMaraudersHeavyMissileDamageKinRole1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect5735.py b/eos/effects/effect5735.py
deleted file mode 100644
index 81a99b02c..000000000
--- a/eos/effects/effect5735.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusMaraudersHeavyMissileDamageEMRole1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect5736.py b/eos/effects/effect5736.py
deleted file mode 100644
index 70abcb387..000000000
--- a/eos/effects/effect5736.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusMaraudersHeavyMissileDamageThermRole1
-#
-# Used by:
-# Ship: Golem
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusViolatorsRole1"))
diff --git a/eos/effects/effect5737.py b/eos/effects/effect5737.py
deleted file mode 100644
index 26ccc7c2c..000000000
--- a/eos/effects/effect5737.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipScanProbeStrengthBonusPirateFaction
-#
-# Used by:
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5738.py b/eos/effects/effect5738.py
deleted file mode 100644
index 7a8923b45..000000000
--- a/eos/effects/effect5738.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusRemoteRepairRangePirateFaction2
-#
-# Used by:
-# Ship: Nestor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole8"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusRole8"))
diff --git a/eos/effects/effect5754.py b/eos/effects/effect5754.py
deleted file mode 100644
index fb217b93d..000000000
--- a/eos/effects/effect5754.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# overloadSelfTrackingModuleBonus
-#
-# Used by:
-# Modules named like: Tracking Computer (19 of 19)
-# Variations of module: Tracking Disruptor I (6 of 6)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxRangeBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
-    module.boostItemAttr("falloffBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
-    module.boostItemAttr("trackingSpeedBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/effect5757.py b/eos/effects/effect5757.py
deleted file mode 100644
index 378e739b1..000000000
--- a/eos/effects/effect5757.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# overloadSelfSensorModuleBonus
-#
-# Used by:
-# Modules from group: Remote Sensor Booster (8 of 8)
-# Modules from group: Sensor Booster (16 of 16)
-# Modules from group: Sensor Dampener (6 of 6)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxTargetRangeBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"))
-    module.boostItemAttr("scanResolutionBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"),
-                         stackingPenalties=True)
-
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        module.boostItemAttr(
-            "scan{}StrengthPercent".format(scanType),
-            module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"),
-            stackingPenalties=True
-        )
diff --git a/eos/effects/effect5758.py b/eos/effects/effect5758.py
deleted file mode 100644
index 67b69fc55..000000000
--- a/eos/effects/effect5758.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# overloadSelfPainterBonus
-#
-# Used by:
-# Modules from group: Target Painter (8 of 8)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("signatureRadiusBonus", module.getModifiedItemAttr("overloadPainterStrengthBonus") or 0)
diff --git a/eos/effects/effect5769.py b/eos/effects/effect5769.py
deleted file mode 100644
index 9e1ea724a..000000000
--- a/eos/effects/effect5769.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# repairDroneHullBonusBonus
-#
-# Used by:
-# Modules named like: Drone Repair Augmentor (8 of 8)
-# Skill: Repair Drone Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
-                                 "structureDamageAmount", container.getModifiedItemAttr("damageHP") * level)
diff --git a/eos/effects/effect5778.py b/eos/effects/effect5778.py
deleted file mode 100644
index 4661fbef0..000000000
--- a/eos/effects/effect5778.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileRoFMF2
-#
-# Used by:
-# Ship: Breacher
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5779.py b/eos/effects/effect5779.py
deleted file mode 100644
index abc07cbca..000000000
--- a/eos/effects/effect5779.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSPTFalloffMF2
-#
-# Used by:
-# Ship: Pacifier
-# Ship: Rifter
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect5793.py b/eos/effects/effect5793.py
deleted file mode 100644
index fbd6ae8af..000000000
--- a/eos/effects/effect5793.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ewSkillTrackingDisruptionRangeDisruptionBonus
-#
-# Used by:
-# Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Weapon Destabilization
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    for attr in ("maxRangeBonus", "falloffBonus"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                      attr, container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/effect58.py b/eos/effects/effect58.py
deleted file mode 100644
index 91f3e6ed4..000000000
--- a/eos/effects/effect58.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# capacitorCapacityMultiply
-#
-# Used by:
-# 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 (68 of 133)
-# Modules from group: Reactor Control Unit (22 of 22)
-type = "passive"
-
-
-def handler(fit, module, context):
-    # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
-    # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
-    fit.ship.multiplyItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacityMultiplier", None))
diff --git a/eos/effects/effect5802.py b/eos/effects/effect5802.py
deleted file mode 100644
index f4a0fe196..000000000
--- a/eos/effects/effect5802.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAfterburnerSpeedFactor2CB
-#
-# Used by:
-# Ship: Nightmare
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5803.py b/eos/effects/effect5803.py
deleted file mode 100644
index 27fc5822c..000000000
--- a/eos/effects/effect5803.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryDroneDamageMultiplierPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5804.py b/eos/effects/effect5804.py
deleted file mode 100644
index 8f38f24ee..000000000
--- a/eos/effects/effect5804.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneDamageMultiplierPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5805.py b/eos/effects/effect5805.py
deleted file mode 100644
index 4cfd46da4..000000000
--- a/eos/effects/effect5805.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryDroneHPPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5806.py b/eos/effects/effect5806.py
deleted file mode 100644
index bda4ffa41..000000000
--- a/eos/effects/effect5806.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryDroneArmorHpPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5807.py b/eos/effects/effect5807.py
deleted file mode 100644
index d757d2ef0..000000000
--- a/eos/effects/effect5807.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryDroneShieldHpPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5808.py b/eos/effects/effect5808.py
deleted file mode 100644
index 6fd8b4d3d..000000000
--- a/eos/effects/effect5808.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneShieldHpPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5809.py b/eos/effects/effect5809.py
deleted file mode 100644
index 244690dca..000000000
--- a/eos/effects/effect5809.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneArmorHpPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect581.py b/eos/effects/effect581.py
deleted file mode 100644
index 13126e2a5..000000000
--- a/eos/effects/effect581.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Weapon Upgrades WU (6 of 6)
-# Skill: Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "cpu", container.getModifiedItemAttr("cpuNeedBonus") * level)
diff --git a/eos/effects/effect5810.py b/eos/effects/effect5810.py
deleted file mode 100644
index c05b7da76..000000000
--- a/eos/effects/effect5810.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneHPPirateFaction
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5811.py b/eos/effects/effect5811.py
deleted file mode 100644
index 67a68211d..000000000
--- a/eos/effects/effect5811.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusKineticMissileDamageGB2
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusGB2"),
-                                    skill="Gallente Battleship")
diff --git a/eos/effects/effect5812.py b/eos/effects/effect5812.py
deleted file mode 100644
index 3903c3e7e..000000000
--- a/eos/effects/effect5812.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusThermalMissileDamageGB2
-#
-# Used by:
-# Ship: Rattlesnake
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusGB2"),
-                                    skill="Gallente Battleship")
diff --git a/eos/effects/effect5813.py b/eos/effects/effect5813.py
deleted file mode 100644
index b8c52da97..000000000
--- a/eos/effects/effect5813.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusAfterburnerSpeedFactorCF2
-#
-# Used by:
-# Ship: Imp
-# Ship: Succubus
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5814.py b/eos/effects/effect5814.py
deleted file mode 100644
index 8bd18e45a..000000000
--- a/eos/effects/effect5814.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusKineticMissileDamageGF
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5815.py b/eos/effects/effect5815.py
deleted file mode 100644
index 30d762728..000000000
--- a/eos/effects/effect5815.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusThermalMissileDamageGF
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect5816.py b/eos/effects/effect5816.py
deleted file mode 100644
index 75451999c..000000000
--- a/eos/effects/effect5816.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLightDroneDamageMultiplierPirateFaction
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5817.py b/eos/effects/effect5817.py
deleted file mode 100644
index 2511b9736..000000000
--- a/eos/effects/effect5817.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLightDroneHPPirateFaction
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5818.py b/eos/effects/effect5818.py
deleted file mode 100644
index 7f4706023..000000000
--- a/eos/effects/effect5818.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLightDroneArmorHPPirateFaction
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5819.py b/eos/effects/effect5819.py
deleted file mode 100644
index 0e7b7b147..000000000
--- a/eos/effects/effect5819.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusLightDroneShieldHPPirateFaction
-#
-# Used by:
-# Ship: Whiptail
-# Ship: Worm
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect582.py b/eos/effects/effect582.py
deleted file mode 100644
index fa0994205..000000000
--- a/eos/effects/effect582.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# rapidFiringRofBonusPostPercentSpeedLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Skill: Rapid Firing
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "speed", skill.getModifiedItemAttr("rofBonus") * skill.level)
diff --git a/eos/effects/effect5820.py b/eos/effects/effect5820.py
deleted file mode 100644
index 6a4dbfe2f..000000000
--- a/eos/effects/effect5820.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusAfterburnerSpeedFactorCC2
-#
-# Used by:
-# Ship: Fiend
-# Ship: Phantasm
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "speedFactor", module.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect5821.py b/eos/effects/effect5821.py
deleted file mode 100644
index 627698037..000000000
--- a/eos/effects/effect5821.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMediumDroneDamageMultiplierPirateFaction
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5822.py b/eos/effects/effect5822.py
deleted file mode 100644
index 3a41ee95c..000000000
--- a/eos/effects/effect5822.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMediumDroneHPPirateFaction
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5823.py b/eos/effects/effect5823.py
deleted file mode 100644
index 2d5373b43..000000000
--- a/eos/effects/effect5823.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMediumDroneArmorHPPirateFaction
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5824.py b/eos/effects/effect5824.py
deleted file mode 100644
index 593009a33..000000000
--- a/eos/effects/effect5824.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMediumDroneShieldHPPirateFaction
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect5825.py b/eos/effects/effect5825.py
deleted file mode 100644
index b4f538d2c..000000000
--- a/eos/effects/effect5825.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusKineticMissileDamageGC2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5826.py b/eos/effects/effect5826.py
deleted file mode 100644
index e939aa4e6..000000000
--- a/eos/effects/effect5826.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusThermalMissileDamageGC2
-#
-# Used by:
-# Ship: Chameleon
-# Ship: Gila
-
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5827.py b/eos/effects/effect5827.py
deleted file mode 100644
index 9ef068a92..000000000
--- a/eos/effects/effect5827.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTDOptimalBonusAF1
-#
-# Used by:
-# Ship: Crucifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5829.py b/eos/effects/effect5829.py
deleted file mode 100644
index 4f6551231..000000000
--- a/eos/effects/effect5829.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMiningDurationORE3
-#
-# Used by:
-# Ships from group: Exhumer (3 of 3)
-# Ships from group: Mining Barge (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "duration", ship.getModifiedItemAttr("shipBonusORE3"), skill="Mining Barge")
diff --git a/eos/effects/effect5832.py b/eos/effects/effect5832.py
deleted file mode 100644
index d29154f31..000000000
--- a/eos/effects/effect5832.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusMiningIceHarvestingRangeORE2
-#
-# Used by:
-# Variations of ship: Covetor (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting"),
-        "maxRange", ship.getModifiedItemAttr("shipBonusORE2"), skill="Mining Barge")
diff --git a/eos/effects/effect5839.py b/eos/effects/effect5839.py
deleted file mode 100644
index 33f370af1..000000000
--- a/eos/effects/effect5839.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBargeShieldResistance1
-#
-# Used by:
-# Ships from group: Exhumer (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "thermal", "explosive", "kinetic"):
-        fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()),
-                               ship.getModifiedItemAttr("eliteBonusBarge1"), skill="Exhumers")
diff --git a/eos/effects/effect584.py b/eos/effects/effect584.py
deleted file mode 100644
index 481ef2604..000000000
--- a/eos/effects/effect584.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
-#
-# Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
-# Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
-# Implant: Standard Cerebral Accelerator
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "damageMultiplier", implant.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect5840.py b/eos/effects/effect5840.py
deleted file mode 100644
index 6009d9542..000000000
--- a/eos/effects/effect5840.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBargeBonusMiningDurationBarge2
-#
-# Used by:
-# Ships from group: Exhumer (3 of 3)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers")
diff --git a/eos/effects/effect5852.py b/eos/effects/effect5852.py
deleted file mode 100644
index 5ca789728..000000000
--- a/eos/effects/effect5852.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusExpeditionMining1
-#
-# Used by:
-# Ship: Prospect
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", module.getModifiedItemAttr("eliteBonusExpedition1"),
-                                  skill="Expedition Frigates")
diff --git a/eos/effects/effect5853.py b/eos/effects/effect5853.py
deleted file mode 100644
index 711200e58..000000000
--- a/eos/effects/effect5853.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusExpeditionSigRadius2
-#
-# Used by:
-# Ship: Prospect
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusExpedition2"),
-                           skill="Expedition Frigates")
diff --git a/eos/effects/effect5862.py b/eos/effects/effect5862.py
deleted file mode 100644
index 855ce53f4..000000000
--- a/eos/effects/effect5862.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileEMDamageCB
-#
-# Used by:
-# Ship: Barghest
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect5863.py b/eos/effects/effect5863.py
deleted file mode 100644
index 32d10f8f5..000000000
--- a/eos/effects/effect5863.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileKinDamageCB
-#
-# Used by:
-# Ship: Barghest
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCB"),
-                                    skill="Caldari Battleship")
diff --git a/eos/effects/effect5864.py b/eos/effects/effect5864.py
deleted file mode 100644
index ccf2ec27e..000000000
--- a/eos/effects/effect5864.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileThermDamageCB
-#
-# Used by:
-# Ship: Barghest
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusCB"),
-                                    skill="Caldari Battleship")
diff --git a/eos/effects/effect5865.py b/eos/effects/effect5865.py
deleted file mode 100644
index 0d5a3a588..000000000
--- a/eos/effects/effect5865.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileExploDamageCB
-#
-# Used by:
-# Ship: Barghest
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusCB"),
-                                    skill="Caldari Battleship")
diff --git a/eos/effects/effect5866.py b/eos/effects/effect5866.py
deleted file mode 100644
index a26ffadbe..000000000
--- a/eos/effects/effect5866.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusWarpScrambleMaxRangeGB
-#
-# Used by:
-# Ship: Barghest
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship")
diff --git a/eos/effects/effect5867.py b/eos/effects/effect5867.py
deleted file mode 100644
index e7634c7ec..000000000
--- a/eos/effects/effect5867.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusMissileExplosionDelayPirateFaction2
-#
-# Used by:
-# Ship: Barghest
-# Ship: Garmur
-# Ship: Orthrus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosionDelay", ship.getModifiedItemAttr("shipBonusRole8"))
diff --git a/eos/effects/effect5868.py b/eos/effects/effect5868.py
deleted file mode 100644
index 07f5bf171..000000000
--- a/eos/effects/effect5868.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# drawbackCargoCapacity
-#
-# Used by:
-# Modules named like: Transverse Bulkhead (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("capacity", module.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect5869.py b/eos/effects/effect5869.py
deleted file mode 100644
index 826ff22ec..000000000
--- a/eos/effects/effect5869.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialWarpSpeedBonus1
-#
-# Used by:
-# Ships from group: Blockade Runner (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", ship.getModifiedItemAttr("eliteBonusIndustrial1"),
-                           skill="Transport Ships")
diff --git a/eos/effects/effect587.py b/eos/effects/effect587.py
deleted file mode 100644
index ce79c7ea8..000000000
--- a/eos/effects/effect587.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupEnergyWeapon
-#
-# Used by:
-# Skill: Surgical Strike
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon",
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect5870.py b/eos/effects/effect5870.py
deleted file mode 100644
index 594102379..000000000
--- a/eos/effects/effect5870.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldBoostCI2
-#
-# Used by:
-# Ship: Bustard
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusCI2"), skill="Caldari Industrial")
diff --git a/eos/effects/effect5871.py b/eos/effects/effect5871.py
deleted file mode 100644
index 628c261ab..000000000
--- a/eos/effects/effect5871.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldBoostMI2
-#
-# Used by:
-# Ship: Mastodon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("shipBonusMI2"), skill="Minmatar Industrial")
diff --git a/eos/effects/effect5872.py b/eos/effects/effect5872.py
deleted file mode 100644
index 172163178..000000000
--- a/eos/effects/effect5872.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusArmorRepairAI2
-#
-# Used by:
-# Ship: Impel
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusAI2"),
-                                  skill="Amarr Industrial")
diff --git a/eos/effects/effect5873.py b/eos/effects/effect5873.py
deleted file mode 100644
index 3699a8b1e..000000000
--- a/eos/effects/effect5873.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusArmorRepairGI2
-#
-# Used by:
-# Ship: Occator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGI2"),
-                                  skill="Gallente Industrial")
diff --git a/eos/effects/effect5874.py b/eos/effects/effect5874.py
deleted file mode 100644
index 1cc16aab2..000000000
--- a/eos/effects/effect5874.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialFleetCapacity1
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("fleetHangarCapacity", ship.getModifiedItemAttr("eliteBonusIndustrial1"),
-                           skill="Transport Ships")
diff --git a/eos/effects/effect588.py b/eos/effects/effect588.py
deleted file mode 100644
index 5cd9e697b..000000000
--- a/eos/effects/effect588.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupProjectileWeapon
-#
-# Used by:
-# Skill: Surgical Strike
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect5881.py b/eos/effects/effect5881.py
deleted file mode 100644
index c21754443..000000000
--- a/eos/effects/effect5881.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteIndustrialShieldResists2
-#
-# Used by:
-# Ship: Bustard
-# Ship: Mastodon
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "thermal", "explosive", "kinetic"):
-        fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()),
-                               ship.getModifiedItemAttr("eliteBonusIndustrial2"), skill="Transport Ships")
diff --git a/eos/effects/effect5888.py b/eos/effects/effect5888.py
deleted file mode 100644
index fc4298590..000000000
--- a/eos/effects/effect5888.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteIndustrialArmorResists2
-#
-# Used by:
-# Ship: Impel
-# Ship: Occator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "thermal", "explosive", "kinetic"):
-        fit.ship.boostItemAttr("armor{}DamageResonance".format(damageType.capitalize()),
-                               ship.getModifiedItemAttr("eliteBonusIndustrial2"), skill="Transport Ships")
diff --git a/eos/effects/effect5889.py b/eos/effects/effect5889.py
deleted file mode 100644
index 2bfd6fe21..000000000
--- a/eos/effects/effect5889.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialABHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "overloadSpeedFactorBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect589.py b/eos/effects/effect589.py
deleted file mode 100644
index 2ead8310e..000000000
--- a/eos/effects/effect589.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupHybridWeapon
-#
-# Used by:
-# Skill: Surgical Strike
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect5890.py b/eos/effects/effect5890.py
deleted file mode 100644
index 995b34fd8..000000000
--- a/eos/effects/effect5890.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialMWDHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "overloadSpeedFactorBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect5891.py b/eos/effects/effect5891.py
deleted file mode 100644
index c0e4dec0c..000000000
--- a/eos/effects/effect5891.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialArmorHardenerHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"),
-                                  "overloadHardeningBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect5892.py b/eos/effects/effect5892.py
deleted file mode 100644
index 7a7b3de70..000000000
--- a/eos/effects/effect5892.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialReactiveArmorHardenerHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"),
-                                  "overloadSelfDurationBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect5893.py b/eos/effects/effect5893.py
deleted file mode 100644
index a90f769ac..000000000
--- a/eos/effects/effect5893.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteIndustrialShieldHardenerHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Tactical Shield Manipulation"),
-                                  "overloadHardeningBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect5896.py b/eos/effects/effect5896.py
deleted file mode 100644
index 73766a8a8..000000000
--- a/eos/effects/effect5896.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteIndustrialShieldBoosterHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "overloadShieldBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "overloadSelfDurationBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect5899.py b/eos/effects/effect5899.py
deleted file mode 100644
index 5bb6ac8c6..000000000
--- a/eos/effects/effect5899.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteIndustrialArmorRepairHeatBonus
-#
-# Used by:
-# Ships from group: Deep Space Transport (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadArmorDamageAmount", ship.getModifiedItemAttr("roleBonusOverheatDST"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadSelfDurationBonus", ship.getModifiedItemAttr("roleBonusOverheatDST"))
diff --git a/eos/effects/effect59.py b/eos/effects/effect59.py
deleted file mode 100644
index 860f4c413..000000000
--- a/eos/effects/effect59.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# cargoCapacityMultiply
-#
-# Used by:
-# Modules from group: Expanded Cargohold (7 of 7)
-# Modules from group: Overdrive Injector System (7 of 7)
-# Modules from group: Reinforced Bulkhead (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("capacity", module.getModifiedItemAttr("cargoCapacityMultiplier"))
diff --git a/eos/effects/effect590.py b/eos/effects/effect590.py
deleted file mode 100644
index 6db95e742..000000000
--- a/eos/effects/effect590.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# energyPulseWeaponsDurationBonusPostPercentDurationLocationShipModulesRequiringEnergyPulseWeapons
-#
-# Used by:
-# Implants named like: Inherent Implants 'Squire' Energy Pulse Weapons EP (6 of 6)
-# Skill: Energy Pulse Weapons
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Pulse Weapons"),
-                                  "duration", container.getModifiedItemAttr("durationBonus") * level)
diff --git a/eos/effects/effect5900.py b/eos/effects/effect5900.py
deleted file mode 100644
index 1350c3a85..000000000
--- a/eos/effects/effect5900.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# warpSpeedAddition
-#
-# Used by:
-# Modules from group: Warp Accelerator (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("warpSpeedMultiplier", module.getModifiedItemAttr("warpSpeedAdd"))
diff --git a/eos/effects/effect5901.py b/eos/effects/effect5901.py
deleted file mode 100644
index 51ed0d68b..000000000
--- a/eos/effects/effect5901.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# roleBonusBulkheadCPU
-#
-# Used by:
-# Ships from group: Freighter (4 of 5)
-# Ships from group: Jump Freighter (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Reinforced Bulkhead",
-                                  "cpu", ship.getModifiedItemAttr("cpuNeedBonus"))
diff --git a/eos/effects/effect5911.py b/eos/effects/effect5911.py
deleted file mode 100644
index 55e0cb883..000000000
--- a/eos/effects/effect5911.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# onlineJumpDriveConsumptionAmountBonusPercentage
-#
-# Used by:
-# Modules from group: Jump Drive Economizer (3 of 3)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("jumpDriveConsumptionAmount",
-                           module.getModifiedItemAttr("consumptionQuantityBonusPercentage"), stackingPenalties=True)
diff --git a/eos/effects/effect5912.py b/eos/effects/effect5912.py
deleted file mode 100644
index af78de47a..000000000
--- a/eos/effects/effect5912.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemRemoteCapTransmitterAmount
-#
-# Used by:
-# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                     "powerTransferAmount", beacon.getModifiedItemAttr("energyTransferAmountBonus"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5913.py b/eos/effects/effect5913.py
deleted file mode 100644
index 05a3f91ab..000000000
--- a/eos/effects/effect5913.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemArmorHP
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.multiplyItemAttr("armorHP", beacon.getModifiedItemAttr("armorHPMultiplier"))
diff --git a/eos/effects/effect5914.py b/eos/effects/effect5914.py
deleted file mode 100644
index a5ff4dbb0..000000000
--- a/eos/effects/effect5914.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemEnergyNeutMultiplier
-#
-# Used by:
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                     "energyNeutralizerAmount",
-                                     beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5915.py b/eos/effects/effect5915.py
deleted file mode 100644
index 0cb05180a..000000000
--- a/eos/effects/effect5915.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemEnergyVampireMultiplier
-#
-# Used by:
-# Celestials named like: Pulsar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                     "powerTransferAmount",
-                                     beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5916.py b/eos/effects/effect5916.py
deleted file mode 100644
index 11cc26d96..000000000
--- a/eos/effects/effect5916.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageExplosiveBombs
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "explosiveDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5917.py b/eos/effects/effect5917.py
deleted file mode 100644
index 7fb67a6fb..000000000
--- a/eos/effects/effect5917.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageKineticBombs
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "kineticDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5918.py b/eos/effects/effect5918.py
deleted file mode 100644
index 675b1adb5..000000000
--- a/eos/effects/effect5918.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageThermalBombs
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "thermalDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5919.py b/eos/effects/effect5919.py
deleted file mode 100644
index e81ca6fd3..000000000
--- a/eos/effects/effect5919.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDamageEMBombs
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "emDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5920.py b/eos/effects/effect5920.py
deleted file mode 100644
index e8e4e9b0c..000000000
--- a/eos/effects/effect5920.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemAoeCloudSize
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                       "aoeCloudSize", beacon.getModifiedItemAttr("aoeCloudSizeMultiplier"))
diff --git a/eos/effects/effect5921.py b/eos/effects/effect5921.py
deleted file mode 100644
index 898111db9..000000000
--- a/eos/effects/effect5921.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemTargetPainterMultiplier
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Target Painting"),
-                                     "signatureRadiusBonus",
-                                     beacon.getModifiedItemAttr("targetPainterStrengthMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5922.py b/eos/effects/effect5922.py
deleted file mode 100644
index f45dca921..000000000
--- a/eos/effects/effect5922.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemWebifierStrengthMultiplier
-#
-# Used by:
-# Celestials named like: Black Hole Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Stasis Web",
-                                     "speedFactor", beacon.getModifiedItemAttr("stasisWebStrengthMultiplier"),
-                                     stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5923.py b/eos/effects/effect5923.py
deleted file mode 100644
index 333b3eb56..000000000
--- a/eos/effects/effect5923.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemNeutBombs
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "energyNeutralizerAmount",
-                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5924.py b/eos/effects/effect5924.py
deleted file mode 100644
index 6d04ccf96..000000000
--- a/eos/effects/effect5924.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemGravimetricECMBomb
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "scanGravimetricStrengthBonus",
-                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5925.py b/eos/effects/effect5925.py
deleted file mode 100644
index b5dfc2a98..000000000
--- a/eos/effects/effect5925.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemLadarECMBomb
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "scanLadarStrengthBonus",
-                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5926.py b/eos/effects/effect5926.py
deleted file mode 100644
index a9a15ec79..000000000
--- a/eos/effects/effect5926.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemMagnetrometricECMBomb
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "scanMagnetometricStrengthBonus",
-                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5927.py b/eos/effects/effect5927.py
deleted file mode 100644
index 444ae4fe7..000000000
--- a/eos/effects/effect5927.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# systemRadarECMBomb
-#
-# Used by:
-# Celestials named like: Red Giant Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                       "scanRadarStrengthBonus",
-                                       beacon.getModifiedItemAttr("smartbombDamageMultiplier"),
-                                       stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5929.py b/eos/effects/effect5929.py
deleted file mode 100644
index f5800c070..000000000
--- a/eos/effects/effect5929.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemDroneTracking
-#
-# Used by:
-# Celestials named like: Magnetar Effect Beacon Class (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.drones.filteredItemMultiply(lambda drone: True,
-                                    "trackingSpeed", beacon.getModifiedItemAttr("trackingSpeedMultiplier"),
-                                    stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect5934.py b/eos/effects/effect5934.py
deleted file mode 100644
index 4b3ee34cb..000000000
--- a/eos/effects/effect5934.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# warpScrambleBlockMWDWithNPCEffect
-#
-# Used by:
-# Modules named like: Warp Scrambler (27 of 27)
-from eos.const import FittingModuleState
-
-runTime = "early"
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-
-    fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
-
-    # this is such a dirty hack
-    for mod in fit.modules:
-        if not mod.isEmpty and mod.state > FittingModuleState.ONLINE and (
-                mod.item.requiresSkill("Micro Jump Drive Operation") or
-                mod.item.requiresSkill("High Speed Maneuvering")
-        ):
-            mod.state = FittingModuleState.ONLINE
-        if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > FittingModuleState.ONLINE:
-            mod.state = FittingModuleState.ONLINE
diff --git a/eos/effects/effect5938.py b/eos/effects/effect5938.py
deleted file mode 100644
index 6a10c458c..000000000
--- a/eos/effects/effect5938.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSmallMissileExplosionRadiusCF2
-#
-# Used by:
-# Ship: Crow
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-        "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect5939.py b/eos/effects/effect5939.py
deleted file mode 100644
index d272d6ec7..000000000
--- a/eos/effects/effect5939.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRocketRoFBonusAF2
-#
-# Used by:
-# Ship: Malediction
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rocket",
-                                  "speed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect5940.py b/eos/effects/effect5940.py
deleted file mode 100644
index a01812c19..000000000
--- a/eos/effects/effect5940.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusInterdictorsSHTRoF1
-#
-# Used by:
-# Ship: Eris
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors")
diff --git a/eos/effects/effect5944.py b/eos/effects/effect5944.py
deleted file mode 100644
index 37b8abfc7..000000000
--- a/eos/effects/effect5944.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileLauncherRoFAD1Fixed
-#
-# Used by:
-# Ship: Heretic
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect5945.py b/eos/effects/effect5945.py
deleted file mode 100644
index 48c480b67..000000000
--- a/eos/effects/effect5945.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloakingPrototype
-#
-# Used by:
-# Modules named like: Prototype Cloaking Device I (2 of 2)
-type = "active"
-runTime = "early"
-
-
-# TODO: Rewrite this effect
-def handler(fit, module, context):
-    # Set flag which is used to determine if ship is cloaked or not
-    # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
-    # Doesn't apply to covops cloaks
-    fit.extraAttributes["cloaked"] = True
-    # Apply speed penalty
-    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityModifier"))
diff --git a/eos/effects/effect5951.py b/eos/effects/effect5951.py
deleted file mode 100644
index a37a3e441..000000000
--- a/eos/effects/effect5951.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# drawbackWarpSpeed
-#
-# Used by:
-# Modules from group: Rig Anchor (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", module.getModifiedItemAttr("drawback"), stackingPenalties=True)
diff --git a/eos/effects/effect5956.py b/eos/effects/effect5956.py
deleted file mode 100644
index d8b44d2b8..000000000
--- a/eos/effects/effect5956.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMETDamageBonusAC2
-#
-# Used by:
-# Ship: Devoter
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect5957.py b/eos/effects/effect5957.py
deleted file mode 100644
index f671da4c6..000000000
--- a/eos/effects/effect5957.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorsMETOptimal
-#
-# Used by:
-# Ship: Devoter
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect5958.py b/eos/effects/effect5958.py
deleted file mode 100644
index e6708839e..000000000
--- a/eos/effects/effect5958.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridTrackingGC
-#
-# Used by:
-# Ship: Lachesis
-# Ship: Phobos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect5959.py b/eos/effects/effect5959.py
deleted file mode 100644
index a257bc062..000000000
--- a/eos/effects/effect5959.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusHeavyInterdictorsHybridOptimal1
-#
-# Used by:
-# Ship: Phobos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"),
-                                  skill="Heavy Interdiction Cruisers")
diff --git a/eos/effects/effect596.py b/eos/effects/effect596.py
deleted file mode 100644
index 58c331911..000000000
--- a/eos/effects/effect596.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# ammoInfluenceRange
-#
-# Used by:
-# Items from category: Charge (587 of 949)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))
diff --git a/eos/effects/effect598.py b/eos/effects/effect598.py
deleted file mode 100644
index 093953c11..000000000
--- a/eos/effects/effect598.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ammoSpeedMultiplier
-#
-# Used by:
-# Charges from group: Festival Charges (26 of 26)
-# Charges from group: Interdiction Probe (2 of 2)
-# Items from market group: Special Edition Assets > Special Edition Festival Assets (30 of 33)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("speed", module.getModifiedChargeAttr("speedMultiplier") or 1)
diff --git a/eos/effects/effect599.py b/eos/effects/effect599.py
deleted file mode 100644
index 4f4f5e86f..000000000
--- a/eos/effects/effect599.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("falloff", module.getModifiedChargeAttr("fallofMultiplier") or 1)
diff --git a/eos/effects/effect5994.py b/eos/effects/effect5994.py
deleted file mode 100644
index cdf18fee6..000000000
--- a/eos/effects/effect5994.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# resistanceKillerHullAll
-#
-# Used by:
-# Modules named like: Polarized (12 of 18)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
-        tgtAttr = '{}DamageResonance'.format(dmgType)
-        fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr("resistanceKillerHull"))
diff --git a/eos/effects/effect5995.py b/eos/effects/effect5995.py
deleted file mode 100644
index c89b4d310..000000000
--- a/eos/effects/effect5995.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# resistanceKillerShieldArmorAll
-#
-# Used by:
-# Modules named like: Polarized (12 of 18)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for layer in ('armor', 'shield'):
-        for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
-            tgtAttr = '{}{}DamageResonance'.format(layer, dmgType.capitalize())
-            fit.ship.forceItemAttr(tgtAttr, module.getModifiedItemAttr("resistanceKiller"))
diff --git a/eos/effects/effect5998.py b/eos/effects/effect5998.py
deleted file mode 100644
index 92df1ab36..000000000
--- a/eos/effects/effect5998.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# freighterSMACapacityBonusO1
-#
-# Used by:
-# Ship: Bowhead
-type = "passive"
-
-
-def handler(fit, ship, context):
-    # todo: stacking?
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusO2"), skill="ORE Freighter",
-                           stackingPenalties=True)
diff --git a/eos/effects/effect60.py b/eos/effects/effect60.py
deleted file mode 100644
index 0b7618e97..000000000
--- a/eos/effects/effect60.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureHPMultiply
-#
-# Used by:
-# Modules from group: Nanofiber Internal Structure (7 of 7)
-# Modules from group: Reinforced Bulkhead (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("hp", module.getModifiedItemAttr("structureHPMultiplier"))
diff --git a/eos/effects/effect600.py b/eos/effects/effect600.py
deleted file mode 100644
index 95033d743..000000000
--- a/eos/effects/effect600.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# ammoTrackingMultiplier
-#
-# Used by:
-# Items from category: Charge (182 of 949)
-# Charges from group: Projectile Ammo (128 of 128)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("trackingSpeed", module.getModifiedChargeAttr("trackingSpeedMultiplier"))
diff --git a/eos/effects/effect6001.py b/eos/effects/effect6001.py
deleted file mode 100644
index 740a25522..000000000
--- a/eos/effects/effect6001.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# freighterAgilityBonus2O2
-#
-# Used by:
-# Ship: Bowhead
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("shipMaintenanceBayCapacity", ship.getModifiedItemAttr("freighterBonusO1"),
-                           skill="ORE Freighter")
diff --git a/eos/effects/effect6006.py b/eos/effects/effect6006.py
deleted file mode 100644
index ce45c042a..000000000
--- a/eos/effects/effect6006.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSETDamageAmarrTacticalDestroyer1
-#
-# Used by:
-# Ship: Confessor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr1"),
-                                  skill="Amarr Tactical Destroyer")
diff --git a/eos/effects/effect6007.py b/eos/effects/effect6007.py
deleted file mode 100644
index 3cf50a439..000000000
--- a/eos/effects/effect6007.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSETCapNeedAmarrTacticalDestroyer2
-#
-# Used by:
-# Ship: Confessor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr2"),
-                                  skill="Amarr Tactical Destroyer")
diff --git a/eos/effects/effect6008.py b/eos/effects/effect6008.py
deleted file mode 100644
index 60007905d..000000000
--- a/eos/effects/effect6008.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeatDamageAmarrTacticalDestroyer3
-#
-# Used by:
-# Ship: Confessor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr3"),
-                                  skill="Amarr Tactical Destroyer")
diff --git a/eos/effects/effect6009.py b/eos/effects/effect6009.py
deleted file mode 100644
index b78379d9a..000000000
--- a/eos/effects/effect6009.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# probeLauncherCPUPercentRoleBonusT3
-#
-# Used by:
-# Ships from group: Strategic Cruiser (4 of 4)
-# Ships from group: Tactical Destroyer (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"), "cpu", src.getModifiedItemAttr("roleBonusT3ProbeCPU"))
diff --git a/eos/effects/effect6010.py b/eos/effects/effect6010.py
deleted file mode 100644
index d6f46f428..000000000
--- a/eos/effects/effect6010.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipModeMaxTargetRangePostDiv
-#
-# Used by:
-# Modules named like: Sharpshooter Mode (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr(
-        "maxTargetRange",
-        1 / module.getModifiedItemAttr("modeMaxTargetRangePostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6011.py b/eos/effects/effect6011.py
deleted file mode 100644
index 4279bc167..000000000
--- a/eos/effects/effect6011.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSETOptimalRangePostDiv
-#
-# Used by:
-# Module: Confessor Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-        "maxRange",
-        1 / module.getModifiedItemAttr("modeMaxRangePostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6012.py b/eos/effects/effect6012.py
deleted file mode 100644
index 544eac1b2..000000000
--- a/eos/effects/effect6012.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeScanStrengthPostDiv
-#
-# Used by:
-# Modules named like: Sharpshooter Mode (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.multiplyItemAttr(
-            "scan{}Strength".format(scanType),
-            1 / (module.getModifiedItemAttr("mode{}StrengthPostDiv".format(scanType)) or 1),
-            stackingPenalties=True,
-            penaltyGroup="postDiv"
-        )
diff --git a/eos/effects/effect6014.py b/eos/effects/effect6014.py
deleted file mode 100644
index 7d3b69001..000000000
--- a/eos/effects/effect6014.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# modeSigRadiusPostDiv
-#
-# Used by:
-# Module: Confessor Defense Mode
-# Module: Jackdaw Defense Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("signatureRadius", 1 / module.getModifiedItemAttr("modeSignatureRadiusPostDiv"),
-                              stackingPenalties=True, penaltyGroup="postDiv")
diff --git a/eos/effects/effect6015.py b/eos/effects/effect6015.py
deleted file mode 100644
index f6a744c4d..000000000
--- a/eos/effects/effect6015.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# modeArmorResonancePostDiv
-#
-# Used by:
-# Modules named like: Defense Mode (3 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    for srcResType, tgtResType in (
-            ("Em", "Em"),
-            ("Explosive", "Explosive"),
-            ("Kinetic", "Kinetic"),
-            ("Thermic", "Thermal")
-    ):
-        fit.ship.multiplyItemAttr(
-            "armor{0}DamageResonance".format(tgtResType),
-            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType)),
-            stackingPenalties=True,
-            penaltyGroup="postDiv"
-        )
diff --git a/eos/effects/effect6016.py b/eos/effects/effect6016.py
deleted file mode 100644
index 485100a7a..000000000
--- a/eos/effects/effect6016.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# modeAgilityPostDiv
-#
-# Used by:
-# Modules named like: Propulsion Mode (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr(
-        "agility",
-        1 / module.getModifiedItemAttr("modeAgilityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6017.py b/eos/effects/effect6017.py
deleted file mode 100644
index 7a563dcef..000000000
--- a/eos/effects/effect6017.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# modeVelocityPostDiv
-#
-# Used by:
-# Module: Jackdaw Propulsion Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr(
-        "maxVelocity",
-        1 / module.getModifiedItemAttr("modeVelocityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect602.py b/eos/effects/effect602.py
deleted file mode 100644
index 1f360a87a..000000000
--- a/eos/effects/effect602.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipPTurretSpeedBonusMC
-#
-# Used by:
-# Variations of ship: Rupture (3 of 3)
-# Variations of ship: Stabber (3 of 3)
-# Ship: Enforcer
-# Ship: Huginn
-# Ship: Scythe Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6020.py b/eos/effects/effect6020.py
deleted file mode 100644
index 9f7dab064..000000000
--- a/eos/effects/effect6020.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalRS3
-#
-# Used by:
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6021.py b/eos/effects/effect6021.py
deleted file mode 100644
index 670f0c701..000000000
--- a/eos/effects/effect6021.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalRS3
-#
-# Used by:
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6025.py b/eos/effects/effect6025.py
deleted file mode 100644
index 921c8d7d2..000000000
--- a/eos/effects/effect6025.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteReconBonusMHTOptimalRange1
-#
-# Used by:
-# Ship: Lachesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect6027.py b/eos/effects/effect6027.py
deleted file mode 100644
index 7d66fc0c5..000000000
--- a/eos/effects/effect6027.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteReconBonusMPTdamage1
-#
-# Used by:
-# Ship: Huginn
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusReconShip1"),
-                                  skill="Recon Ships")
diff --git a/eos/effects/effect6032.py b/eos/effects/effect6032.py
deleted file mode 100644
index 54897ba12..000000000
--- a/eos/effects/effect6032.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# remoteCapacitorTransmitterPowerNeedBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (3 of 7)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "power", ship.getModifiedItemAttr("powerTransferPowerNeedBonus"))
diff --git a/eos/effects/effect6036.py b/eos/effects/effect6036.py
deleted file mode 100644
index 30b0d22fb..000000000
--- a/eos/effects/effect6036.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeatDamageMinmatarTacticalDestroyer3
-#
-# Used by:
-# Ship: Svipul
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar3"),
-                                  skill="Minmatar Tactical Destroyer")
diff --git a/eos/effects/effect6037.py b/eos/effects/effect6037.py
deleted file mode 100644
index 9c435c7de..000000000
--- a/eos/effects/effect6037.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSPTDamageMinmatarTacticalDestroyer1
-#
-# Used by:
-# Ship: Svipul
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar1"),
-                                  skill="Minmatar Tactical Destroyer")
diff --git a/eos/effects/effect6038.py b/eos/effects/effect6038.py
deleted file mode 100644
index 0668d5b00..000000000
--- a/eos/effects/effect6038.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSPTOptimalMinmatarTacticalDestroyer2
-#
-# Used by:
-# Ship: Svipul
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar2"),
-                                  skill="Minmatar Tactical Destroyer")
diff --git a/eos/effects/effect6039.py b/eos/effects/effect6039.py
deleted file mode 100644
index 6e3563316..000000000
--- a/eos/effects/effect6039.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSPTTrackingPostDiv
-#
-# Used by:
-# Module: Svipul Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-        "trackingSpeed",
-        1 / module.getModifiedItemAttr("modeTrackingPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect604.py b/eos/effects/effect604.py
deleted file mode 100644
index 7c138ffe0..000000000
--- a/eos/effects/effect604.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipPTspeedBonusMB2
-#
-# Used by:
-# Variations of ship: Tempest (4 of 4)
-# Ship: Maelstrom
-# Ship: Marshal
-# Ship: Panther
-# Ship: Typhoon Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusMB2"), skill="Minmatar Battleship")
diff --git a/eos/effects/effect6040.py b/eos/effects/effect6040.py
deleted file mode 100644
index f1aeca8eb..000000000
--- a/eos/effects/effect6040.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# modeMWDSigRadiusPostDiv
-#
-# Used by:
-# Module: Svipul Defense Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-        "signatureRadiusBonus",
-        1 / module.getModifiedItemAttr("modeMWDSigPenaltyPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6041.py b/eos/effects/effect6041.py
deleted file mode 100644
index 7213168b0..000000000
--- a/eos/effects/effect6041.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# modeShieldResonancePostDiv
-#
-# Used by:
-# Module: Jackdaw Defense Mode
-# Module: Svipul Defense Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    for srcResType, tgtResType in (
-            ("Em", "Em"),
-            ("Explosive", "Explosive"),
-            ("Kinetic", "Kinetic"),
-            ("Thermic", "Thermal")
-    ):
-        fit.ship.multiplyItemAttr(
-            "shield{0}DamageResonance".format(tgtResType),
-            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType)),
-            stackingPenalties=True,
-            penaltyGroup="postDiv"
-        )
diff --git a/eos/effects/effect6045.py b/eos/effects/effect6045.py
deleted file mode 100644
index fde740a9a..000000000
--- a/eos/effects/effect6045.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryDamageMultiplierGC3
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6046.py b/eos/effects/effect6046.py
deleted file mode 100644
index b2545b29f..000000000
--- a/eos/effects/effect6046.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryHPGC3
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6047.py b/eos/effects/effect6047.py
deleted file mode 100644
index e5795c26f..000000000
--- a/eos/effects/effect6047.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryArmorHPGC3
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6048.py b/eos/effects/effect6048.py
deleted file mode 100644
index 6161d241f..000000000
--- a/eos/effects/effect6048.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSentryShieldHPGC3
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6051.py b/eos/effects/effect6051.py
deleted file mode 100644
index c25e35e5d..000000000
--- a/eos/effects/effect6051.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusLightDroneDamageMultiplierGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6052.py b/eos/effects/effect6052.py
deleted file mode 100644
index df28d53e0..000000000
--- a/eos/effects/effect6052.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMediumDroneDamageMultiplierGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6053.py b/eos/effects/effect6053.py
deleted file mode 100644
index f144bd698..000000000
--- a/eos/effects/effect6053.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneDamageMultiplierGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6054.py b/eos/effects/effect6054.py
deleted file mode 100644
index 8ddebf251..000000000
--- a/eos/effects/effect6054.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6055.py b/eos/effects/effect6055.py
deleted file mode 100644
index 296ebfce8..000000000
--- a/eos/effects/effect6055.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneArmorHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6056.py b/eos/effects/effect6056.py
deleted file mode 100644
index 82e112d19..000000000
--- a/eos/effects/effect6056.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyDroneShieldHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6057.py b/eos/effects/effect6057.py
deleted file mode 100644
index 3e2e48409..000000000
--- a/eos/effects/effect6057.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMediumDroneShieldHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6058.py b/eos/effects/effect6058.py
deleted file mode 100644
index d3237a25b..000000000
--- a/eos/effects/effect6058.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMediumDroneArmorHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6059.py b/eos/effects/effect6059.py
deleted file mode 100644
index 719b2b507..000000000
--- a/eos/effects/effect6059.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusMediumDroneHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6060.py b/eos/effects/effect6060.py
deleted file mode 100644
index 886f429a5..000000000
--- a/eos/effects/effect6060.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusLightDroneHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6061.py b/eos/effects/effect6061.py
deleted file mode 100644
index 244594dd1..000000000
--- a/eos/effects/effect6061.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusLightDroneArmorHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6062.py b/eos/effects/effect6062.py
deleted file mode 100644
index 5cead50c6..000000000
--- a/eos/effects/effect6062.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusLightDroneShieldHPGC2
-#
-# Used by:
-# Ship: Ishtar
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect6063.py b/eos/effects/effect6063.py
deleted file mode 100644
index 11b5faa28..000000000
--- a/eos/effects/effect6063.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# entosisLink
-#
-# Used by:
-# Modules from group: Entosis Link (6 of 6)
-type = "active"
-
-
-def handler(fit, module, context):
-    fit.ship.forceItemAttr("disallowAssistance", module.getModifiedItemAttr("disallowAssistance"))
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.boostItemAttr(
-            "scan{}Strength".format(scanType),
-            module.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-            stackingPenalties=True
-        )
diff --git a/eos/effects/effect607.py b/eos/effects/effect607.py
deleted file mode 100644
index cb53716b2..000000000
--- a/eos/effects/effect607.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# cloaking
-#
-# Used by:
-# Modules from group: Cloaking Device (10 of 14)
-type = "active"
-runTime = "early"
-
-
-# TODO: Rewrite this effect
-def handler(fit, module, context):
-    # Set flag which is used to determine if ship is cloaked or not
-    # This is used to apply cloak-only bonuses, like Black Ops' speed bonus
-    # Doesn't apply to covops cloaks
-    fit.extraAttributes["cloaked"] = True
-    # Apply speed penalty
-    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityModifier"))
diff --git a/eos/effects/effect6076.py b/eos/effects/effect6076.py
deleted file mode 100644
index 994a5bf74..000000000
--- a/eos/effects/effect6076.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeMissileVelocityPostDiv
-#
-# Used by:
-# Module: Jackdaw Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeMultiply(
-        lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-        "maxVelocity",
-        1 / module.getModifiedItemAttr("modeMaxRangePostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6077.py b/eos/effects/effect6077.py
deleted file mode 100644
index afe1aa44d..000000000
--- a/eos/effects/effect6077.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeatDamageCaldariTacticalDestroyer3
-#
-# Used by:
-# Ship: Jackdaw
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari3"),
-                                  skill="Caldari Tactical Destroyer")
diff --git a/eos/effects/effect6083.py b/eos/effects/effect6083.py
deleted file mode 100644
index 3a21076cc..000000000
--- a/eos/effects/effect6083.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipSmallMissileDmgPirateFaction
-#
-# Used by:
-# Ship: Jackdaw
-# Ship: Sunesis
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "explosive", "kinetic", "thermal"):
-        fit.modules.filteredChargeBoost(
-            lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-            "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect6085.py b/eos/effects/effect6085.py
deleted file mode 100644
index f0d7c2926..000000000
--- a/eos/effects/effect6085.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileRoFCaldariTacticalDestroyer1
-#
-# Used by:
-# Ship: Jackdaw
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari1"),
-                                  skill="Caldari Tactical Destroyer")
diff --git a/eos/effects/effect6088.py b/eos/effects/effect6088.py
deleted file mode 100644
index 12e3673b4..000000000
--- a/eos/effects/effect6088.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusHeavyAssaultMissileAllDamageMC2
-#
-# Used by:
-# Ship: Rapier
-# Ship: Scythe Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "explosive", "kinetic", "thermal"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"),
-                                        skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6093.py b/eos/effects/effect6093.py
deleted file mode 100644
index cd0e38e60..000000000
--- a/eos/effects/effect6093.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusHeavyMissileAllDamageMC2
-#
-# Used by:
-# Ship: Rapier
-# Ship: Scythe Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "explosive", "kinetic", "thermal"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"),
-                                        skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6096.py b/eos/effects/effect6096.py
deleted file mode 100644
index c00eb3939..000000000
--- a/eos/effects/effect6096.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusLightMissileAllDamageMC2
-#
-# Used by:
-# Ship: Rapier
-# Ship: Scythe Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    for damageType in ("em", "explosive", "kinetic", "thermal"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"),
-                                        skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6098.py b/eos/effects/effect6098.py
deleted file mode 100644
index 7dbed2442..000000000
--- a/eos/effects/effect6098.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileReloadTimeCaldariTacticalDestroyer2
-#
-# Used by:
-# Ship: Jackdaw
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "reloadTime", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari2"),
-                                  skill="Caldari Tactical Destroyer")
diff --git a/eos/effects/effect61.py b/eos/effects/effect61.py
deleted file mode 100644
index ea3811650..000000000
--- a/eos/effects/effect61.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# agilityBonus
-#
-# Used by:
-# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("agility", src.getModifiedItemAttr("agilityBonusAdd"))
diff --git a/eos/effects/effect6104.py b/eos/effects/effect6104.py
deleted file mode 100644
index fae2e74ec..000000000
--- a/eos/effects/effect6104.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# entosisDurationMultiply
-#
-# Used by:
-# Items from market group: Ships > Capital Ships (31 of 40)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Infomorph Psychology"),
-                                     "duration", ship.getModifiedItemAttr("entosisDurationMultiplier") or 1)
diff --git a/eos/effects/effect6110.py b/eos/effects/effect6110.py
deleted file mode 100644
index f04d47292..000000000
--- a/eos/effects/effect6110.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileVelocityBonusOnline
-#
-# Used by:
-# Modules from group: Missile Guidance Enhancer (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", module.getModifiedItemAttr("missileVelocityBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6111.py b/eos/effects/effect6111.py
deleted file mode 100644
index a23f9a2fe..000000000
--- a/eos/effects/effect6111.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileExplosionDelayBonusOnline
-#
-# Used by:
-# Modules from group: Missile Guidance Enhancer (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosionDelay", module.getModifiedItemAttr("explosionDelayBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6112.py b/eos/effects/effect6112.py
deleted file mode 100644
index bbc42b61b..000000000
--- a/eos/effects/effect6112.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileAOECloudSizeBonusOnline
-#
-# Used by:
-# Modules from group: Missile Guidance Enhancer (3 of 3)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", module.getModifiedItemAttr("aoeCloudSizeBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6113.py b/eos/effects/effect6113.py
deleted file mode 100644
index 03ddd6715..000000000
--- a/eos/effects/effect6113.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileAOEVelocityBonusOnline
-#
-# Used by:
-# Modules from group: Missile Guidance Enhancer (3 of 3)
-# Module: ML-EKP 'Polybolos' Ballistic Control System
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeVelocity", module.getModifiedItemAttr("aoeVelocityBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6128.py b/eos/effects/effect6128.py
deleted file mode 100644
index 12be7588b..000000000
--- a/eos/effects/effect6128.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptMissileGuidanceComputerAOECloudSizeBonusBonus
-#
-# Used by:
-# Charges from group: Tracking Script (2 of 2)
-# Charges named like: Missile Script (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("aoeCloudSizeBonus", module.getModifiedChargeAttr("aoeCloudSizeBonusBonus"))
diff --git a/eos/effects/effect6129.py b/eos/effects/effect6129.py
deleted file mode 100644
index 800c91a08..000000000
--- a/eos/effects/effect6129.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptMissileGuidanceComputerAOEVelocityBonusBonus
-#
-# Used by:
-# Charges from group: Tracking Script (2 of 2)
-# Charges named like: Missile Script (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("aoeVelocityBonus", module.getModifiedChargeAttr("aoeVelocityBonusBonus"))
diff --git a/eos/effects/effect6130.py b/eos/effects/effect6130.py
deleted file mode 100644
index 9867c0a84..000000000
--- a/eos/effects/effect6130.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# scriptMissileGuidanceComputerMissileVelocityBonusBonus
-#
-# Used by:
-# Charges named like: Missile Script (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("missileVelocityBonus", module.getModifiedChargeAttr("missileVelocityBonusBonus"))
diff --git a/eos/effects/effect6131.py b/eos/effects/effect6131.py
deleted file mode 100644
index 5f6b2e00b..000000000
--- a/eos/effects/effect6131.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# scriptMissileGuidanceComputerExplosionDelayBonusBonus
-#
-# Used by:
-# Charges named like: Missile Script (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("explosionDelayBonus", module.getModifiedChargeAttr("explosionDelayBonusBonus"))
diff --git a/eos/effects/effect6135.py b/eos/effects/effect6135.py
deleted file mode 100644
index a276fe2db..000000000
--- a/eos/effects/effect6135.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# missileGuidanceComputerBonus4
-#
-# Used by:
-# Modules from group: Missile Guidance Computer (3 of 3)
-type = "active"
-
-
-def handler(fit, container, context):
-    for srcAttr, tgtAttr in (
-            ("aoeCloudSizeBonus", "aoeCloudSize"),
-            ("aoeVelocityBonus", "aoeVelocity"),
-            ("missileVelocityBonus", "maxVelocity"),
-            ("explosionDelayBonus", "explosionDelay"),
-    ):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                        tgtAttr, container.getModifiedItemAttr(srcAttr),
-                                        stackingPenalties=True)
diff --git a/eos/effects/effect6144.py b/eos/effects/effect6144.py
deleted file mode 100644
index f92b98aea..000000000
--- a/eos/effects/effect6144.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# overloadSelfMissileGuidanceBonus5
-#
-# Used by:
-# Modules from group: Missile Guidance Computer (3 of 3)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    for tgtAttr in (
-            "aoeCloudSizeBonus",
-            "explosionDelayBonus",
-            "missileVelocityBonus",
-            "maxVelocityModifier",
-            "aoeVelocityBonus"
-    ):
-        module.boostItemAttr(tgtAttr, module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/effect6148.py b/eos/effects/effect6148.py
deleted file mode 100644
index b5854c3fb..000000000
--- a/eos/effects/effect6148.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHeatDamageGallenteTacticalDestroyer3
-#
-# Used by:
-# Ship: Hecate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
-                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente3"),
-                                  skill="Gallente Tactical Destroyer")
diff --git a/eos/effects/effect6149.py b/eos/effects/effect6149.py
deleted file mode 100644
index 64e164ab9..000000000
--- a/eos/effects/effect6149.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSHTRoFGallenteTacticalDestroyer1
-#
-# Used by:
-# Ship: Hecate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente1"),
-                                  skill="Gallente Tactical Destroyer")
diff --git a/eos/effects/effect6150.py b/eos/effects/effect6150.py
deleted file mode 100644
index dfcd8d7f2..000000000
--- a/eos/effects/effect6150.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipSHTTrackingGallenteTacticalDestroyer2
-#
-# Used by:
-# Ship: Hecate
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente2"),
-                                  skill="Gallente Tactical Destroyer")
diff --git a/eos/effects/effect6151.py b/eos/effects/effect6151.py
deleted file mode 100644
index ae13c4b7d..000000000
--- a/eos/effects/effect6151.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# modeHullResonancePostDiv
-#
-# Used by:
-# Module: Hecate Defense Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    for srcResType, tgtResType in (
-            ("Em", "em"),
-            ("Explosive", "explosive"),
-            ("Kinetic", "kinetic"),
-            ("Thermic", "thermal")
-    ):
-        fit.ship.multiplyItemAttr(
-            "{0}DamageResonance".format(tgtResType),
-            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType))
-        )
diff --git a/eos/effects/effect6152.py b/eos/effects/effect6152.py
deleted file mode 100644
index 724cad5de..000000000
--- a/eos/effects/effect6152.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSHTOptimalRangePostDiv
-#
-# Used by:
-# Module: Hecate Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-        "maxRange",
-        1 / module.getModifiedItemAttr("modeMaxRangePostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6153.py b/eos/effects/effect6153.py
deleted file mode 100644
index 6d16ea720..000000000
--- a/eos/effects/effect6153.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modeMWDCapPostDiv
-#
-# Used by:
-# Module: Hecate Propulsion Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-        "capacitorNeed",
-        1 / module.getModifiedItemAttr("modeMWDCapPostDiv")
-    )
diff --git a/eos/effects/effect6154.py b/eos/effects/effect6154.py
deleted file mode 100644
index ad9ddf55e..000000000
--- a/eos/effects/effect6154.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# modeMWDBoostPostDiv
-#
-# Used by:
-# Module: Hecate Propulsion Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-        "speedFactor",
-        1 / module.getModifiedItemAttr("modeMWDVelocityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6155.py b/eos/effects/effect6155.py
deleted file mode 100644
index 58f61b557..000000000
--- a/eos/effects/effect6155.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# modeArmorRepDurationPostDiv
-#
-# Used by:
-# Module: Hecate Defense Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Repair Systems"),
-        "duration",
-        1 / module.getModifiedItemAttr("modeArmorRepDurationPostDiv")
-    )
diff --git a/eos/effects/effect6163.py b/eos/effects/effect6163.py
deleted file mode 100644
index c8744ddcf..000000000
--- a/eos/effects/effect6163.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# passiveSpeedLimit
-#
-# Used by:
-# Modules from group: Entosis Link (6 of 6)
-runtime = "late"
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.extraAttributes['speedLimit'] = src.getModifiedItemAttr("speedLimit")
diff --git a/eos/effects/effect6164.py b/eos/effects/effect6164.py
deleted file mode 100644
index 133fb7e7a..000000000
--- a/eos/effects/effect6164.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# systemMaxVelocityPercentage
-#
-# Used by:
-# Celestials named like: Drifter Incursion (6 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    fit.ship.boostItemAttr("maxVelocity", beacon.getModifiedItemAttr("maxVelocityMultiplier"), stackingPenalties=True)
diff --git a/eos/effects/effect6166.py b/eos/effects/effect6166.py
deleted file mode 100644
index 0a1050711..000000000
--- a/eos/effects/effect6166.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipBonusWDFGnullPenalties
-#
-# Used by:
-# Ship: Fiend
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
-                                  "speedFactorBonus", ship.getModifiedItemAttr("shipBonusAT"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
-                                  "speedBoostFactorBonus", ship.getModifiedItemAttr("shipBonusAT"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Propulsion Jamming"),
-                                  "massBonusPercentage", ship.getModifiedItemAttr("shipBonusAT"))
diff --git a/eos/effects/effect6170.py b/eos/effects/effect6170.py
deleted file mode 100644
index a382ed70a..000000000
--- a/eos/effects/effect6170.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# entosisCPUPenalty
-#
-# Used by:
-# Ships from group: Interceptor (10 of 10)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Infomorph Psychology"),
-                                     "entosisCPUAdd", ship.getModifiedItemAttr("entosisCPUPenalty"))
diff --git a/eos/effects/effect6171.py b/eos/effects/effect6171.py
deleted file mode 100644
index a29e38f85..000000000
--- a/eos/effects/effect6171.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# entosisCPUAddition
-#
-# Used by:
-# Modules from group: Entosis Link (6 of 6)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.increaseItemAttr("cpu", module.getModifiedItemAttr("entosisCPUAdd"))
diff --git a/eos/effects/effect6172.py b/eos/effects/effect6172.py
deleted file mode 100644
index 3d0e9e2aa..000000000
--- a/eos/effects/effect6172.py
+++ /dev/null
@@ -1,12 +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"))
diff --git a/eos/effects/effect6173.py b/eos/effects/effect6173.py
deleted file mode 100644
index 268704d82..000000000
--- a/eos/effects/effect6173.py
+++ /dev/null
@@ -1,13 +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"))
diff --git a/eos/effects/effect6174.py b/eos/effects/effect6174.py
deleted file mode 100644
index 57f8ebe4a..000000000
--- a/eos/effects/effect6174.py
+++ /dev/null
@@ -1,12 +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"))
diff --git a/eos/effects/effect6175.py b/eos/effects/effect6175.py
deleted file mode 100644
index a095cac39..000000000
--- a/eos/effects/effect6175.py
+++ /dev/null
@@ -1,11 +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"))
diff --git a/eos/effects/effect6176.py b/eos/effects/effect6176.py
deleted file mode 100644
index 5d666f43a..000000000
--- a/eos/effects/effect6176.py
+++ /dev/null
@@ -1,11 +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"))
diff --git a/eos/effects/effect6177.py b/eos/effects/effect6177.py
deleted file mode 100644
index 825685ea1..000000000
--- a/eos/effects/effect6177.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridDmg1CBC2
-#
-# Used by:
-# Ship: Ferox
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2"),
-                                  skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect6178.py b/eos/effects/effect6178.py
deleted file mode 100644
index e8cd08be7..000000000
--- a/eos/effects/effect6178.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusProjectileTrackingMBC2
-#
-# Used by:
-# Ship: Hurricane Fleet Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMBC2"),
-                                  skill="Minmatar Battlecruiser")
diff --git a/eos/effects/effect6184.py b/eos/effects/effect6184.py
deleted file mode 100644
index 6b414da7e..000000000
--- a/eos/effects/effect6184.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# shipModuleRemoteCapacitorTransmitter
-#
-# Used by:
-# Modules from group: Remote Capacitor Transmitter (41 of 41)
-
-
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, src, context, **kwargs):
-    if "projected" in context:
-        amount = src.getModifiedItemAttr("powerTransferAmount")
-        duration = src.getModifiedItemAttr("duration")
-
-        if 'effect' in kwargs:
-            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.addDrain(src, duration, -amount, 0)
diff --git a/eos/effects/effect6185.py b/eos/effects/effect6185.py
deleted file mode 100644
index 94839fdff..000000000
--- a/eos/effects/effect6185.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModuleRemoteHullRepairer
-#
-# Used by:
-# Modules from group: Remote Hull Repairer (8 of 8)
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-    bonus = module.getModifiedItemAttr("structureDamageAmount")
-    duration = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("hullRepair", bonus / duration)
diff --git a/eos/effects/effect6186.py b/eos/effects/effect6186.py
deleted file mode 100644
index 7c62a32c4..000000000
--- a/eos/effects/effect6186.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipModuleRemoteShieldBooster
-#
-# Used by:
-# Modules from group: Remote Shield Booster (38 of 38)
-type = "projected", "active"
-
-
-def handler(fit, container, context, **kwargs):
-    if "projected" in context:
-        bonus = container.getModifiedItemAttr("shieldBonus")
-        duration = container.getModifiedItemAttr("duration") / 1000.0
-        fit.extraAttributes.increase("shieldRepair", bonus / duration, **kwargs)
diff --git a/eos/effects/effect6187.py b/eos/effects/effect6187.py
deleted file mode 100644
index 2ee279d44..000000000
--- a/eos/effects/effect6187.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# energyNeutralizerFalloff
-#
-# Used by:
-# Modules from group: Energy Neutralizer (54 of 54)
-from eos.const import FittingModuleState
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "active", "projected"
-
-
-def handler(fit, src, context, **kwargs):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= FittingModuleState.ACTIVE) or
-                                   hasattr(src, "amountActive")):
-        amount = src.getModifiedItemAttr("energyNeutralizerAmount")
-
-        if 'effect' in kwargs:
-            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        time = src.getModifiedItemAttr("duration")
-
-        fit.addDrain(src, time, amount, 0)
diff --git a/eos/effects/effect6188.py b/eos/effects/effect6188.py
deleted file mode 100644
index 220792812..000000000
--- a/eos/effects/effect6188.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipModuleRemoteArmorRepairer
-#
-# Used by:
-# Modules from group: Remote Armor Repairer (39 of 39)
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, container, context, **kwargs):
-    if "projected" in context:
-        bonus = container.getModifiedItemAttr("armorDamageAmount")
-        duration = container.getModifiedItemAttr("duration") / 1000.0
-        rps = bonus / duration
-        fit.extraAttributes.increase("armorRepair", rps)
-        fit.extraAttributes.increase("armorRepairPreSpool", rps)
-        fit.extraAttributes.increase("armorRepairFullSpool", rps)
diff --git a/eos/effects/effect6195.py b/eos/effects/effect6195.py
deleted file mode 100644
index ff05639dc..000000000
--- a/eos/effects/effect6195.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# expeditionFrigateShieldResistance1
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
-                           skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
-                           skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
-                           skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"),
-                           skill="Expedition Frigates")
diff --git a/eos/effects/effect6196.py b/eos/effects/effect6196.py
deleted file mode 100644
index 65889bd4d..000000000
--- a/eos/effects/effect6196.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# expeditionFrigateBonusIceHarvestingCycleTime2
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration",
-                                  src.getModifiedItemAttr("eliteBonusExpedition2"), skill="Expedition Frigates")
diff --git a/eos/effects/effect6197.py b/eos/effects/effect6197.py
deleted file mode 100644
index 2d6414e61..000000000
--- a/eos/effects/effect6197.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# energyNosferatuFalloff
-#
-# Used by:
-# Modules from group: Energy Nosferatu (54 of 54)
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "active", "projected"
-runTime = "late"
-
-
-def handler(fit, src, context, **kwargs):
-    amount = src.getModifiedItemAttr("powerTransferAmount")
-    time = src.getModifiedItemAttr("duration")
-
-    if 'effect' in kwargs and "projected" in context:
-        amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-    if "projected" in context:
-        fit.addDrain(src, time, amount, 0)
-    elif "module" in context:
-        src.itemModifiedAttributes.force("capacitorNeed", -amount)
diff --git a/eos/effects/effect6201.py b/eos/effects/effect6201.py
deleted file mode 100644
index 934766b11..000000000
--- a/eos/effects/effect6201.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# doomsdaySlash
-#
-# Used by:
-# Modules named like: Reaper (4 of 4)
-type = "active"
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6208.py b/eos/effects/effect6208.py
deleted file mode 100644
index 0b96a9743..000000000
--- a/eos/effects/effect6208.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# microJumpPortalDrive
-#
-# Used by:
-# Module: Micro Jump Field Generator
-type = "active"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonusPercent"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6214.py b/eos/effects/effect6214.py
deleted file mode 100644
index 619d3e9e0..000000000
--- a/eos/effects/effect6214.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# roleBonusCDLinksPGReduction
-#
-# Used by:
-# Ships from group: Command Destroyer (4 of 4)
-# Ship: Porpoise
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "power",
-                                  src.getModifiedItemAttr("roleBonusCD"))
diff --git a/eos/effects/effect6216.py b/eos/effects/effect6216.py
deleted file mode 100644
index 284ed616e..000000000
--- a/eos/effects/effect6216.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# structureEnergyNeutralizerFalloff
-#
-# Used by:
-# Structure Modules from group: Structure Energy Neutralizer (5 of 5)
-from eos.const import FittingModuleState
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "active", "projected"
-
-
-def handler(fit, src, context, **kwargs):
-    amount = 0
-    if "projected" in context:
-        if (hasattr(src, "state") and src.state >= FittingModuleState.ACTIVE) or hasattr(src, "amountActive"):
-            amount = src.getModifiedItemAttr("energyNeutralizerAmount")
-
-            if 'effect' in kwargs:
-                amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-            time = src.getModifiedItemAttr("duration")
-
-            fit.addDrain(src, time, amount, 0)
\ No newline at end of file
diff --git a/eos/effects/effect6222.py b/eos/effects/effect6222.py
deleted file mode 100644
index 4b342e0ec..000000000
--- a/eos/effects/effect6222.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# structureWarpScrambleBlockMWDWithNPCEffect
-#
-# Used by:
-# Structure Modules from group: Structure Warp Scrambler (2 of 2)
-from eos.const import FittingModuleState
-
-# Not used by any item
-runTime = "early"
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    if "projected" in context:
-        fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
-        if module.charge is not None and module.charge.ID == 47336:
-            for mod in fit.modules:
-                if not mod.isEmpty and mod.item.requiresSkill("High Speed Maneuvering") and mod.state > FittingModuleState.ONLINE:
-                    mod.state = FittingModuleState.ONLINE
-                if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > FittingModuleState.ONLINE:
-                    mod.state = FittingModuleState.ONLINE
diff --git a/eos/effects/effect623.py b/eos/effects/effect623.py
deleted file mode 100644
index 79977637f..000000000
--- a/eos/effects/effect623.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# miningDroneOperationMiningAmountBonusPostPercentMiningDroneAmountPercentChar
-#
-# Used by:
-# Modules named like: Drone Mining Augmentor (8 of 8)
-# Skill: Mining Drone Operation
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount",
-                                 container.getModifiedItemAttr("miningAmountBonus") * level)
diff --git a/eos/effects/effect6230.py b/eos/effects/effect6230.py
deleted file mode 100644
index f6141a967..000000000
--- a/eos/effects/effect6230.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalRS1
-#
-# Used by:
-# Ship: Curse
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect6232.py b/eos/effects/effect6232.py
deleted file mode 100644
index 8299434e6..000000000
--- a/eos/effects/effect6232.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffRS2
-#
-# Used by:
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/effect6233.py b/eos/effects/effect6233.py
deleted file mode 100644
index 47434368d..000000000
--- a/eos/effects/effect6233.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffRS3
-#
-# Used by:
-# Ship: Curse
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6234.py b/eos/effects/effect6234.py
deleted file mode 100644
index 8eaf6c305..000000000
--- a/eos/effects/effect6234.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalRS1
-#
-# Used by:
-# Ship: Curse
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect6237.py b/eos/effects/effect6237.py
deleted file mode 100644
index 372b2f1c3..000000000
--- a/eos/effects/effect6237.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffRS2
-#
-# Used by:
-# Ship: Pilgrim
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/effect6238.py b/eos/effects/effect6238.py
deleted file mode 100644
index d02b92b95..000000000
--- a/eos/effects/effect6238.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffRS3
-#
-# Used by:
-# Ship: Curse
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6239.py b/eos/effects/effect6239.py
deleted file mode 100644
index 094e01713..000000000
--- a/eos/effects/effect6239.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# miningFrigateBonusIceHarvestingCycleTime2
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration",
-                                  src.getModifiedItemAttr("shipBonusOREfrig2"), skill="Mining Frigate")
diff --git a/eos/effects/effect6241.py b/eos/effects/effect6241.py
deleted file mode 100644
index 9f515fe44..000000000
--- a/eos/effects/effect6241.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffAD1
-#
-# Used by:
-# Ship: Dragoon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect6242.py b/eos/effects/effect6242.py
deleted file mode 100644
index de8d4804c..000000000
--- a/eos/effects/effect6242.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalAD2
-#
-# Used by:
-# Ship: Dragoon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect6245.py b/eos/effects/effect6245.py
deleted file mode 100644
index 7d7e516b8..000000000
--- a/eos/effects/effect6245.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalAD2
-#
-# Used by:
-# Ship: Dragoon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect6246.py b/eos/effects/effect6246.py
deleted file mode 100644
index 1de9dcb6f..000000000
--- a/eos/effects/effect6246.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffAD1
-#
-# Used by:
-# Ship: Dragoon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect6253.py b/eos/effects/effect6253.py
deleted file mode 100644
index c8a3351dc..000000000
--- a/eos/effects/effect6253.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect6256.py b/eos/effects/effect6256.py
deleted file mode 100644
index 7540842ce..000000000
--- a/eos/effects/effect6256.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffAB2
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect6257.py b/eos/effects/effect6257.py
deleted file mode 100644
index a3075262c..000000000
--- a/eos/effects/effect6257.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalAB
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")
diff --git a/eos/effects/effect6260.py b/eos/effects/effect6260.py
deleted file mode 100644
index 153506b06..000000000
--- a/eos/effects/effect6260.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffAB2
-#
-# Used by:
-# Ship: Armageddon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect6267.py b/eos/effects/effect6267.py
deleted file mode 100644
index f78e0b1ea..000000000
--- a/eos/effects/effect6267.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEnergyNeutOptimalEAF1
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect627.py b/eos/effects/effect627.py
deleted file mode 100644
index 2d953deb4..000000000
--- a/eos/effects/effect627.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# powerIncrease
-#
-# Used by:
-# Modules from group: Auxiliary Power Core (5 of 5)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("powerOutput", module.getModifiedItemAttr("powerIncrease"))
diff --git a/eos/effects/effect6272.py b/eos/effects/effect6272.py
deleted file mode 100644
index 54a1a972a..000000000
--- a/eos/effects/effect6272.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEnergyNeutFalloffEAF3
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect6273.py b/eos/effects/effect6273.py
deleted file mode 100644
index 0de8a02d8..000000000
--- a/eos/effects/effect6273.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEnergyNosOptimalEAF1
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip1"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect6278.py b/eos/effects/effect6278.py
deleted file mode 100644
index 74f6b4ceb..000000000
--- a/eos/effects/effect6278.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusEnergyNosFalloffEAF3
-#
-# Used by:
-# Ship: Sentinel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusElectronicAttackShip3"),
-                                  skill="Electronic Attack Ships")
diff --git a/eos/effects/effect6281.py b/eos/effects/effect6281.py
deleted file mode 100644
index f85f88f75..000000000
--- a/eos/effects/effect6281.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalAF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6285.py b/eos/effects/effect6285.py
deleted file mode 100644
index f2f20904d..000000000
--- a/eos/effects/effect6285.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffAF3
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6287.py b/eos/effects/effect6287.py
deleted file mode 100644
index 4b6adf6f8..000000000
--- a/eos/effects/effect6287.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalAF2
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6291.py b/eos/effects/effect6291.py
deleted file mode 100644
index 9316fbb76..000000000
--- a/eos/effects/effect6291.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffAF3
-#
-# Used by:
-# Ship: Malice
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6294.py b/eos/effects/effect6294.py
deleted file mode 100644
index 10d1d5291..000000000
--- a/eos/effects/effect6294.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutOptimalAC1
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect6299.py b/eos/effects/effect6299.py
deleted file mode 100644
index fe991894d..000000000
--- a/eos/effects/effect6299.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNeutFalloffAC3
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect63.py b/eos/effects/effect63.py
deleted file mode 100644
index 25039f35f..000000000
--- a/eos/effects/effect63.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# armorHPMultiply
-#
-# Used by:
-# Modules from group: Armor Coating (202 of 202)
-# Modules from group: Armor Plating Energized (187 of 187)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("armorHP", module.getModifiedItemAttr("armorHPMultiplier"))
diff --git a/eos/effects/effect6300.py b/eos/effects/effect6300.py
deleted file mode 100644
index d2c101bbd..000000000
--- a/eos/effects/effect6300.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosOptimalAC1
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect6301.py b/eos/effects/effect6301.py
deleted file mode 100644
index 355b6e22c..000000000
--- a/eos/effects/effect6301.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusNosOptimalFalloffAC2
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange",
-                                  src.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect6305.py b/eos/effects/effect6305.py
deleted file mode 100644
index 5bc01aab7..000000000
--- a/eos/effects/effect6305.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEnergyNosFalloffAC3
-#
-# Used by:
-# Ship: Vangel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusAC3"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect6307.py b/eos/effects/effect6307.py
deleted file mode 100644
index cb804bcc1..000000000
--- a/eos/effects/effect6307.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusThermMissileDmgMD1
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6308.py b/eos/effects/effect6308.py
deleted file mode 100644
index cab979332..000000000
--- a/eos/effects/effect6308.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEMMissileDmgMD1
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6309.py b/eos/effects/effect6309.py
deleted file mode 100644
index ece38cb4e..000000000
--- a/eos/effects/effect6309.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusKineticMissileDmgMD1
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6310.py b/eos/effects/effect6310.py
deleted file mode 100644
index b6b2dd692..000000000
--- a/eos/effects/effect6310.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusExplosiveMissileDmgMD1
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", src.getModifiedItemAttr("shipBonusMD1"),
-                                    skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6315.py b/eos/effects/effect6315.py
deleted file mode 100644
index b33bdfa02..000000000
--- a/eos/effects/effect6315.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# eliteBonusCommandDestroyerSkirmish1
-#
-# Used by:
-# Ship: Bifrost
-# Ship: Magus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/effect6316.py b/eos/effects/effect6316.py
deleted file mode 100644
index 03c2e2b8e..000000000
--- a/eos/effects/effect6316.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# eliteBonusCommandDestroyerShield1
-#
-# Used by:
-# Ship: Bifrost
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/effect6317.py b/eos/effects/effect6317.py
deleted file mode 100644
index 1b9aa7af9..000000000
--- a/eos/effects/effect6317.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCommandDestroyerMJFGspool2
-#
-# Used by:
-# Ships from group: Command Destroyer (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"), "duration",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer2"), skill="Command Destroyers")
diff --git a/eos/effects/effect6318.py b/eos/effects/effect6318.py
deleted file mode 100644
index 526ad3caf..000000000
--- a/eos/effects/effect6318.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEMShieldResistanceMD2
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
-                           skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6319.py b/eos/effects/effect6319.py
deleted file mode 100644
index 81c08cc47..000000000
--- a/eos/effects/effect6319.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusKineticShieldResistanceMD2
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
-                           skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6320.py b/eos/effects/effect6320.py
deleted file mode 100644
index 5d41685a0..000000000
--- a/eos/effects/effect6320.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusThermalShieldResistanceMD2
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
-                           skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6321.py b/eos/effects/effect6321.py
deleted file mode 100644
index b9f93788b..000000000
--- a/eos/effects/effect6321.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusExplosiveShieldResistanceMD2
-#
-# Used by:
-# Ship: Bifrost
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusMD2"),
-                           skill="Minmatar Destroyer")
diff --git a/eos/effects/effect6322.py b/eos/effects/effect6322.py
deleted file mode 100644
index e9003c77d..000000000
--- a/eos/effects/effect6322.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptscanGravimetricStrengthBonusBonus
-#
-# Used by:
-# Charges from group: Structure ECM script (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context, *args, **kwargs):
-    src.boostItemAttr("scanGravimetricStrengthBonus", src.getModifiedChargeAttr("scanGravimetricStrengthBonusBonus"))
diff --git a/eos/effects/effect6323.py b/eos/effects/effect6323.py
deleted file mode 100644
index 9300e4cca..000000000
--- a/eos/effects/effect6323.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptscanLadarStrengthBonusBonus
-#
-# Used by:
-# Charges from group: Structure ECM script (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context, *args, **kwargs):
-    src.boostItemAttr("scanLadarStrengthBonus", src.getModifiedChargeAttr("scanLadarStrengthBonusBonus"))
diff --git a/eos/effects/effect6324.py b/eos/effects/effect6324.py
deleted file mode 100644
index 99e18d3c3..000000000
--- a/eos/effects/effect6324.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptscanMagnetometricStrengthBonusBonus
-#
-# Used by:
-# Charges from group: Structure ECM script (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context, *args, **kwargs):
-    src.boostItemAttr("scanMagnetometricStrengthBonus", src.getModifiedChargeAttr("scanMagnetometricStrengthBonusBonus"))
diff --git a/eos/effects/effect6325.py b/eos/effects/effect6325.py
deleted file mode 100644
index d747d6510..000000000
--- a/eos/effects/effect6325.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# scriptscanRadarStrengthBonusBonus
-#
-# Used by:
-# Charges from group: Structure ECM script (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context, *args, **kwargs):
-    src.boostItemAttr("scanRadarStrengthBonus", src.getModifiedChargeAttr("scanRadarStrengthBonusBonus"))
diff --git a/eos/effects/effect6326.py b/eos/effects/effect6326.py
deleted file mode 100644
index 514c58b4d..000000000
--- a/eos/effects/effect6326.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusThermalMissileDamageCD1
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect6327.py b/eos/effects/effect6327.py
deleted file mode 100644
index db491c2b4..000000000
--- a/eos/effects/effect6327.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEMMissileDamageCD1
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect6328.py b/eos/effects/effect6328.py
deleted file mode 100644
index 3f47a32e2..000000000
--- a/eos/effects/effect6328.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusKineticMissileDamageCD1
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer")
diff --git a/eos/effects/effect6329.py b/eos/effects/effect6329.py
deleted file mode 100644
index b7c2293f7..000000000
--- a/eos/effects/effect6329.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusExplosiveMissileDamageCD1
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", src.getModifiedItemAttr("shipBonusCD1"),
-                                    skill="Caldari Destroyer")
diff --git a/eos/effects/effect6330.py b/eos/effects/effect6330.py
deleted file mode 100644
index 059c76dfd..000000000
--- a/eos/effects/effect6330.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldEMResistanceCD2
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
-                           skill="Caldari Destroyer")
diff --git a/eos/effects/effect6331.py b/eos/effects/effect6331.py
deleted file mode 100644
index b4c5042f5..000000000
--- a/eos/effects/effect6331.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldThermalResistanceCD2
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
-                           skill="Caldari Destroyer")
diff --git a/eos/effects/effect6332.py b/eos/effects/effect6332.py
deleted file mode 100644
index 11f8a77d8..000000000
--- a/eos/effects/effect6332.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldKineticResistanceCD2
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
-                           skill="Caldari Destroyer")
diff --git a/eos/effects/effect6333.py b/eos/effects/effect6333.py
deleted file mode 100644
index 70944c9f2..000000000
--- a/eos/effects/effect6333.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusShieldExplosiveResistanceCD2
-#
-# Used by:
-# Ship: Stork
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCD2"),
-                           skill="Caldari Destroyer")
diff --git a/eos/effects/effect6334.py b/eos/effects/effect6334.py
deleted file mode 100644
index 2f17453b2..000000000
--- a/eos/effects/effect6334.py
+++ /dev/null
@@ -1,19 +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 Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/effect6335.py b/eos/effects/effect6335.py
deleted file mode 100644
index 2359565c0..000000000
--- a/eos/effects/effect6335.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusKineticArmorResistanceAD2
-#
-# Used by:
-# Ship: Pontifex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusAD2"),
-                           skill="Amarr Destroyer")
diff --git a/eos/effects/effect6336.py b/eos/effects/effect6336.py
deleted file mode 100644
index 3a1d5f206..000000000
--- a/eos/effects/effect6336.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusThermalArmorResistanceAD2
-#
-# Used by:
-# Ship: Pontifex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusAD2"),
-                           skill="Amarr Destroyer")
diff --git a/eos/effects/effect6337.py b/eos/effects/effect6337.py
deleted file mode 100644
index 745d64420..000000000
--- a/eos/effects/effect6337.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusEMArmorResistanceAD2
-#
-# Used by:
-# Ship: Pontifex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")
diff --git a/eos/effects/effect6338.py b/eos/effects/effect6338.py
deleted file mode 100644
index a1e2cc1c8..000000000
--- a/eos/effects/effect6338.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusExplosiveArmorResistanceAD2
-#
-# Used by:
-# Ship: Pontifex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusAD2"),
-                           skill="Amarr Destroyer")
diff --git a/eos/effects/effect6339.py b/eos/effects/effect6339.py
deleted file mode 100644
index 83df03351..000000000
--- a/eos/effects/effect6339.py
+++ /dev/null
@@ -1,19 +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 Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
diff --git a/eos/effects/effect6340.py b/eos/effects/effect6340.py
deleted file mode 100644
index 48b4afc6a..000000000
--- a/eos/effects/effect6340.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusKineticArmorResistanceGD2
-#
-# Used by:
-# Ship: Magus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
-                           skill="Gallente Destroyer")
diff --git a/eos/effects/effect6341.py b/eos/effects/effect6341.py
deleted file mode 100644
index 0c7feb03a..000000000
--- a/eos/effects/effect6341.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusEMArmorResistanceGD2
-#
-# Used by:
-# Ship: Magus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
-                           skill="Gallente Destroyer")
diff --git a/eos/effects/effect6342.py b/eos/effects/effect6342.py
deleted file mode 100644
index 722d1b044..000000000
--- a/eos/effects/effect6342.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusThermalArmorResistanceGD2
-#
-# Used by:
-# Ship: Magus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
-                           skill="Gallente Destroyer")
diff --git a/eos/effects/effect6343.py b/eos/effects/effect6343.py
deleted file mode 100644
index 37c731132..000000000
--- a/eos/effects/effect6343.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusExplosiveArmorResistanceGD2
-#
-# Used by:
-# Ship: Magus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusGD2"),
-                           skill="Gallente Destroyer")
diff --git a/eos/effects/effect6350.py b/eos/effects/effect6350.py
deleted file mode 100644
index bdef8ba12..000000000
--- a/eos/effects/effect6350.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipSmallMissileKinDmgCF3
-#
-# Used by:
-# Ship: Caldari Navy Hookbill
-
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(
-        lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"), "kineticDamage",
-        src.getModifiedItemAttr("shipBonus3CF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect6351.py b/eos/effects/effect6351.py
deleted file mode 100644
index e78580e80..000000000
--- a/eos/effects/effect6351.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMissileKinDamageCC3
-#
-# Used by:
-# Ship: Osprey Navy Issue
-
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusCC3"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect6352.py b/eos/effects/effect6352.py
deleted file mode 100644
index 02e61cf78..000000000
--- a/eos/effects/effect6352.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# roleBonusWDRange
-#
-# Used by:
-# Ship: Crucifier Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffEffectiveness",
-                                  src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRange",
-                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6353.py b/eos/effects/effect6353.py
deleted file mode 100644
index c16985002..000000000
--- a/eos/effects/effect6353.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# roleBonusWDCapCPU
-#
-# Used by:
-# Ship: Crucifier Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "cpu",
-                                  src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "capacitorNeed",
-                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6354.py b/eos/effects/effect6354.py
deleted file mode 100644
index d7955172b..000000000
--- a/eos/effects/effect6354.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# shipBonusEwWeaponDisruptionStrengthAF2
-#
-# Used by:
-# Variations of ship: Crucifier (3 of 3)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "explosionDelayBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeVelocityBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeCloudSizeBonus",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6355.py b/eos/effects/effect6355.py
deleted file mode 100644
index 3b8c77525..000000000
--- a/eos/effects/effect6355.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# roleBonusECMCapCPU
-#
-# Used by:
-# Ship: Griffin Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "capacitorNeed",
-                                  src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "cpu", src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6356.py b/eos/effects/effect6356.py
deleted file mode 100644
index a981b4f94..000000000
--- a/eos/effects/effect6356.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# roleBonusECMRange
-#
-# Used by:
-# Ship: Griffin Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("roleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "maxRange",
-                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6357.py b/eos/effects/effect6357.py
deleted file mode 100644
index 0c82717b2..000000000
--- a/eos/effects/effect6357.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusJustScramblerRangeGF2
-#
-# Used by:
-# Ship: Maulus Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Navigation"), "maxRange",
-                                  src.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect6358.py b/eos/effects/effect6358.py
deleted file mode 100644
index 7be57333b..000000000
--- a/eos/effects/effect6358.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# roleBonusJustScramblerStrength
-#
-# Used by:
-# Ship: Maulus Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Navigation"),
-                                     "warpScrambleStrength", ship.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6359.py b/eos/effects/effect6359.py
deleted file mode 100644
index 3e7de55ef..000000000
--- a/eos/effects/effect6359.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusAoeVelocityRocketsMF
-#
-# Used by:
-# Ship: Vigil Fleet Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "aoeVelocity",
-                                    src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect6360.py b/eos/effects/effect6360.py
deleted file mode 100644
index 0508f7f78..000000000
--- a/eos/effects/effect6360.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipRocketEMThermKinDmgMF2
-#
-# Used by:
-# Ship: Vigil Fleet Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect6361.py b/eos/effects/effect6361.py
deleted file mode 100644
index 022036560..000000000
--- a/eos/effects/effect6361.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRocketExpDmgMF3
-#
-# Used by:
-# Ship: Vigil Fleet Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonus3MF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect6362.py b/eos/effects/effect6362.py
deleted file mode 100644
index c08aa135f..000000000
--- a/eos/effects/effect6362.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# roleBonusStasisRange
-#
-# Used by:
-# Ship: Vigil Fleet Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange",
-                                  src.getModifiedItemAttr("roleBonus"))
diff --git a/eos/effects/effect6368.py b/eos/effects/effect6368.py
deleted file mode 100644
index 94e282490..000000000
--- a/eos/effects/effect6368.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shieldTransporterFalloffBonus
-#
-# Used by:
-# Variations of ship: Bantam (2 of 2)
-# Variations of ship: Burst (2 of 2)
-# Ship: Osprey
-# Ship: Scythe
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", "falloffEffectiveness",
-                                  src.getModifiedItemAttr("falloffBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Shield Booster",
-                                  "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
diff --git a/eos/effects/effect6369.py b/eos/effects/effect6369.py
deleted file mode 100644
index 23a27ca85..000000000
--- a/eos/effects/effect6369.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipShieldTransferFalloffMC2
-#
-# Used by:
-# Ship: Scimitar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6370.py b/eos/effects/effect6370.py
deleted file mode 100644
index 64acc7099..000000000
--- a/eos/effects/effect6370.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipShieldTransferFalloffCC1
-#
-# Used by:
-# Ship: Basilisk
-# Ship: Etana
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "falloffEffectiveness",
-                                  src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect6371.py b/eos/effects/effect6371.py
deleted file mode 100644
index 956f3158e..000000000
--- a/eos/effects/effect6371.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRemoteArmorFalloffGC1
-#
-# Used by:
-# Ship: Oneiros
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("shipBonusGC"),
-                                  skill="Gallente Cruiser")
diff --git a/eos/effects/effect6372.py b/eos/effects/effect6372.py
deleted file mode 100644
index 8b86803ea..000000000
--- a/eos/effects/effect6372.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipRemoteArmorFalloffAC2
-#
-# Used by:
-# Ship: Guardian
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("shipBonusAC2"),
-                                  skill="Amarr Cruiser")
diff --git a/eos/effects/effect6373.py b/eos/effects/effect6373.py
deleted file mode 100644
index 6fe69d3b4..000000000
--- a/eos/effects/effect6373.py
+++ /dev/null
@@ -1,16 +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"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Ancillary Remote Armor Repairer",
-                                  "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))
diff --git a/eos/effects/effect6374.py b/eos/effects/effect6374.py
deleted file mode 100644
index 532f3e28e..000000000
--- a/eos/effects/effect6374.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# droneHullRepairBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (6 of 7)
-# 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"))
diff --git a/eos/effects/effect6377.py b/eos/effects/effect6377.py
deleted file mode 100644
index ceb9a3d09..000000000
--- a/eos/effects/effect6377.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusLogiFrigArmorRepSpeedCap1
-#
-# Used by:
-# Ship: Deacon
-# Ship: Thalia
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration",
-                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
diff --git a/eos/effects/effect6378.py b/eos/effects/effect6378.py
deleted file mode 100644
index 8f2e8b53d..000000000
--- a/eos/effects/effect6378.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# eliteBonusLogiFrigShieldRepSpeedCap1
-#
-# Used by:
-# Ship: Kirin
-# Ship: Scalpel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "duration",
-                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed",
-                                  src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
diff --git a/eos/effects/effect6379.py b/eos/effects/effect6379.py
deleted file mode 100644
index 99453cb57..000000000
--- a/eos/effects/effect6379.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusLogiFrigArmorHP2
-#
-# Used by:
-# Ship: Deacon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")
diff --git a/eos/effects/effect6380.py b/eos/effects/effect6380.py
deleted file mode 100644
index b99cde37f..000000000
--- a/eos/effects/effect6380.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusLogiFrigShieldHP2
-#
-# Used by:
-# Ship: Kirin
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")
diff --git a/eos/effects/effect6381.py b/eos/effects/effect6381.py
deleted file mode 100644
index 3f4de996a..000000000
--- a/eos/effects/effect6381.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusLogiFrigSignature2
-#
-# Used by:
-# Ship: Scalpel
-# Ship: Thalia
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("signatureRadius", src.getModifiedItemAttr("eliteBonusLogiFrig2"),
-                           skill="Logistics Frigates")
diff --git a/eos/effects/effect6384.py b/eos/effects/effect6384.py
deleted file mode 100644
index 3a8a9ab52..000000000
--- a/eos/effects/effect6384.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# overloadSelfMissileGuidanceModuleBonus
-#
-# Used by:
-# Variations of module: Guidance Disruptor I (6 of 6)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    for tgtAttr in (
-            "aoeCloudSizeBonus",
-            "explosionDelayBonus",
-            "missileVelocityBonus",
-            "aoeVelocityBonus"
-    ):
-        module.boostItemAttr(tgtAttr, module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
diff --git a/eos/effects/effect6385.py b/eos/effects/effect6385.py
deleted file mode 100644
index 4ddfb60b1..000000000
--- a/eos/effects/effect6385.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# ignoreCloakVelocityPenalty
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemForce(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "maxVelocityModifier", src.getModifiedItemAttr("velocityPenaltyReduction"))
diff --git a/eos/effects/effect6386.py b/eos/effects/effect6386.py
deleted file mode 100644
index 71c4a3dc9..000000000
--- a/eos/effects/effect6386.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# ewSkillGuidanceDisruptionBonus
-#
-# Used by:
-# Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Weapon Destabilization
-type = "passive"
-
-
-def handler(fit, src, context):
-    level = src.level if "skill" in context else 1
-    for attr in (
-            "explosionDelayBonus",
-            "aoeVelocityBonus",
-            "aoeCloudSizeBonus",
-            "missileVelocityBonus"
-    ):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                      attr, src.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
diff --git a/eos/effects/effect6395.py b/eos/effects/effect6395.py
deleted file mode 100644
index 6ac7ea077..000000000
--- a/eos/effects/effect6395.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# shipBonusEwWeaponDisruptionStrengthAC1
-#
-# Used by:
-# Variations of ship: Arbitrator (3 of 3)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "missileVelocityBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeVelocityBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "explosionDelayBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "aoeCloudSizeBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "trackingSpeedBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus",
-                                  src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect6396.py b/eos/effects/effect6396.py
deleted file mode 100644
index 114a831b6..000000000
--- a/eos/effects/effect6396.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# skillStructureMissileDamageBonus
-#
-# Used by:
-# Skill: Structure Missile Systems
-type = "passive", "structure"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Anti-Capital Missile", "Structure Anti-Subcapital Missile", "Structure Guided Bomb")
-    for damageType in ("em", "thermal", "explosive", "kinetic"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
-                                        "%sDamage" % damageType, src.getModifiedItemAttr("damageMultiplierBonus"),
-                                        skill="Structure Missile Systems")
diff --git a/eos/effects/effect6400.py b/eos/effects/effect6400.py
deleted file mode 100644
index ee898cbc0..000000000
--- a/eos/effects/effect6400.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# skillStructureElectronicSystemsCapNeedBonus
-#
-# Used by:
-# Skill: Structure Electronic Systems
-type = "passive", "structure"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Warp Scrambler", "Structure Disruption Battery", "Structure Stasis Webifier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "capacitorNeed", src.getModifiedItemAttr("capNeedBonus"),
-                                  skill="Structure Electronic Systems")
diff --git a/eos/effects/effect6401.py b/eos/effects/effect6401.py
deleted file mode 100644
index c58dea119..000000000
--- a/eos/effects/effect6401.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# skillStructureEngineeringSystemsCapNeedBonus
-#
-# Used by:
-# Skill: Structure Engineering Systems
-type = "passive", "structure"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Energy Neutralizer", "Structure Area Denial Module")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "capacitorNeed", src.getModifiedItemAttr("capNeedBonus"),
-                                  skill="Structure Engineering Systems")
diff --git a/eos/effects/effect6402.py b/eos/effects/effect6402.py
deleted file mode 100644
index 11045a7c2..000000000
--- a/eos/effects/effect6402.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# structureRigAoeVelocityBonusSingleTargetMissiles
-#
-# Used by:
-# Structure Modules named like: Standup Set Missile (6 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
-
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
-                                  "aoeVelocity", src.getModifiedItemAttr("structureRigMissileExploVeloBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6403.py b/eos/effects/effect6403.py
deleted file mode 100644
index 51103c3a8..000000000
--- a/eos/effects/effect6403.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigVelocityBonusSingleTargetMissiles
-#
-# Used by:
-# Structure Modules named like: Standup Set Missile (6 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
-                                  "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6404.py b/eos/effects/effect6404.py
deleted file mode 100644
index 55a835155..000000000
--- a/eos/effects/effect6404.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# structureRigNeutralizerMaxRangeFalloffEffectiveness
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig XL - Energy Neutralizer and EW (2 of 2)
-# Structure Modules named like: Standup Set Energy Neutralizer (4 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer",
-                                  "maxRange", src.getModifiedItemAttr("structureRigEwarOptimalBonus"),
-                                  stackingPenalties=True)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer",
-                                  "falloffEffectiveness", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6405.py b/eos/effects/effect6405.py
deleted file mode 100644
index 89a2ffec0..000000000
--- a/eos/effects/effect6405.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigNeutralizerCapacitorNeed
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig XL - Energy Neutralizer and EW (2 of 2)
-# Structure Modules named like: Standup Set Energy Neutralizer (4 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Energy Neutralizer",
-                                  "capacitorNeed", src.getModifiedItemAttr("structureRigEwarCapUseBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6406.py b/eos/effects/effect6406.py
deleted file mode 100644
index 679e4c29e..000000000
--- a/eos/effects/effect6406.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# structureRigEWMaxRangeFalloff
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig M - EW projection (2 of 2)
-# Structure Modules named like: Standup Set EW (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Structure ECM Battery", "Structure Disruption Battery")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "falloff", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
-                                  stackingPenalties=True)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "maxRange", src.getModifiedItemAttr("structureRigEwarOptimalBonus"),
-                                  stackingPenalties=True)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "falloffEffectiveness", src.getModifiedItemAttr("structureRigEwarFalloffBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6407.py b/eos/effects/effect6407.py
deleted file mode 100644
index caaacb6ea..000000000
--- a/eos/effects/effect6407.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# structureRigEWCapacitorNeed
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig M - EW Cap Reduction (2 of 2)
-# Structure Modules named like: Standup Set EW (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Structure ECM Battery", "Structure Disruption Battery")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "capacitorNeed", src.getModifiedItemAttr("structureRigEwarCapUseBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6408.py b/eos/effects/effect6408.py
deleted file mode 100644
index 452af580d..000000000
--- a/eos/effects/effect6408.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureRigMaxTargets
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-# Structure Modules named like: Standup Set Target (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.extraAttributes.increase("maxTargetsLockedFromSkills", src.getModifiedItemAttr("structureRigMaxTargetBonus"))
diff --git a/eos/effects/effect6409.py b/eos/effects/effect6409.py
deleted file mode 100644
index 26a8ebd58..000000000
--- a/eos/effects/effect6409.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigSensorResolution
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - Max Targets and Sensor Boosting (2 of 2)
-# Structure Modules from group: Structure Combat Rig M - Boosted Sensors (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("structureRigScanResBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6410.py b/eos/effects/effect6410.py
deleted file mode 100644
index a6fedf168..000000000
--- a/eos/effects/effect6410.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigExplosionRadiusBonusAoEMissiles
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - AoE Launcher Application and Projection (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Missile and AoE Missile (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Structure Guided Bomb",
-                                    "aoeCloudSize", src.getModifiedItemAttr("structureRigMissileExplosionRadiusBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6411.py b/eos/effects/effect6411.py
deleted file mode 100644
index 38985d031..000000000
--- a/eos/effects/effect6411.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigVelocityBonusAoeMissiles
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - AoE Launcher Application and Projection (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Missile and AoE Missile (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Structure Guided Bomb",
-                                    "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"),
-                                    stackingPenalties=True)
diff --git a/eos/effects/effect6412.py b/eos/effects/effect6412.py
deleted file mode 100644
index 5373add73..000000000
--- a/eos/effects/effect6412.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigPDBmaxRange
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - Point Defense Battery Application and Projection (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Area Denial Module",
-                                  "empFieldRange", src.getModifiedItemAttr("structureRigPDRangeBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6413.py b/eos/effects/effect6413.py
deleted file mode 100644
index eb1ee6167..000000000
--- a/eos/effects/effect6413.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureRigPDBCapacitorNeed
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - Point Defense Battery Application and Projection (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Area Denial Module",
-                                  "capacitorNeed", src.getModifiedItemAttr("structureRigPDCapUseBonus"),
-                                  stackingPenalties=True)
diff --git a/eos/effects/effect6417.py b/eos/effects/effect6417.py
deleted file mode 100644
index f81301110..000000000
--- a/eos/effects/effect6417.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# structureRigDoomsdayDamageLoss
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Structure Doomsday Weapon",
-                                     "lightningWeaponDamageLossTarget",
-                                     src.getModifiedItemAttr("structureRigDoomsdayDamageLossTargetBonus"))
diff --git a/eos/effects/effect6422.py b/eos/effects/effect6422.py
deleted file mode 100644
index cc60e1986..000000000
--- a/eos/effects/effect6422.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# remoteSensorDampFalloff
-#
-# Used by:
-# Modules from group: Sensor Dampener (6 of 6)
-# Starbases from group: Sensor Dampening Battery (3 of 3)
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True, *args, **kwargs)
-
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6423.py b/eos/effects/effect6423.py
deleted file mode 100644
index a48eb6e78..000000000
--- a/eos/effects/effect6423.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shipModuleGuidanceDisruptor
-#
-# Used by:
-# Variations of module: Guidance Disruptor I (6 of 6)
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" in context:
-        for srcAttr, tgtAttr in (
-                ("aoeCloudSizeBonus", "aoeCloudSize"),
-                ("aoeVelocityBonus", "aoeVelocity"),
-                ("missileVelocityBonus", "maxVelocity"),
-                ("explosionDelayBonus", "explosionDelay"),
-        ):
-            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                            tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                            stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6424.py b/eos/effects/effect6424.py
deleted file mode 100644
index 2c04a4a6e..000000000
--- a/eos/effects/effect6424.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shipModuleTrackingDisruptor
-#
-# Used by:
-# Variations of module: Tracking Disruptor I (6 of 6)
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" in context:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6425.py b/eos/effects/effect6425.py
deleted file mode 100644
index 0e80806ca..000000000
--- a/eos/effects/effect6425.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# remoteTargetPaintFalloff
-#
-# Used by:
-# Modules from group: Target Painter (8 of 8)
-type = "projected", "active"
-
-
-def handler(fit, container, context, *args, **kwargs):
-    if "projected" in context:
-        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6426.py b/eos/effects/effect6426.py
deleted file mode 100644
index c50e08141..000000000
--- a/eos/effects/effect6426.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# remoteWebifierFalloff
-#
-# Used by:
-# Modules from group: Stasis Grappler (7 of 7)
-# Modules from group: Stasis Web (19 of 19)
-# Starbases from group: Stasis Webification Battery (3 of 3)
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6427.py b/eos/effects/effect6427.py
deleted file mode 100644
index a649c80e4..000000000
--- a/eos/effects/effect6427.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# remoteSensorBoostFalloff
-#
-# Used by:
-# Modules from group: Remote Sensor Booster (8 of 8)
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True)
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True)
-
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.boostItemAttr(
-            "scan{}Strength".format(scanType),
-            module.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-            stackingPenalties=True
-        )
diff --git a/eos/effects/effect6428.py b/eos/effects/effect6428.py
deleted file mode 100644
index 698307183..000000000
--- a/eos/effects/effect6428.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shipModuleRemoteTrackingComputer
-#
-# Used by:
-# Modules from group: Remote Tracking Computer (8 of 8)
-type = "projected", "active"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" in context:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, **kwargs)
diff --git a/eos/effects/effect6431.py b/eos/effects/effect6431.py
deleted file mode 100644
index c6dde777e..000000000
--- a/eos/effects/effect6431.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# fighterAbilityMissiles
-#
-# Used by:
-# Items from category: Fighter (48 of 82)
-# Fighters from group: Light Fighter (32 of 32)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-displayName = "Missile Attack"
-
-# Attribute prefix that this ability targets
-prefix = "fighterAbilityMissiles"
-
-type = "active"
-
-# This flag is required for effects that use charges in order to properly calculate reload time
-hasCharges = True
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6434.py b/eos/effects/effect6434.py
deleted file mode 100644
index 28b68d089..000000000
--- a/eos/effects/effect6434.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# fighterAbilityEnergyNeutralizer
-#
-# Used by:
-# Fighters named like: Cenobite (4 of 4)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-displayName = "Energy Neutralizer"
-prefix = "fighterAbilityEnergyNeutralizer"
-type = "active", "projected"
-grouped = True
-
-
-def handler(fit, src, context, **kwargs):
-    if "projected" in context:
-        amount = src.getModifiedItemAttr("{}Amount".format(prefix)) * src.amountActive
-        time = src.getModifiedItemAttr("{}Duration".format(prefix))
-
-        if 'effect' in kwargs:
-            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.addDrain(src, time, amount, 0)
diff --git a/eos/effects/effect6435.py b/eos/effects/effect6435.py
deleted file mode 100644
index 640cff4c0..000000000
--- a/eos/effects/effect6435.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# fighterAbilityStasisWebifier
-#
-# Used by:
-# Fighters named like: Dromi (4 of 4)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-
-# User-friendly name for the ability
-displayName = "Stasis Webifier"
-prefix = "fighterAbilityStasisWebifier"
-type = "active", "projected"
-grouped = True
-
-
-def handler(fit, src, context):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("{}SpeedPenalty".format(prefix)) * src.amountActive,
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6436.py b/eos/effects/effect6436.py
deleted file mode 100644
index e62c34de7..000000000
--- a/eos/effects/effect6436.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# fighterAbilityWarpDisruption
-#
-# Used by:
-# Fighters named like: Siren (4 of 4)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-
-# User-friendly name for the ability
-displayName = "Warp Disruption"
-prefix = "fighterAbilityWarpDisruption"
-type = "active", "projected"
-grouped = True
-
-
-def handler(fit, src, context):
-    if "projected" not in context:
-        return
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("{}PointStrength".format(prefix)) * src.amountActive)
diff --git a/eos/effects/effect6437.py b/eos/effects/effect6437.py
deleted file mode 100644
index cfc9c21db..000000000
--- a/eos/effects/effect6437.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# fighterAbilityECM
-#
-# Used by:
-# Fighters named like: Scarab (4 of 4)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-# User-friendly name for the ability
-displayName = "ECM"
-
-prefix = "fighterAbilityECM"
-
-type = "projected", "active"
-grouped = True
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" not in context:
-        return
-    # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-    strModifier = 1 - (module.getModifiedItemAttr("{}Strength{}".format(prefix, fit.scanType)) * module.amountActive) / fit.scanStrength
-
-    if 'effect' in kwargs:
-        strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-    fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6439.py b/eos/effects/effect6439.py
deleted file mode 100644
index 151effaaa..000000000
--- a/eos/effects/effect6439.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# fighterAbilityEvasiveManeuvers
-#
-# Used by:
-# Fighters from group: Light Fighter (16 of 32)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-displayName = "Evasive Maneuvers"
-
-prefix = "fighterAbilityEvasiveManeuvers"
-
-# Is ability applied to the fighter squad as a whole, or per fighter?
-grouped = True
-
-type = "active"
-runTime = "late"
-
-
-def handler(fit, container, context):
-    container.boostItemAttr("maxVelocity",
-                            container.getModifiedItemAttr("fighterAbilityEvasiveManeuversSpeedBonus"))
-    container.boostItemAttr("signatureRadius",
-                            container.getModifiedItemAttr("fighterAbilityEvasiveManeuversSignatureRadiusBonus"),
-                            stackingPenalties=True)
-
-    # These may not have stacking penalties, but there's nothing else that affects the attributes yet to check.
-    container.multiplyItemAttr("shieldEmDamageResonance",
-                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversEmResonance"),
-                               stackingPenalties=True)
-    container.multiplyItemAttr("shieldThermalDamageResonance",
-                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversThermResonance"),
-                               stackingPenalties=True)
-    container.multiplyItemAttr("shieldKineticDamageResonance",
-                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversKinResonance"),
-                               stackingPenalties=True)
-    container.multiplyItemAttr("shieldExplosiveDamageResonance",
-                               container.getModifiedItemAttr("fighterAbilityEvasiveManeuversExpResonance"),
-                               stackingPenalties=True)
diff --git a/eos/effects/effect6441.py b/eos/effects/effect6441.py
deleted file mode 100644
index d9cfdbe47..000000000
--- a/eos/effects/effect6441.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# fighterAbilityMicroWarpDrive
-#
-# Used by:
-# Items from category: Fighter (48 of 82)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-displayName = "Microwarpdrive"
-
-# Is ability applied to the fighter squad as a whole, or per fighter?
-grouped = True
-
-type = "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    module.boostItemAttr("maxVelocity", module.getModifiedItemAttr("fighterAbilityMicroWarpDriveSpeedBonus"),
-                         stackingPenalties=True)
-    module.boostItemAttr("signatureRadius",
-                         module.getModifiedItemAttr("fighterAbilityMicroWarpDriveSignatureRadiusBonus"),
-                         stackingPenalties=True)
diff --git a/eos/effects/effect6443.py b/eos/effects/effect6443.py
deleted file mode 100644
index 44cf69af7..000000000
--- a/eos/effects/effect6443.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# pointDefense
-#
-# Used by:
-# Structure Modules from group: Structure Area Denial Module (2 of 2)
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect6447.py b/eos/effects/effect6447.py
deleted file mode 100644
index 81987466e..000000000
--- a/eos/effects/effect6447.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# lightningWeapon
-#
-# Used by:
-# Structure Module: Standup Arcing Vorton Projector I
-type = 'active'
-
-
-def handler(fit, module, context):
-    pass
diff --git a/eos/effects/effect6448.py b/eos/effects/effect6448.py
deleted file mode 100644
index 59686c5e1..000000000
--- a/eos/effects/effect6448.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# structureMissileGuidanceEnhancer
-#
-# Used by:
-# Variations of structure module: Standup Missile Guidance Enhancer I (2 of 2)
-type = "passive"
-
-
-def handler(fit, container, context):
-    missileGroups = ("Structure Anti-Capital Missile", "Structure Anti-Subcapital Missile")
-    for srcAttr, tgtAttr in (
-            ("aoeCloudSizeBonus", "aoeCloudSize"),
-            ("aoeVelocityBonus", "aoeVelocity"),
-            ("missileVelocityBonus", "maxVelocity"),
-            ("explosionDelayBonus", "explosionDelay"),
-    ):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in missileGroups,
-                                        tgtAttr, container.getModifiedItemAttr(srcAttr),
-                                        stackingPenalties=True)
diff --git a/eos/effects/effect6449.py b/eos/effects/effect6449.py
deleted file mode 100644
index bce3a7a74..000000000
--- a/eos/effects/effect6449.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# structureBallisticControlSystem
-#
-# Used by:
-# Variations of structure module: Standup Ballistic Control System I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    missileGroups = ("Structure Anti-Capital Missile", "Structure Anti-Subcapital Missile")
-
-    for dmgType in ("em", "kinetic", "explosive", "thermal"):
-        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.group.name in missileGroups,
-                                           "%sDamage" % dmgType,
-                                           module.getModifiedItemAttr("missileDamageMultiplierBonus"),
-                                           stackingPenalties=True)
-
-    launcherGroups = ("Structure XL Missile Launcher", "Structure Multirole Missile Launcher")
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name in launcherGroups,
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect6465.py b/eos/effects/effect6465.py
deleted file mode 100644
index d0a028f48..000000000
--- a/eos/effects/effect6465.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# fighterAbilityAttackM
-#
-# Used by:
-# Items from category: Fighter (50 of 82)
-# Fighters from group: Heavy Fighter (34 of 34)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-displayName = "Turret Attack"
-
-# Attribute prefix that this ability targets
-prefix = "fighterAbilityAttackMissile"
-
-type = "active"
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6470.py b/eos/effects/effect6470.py
deleted file mode 100644
index 3ab1e4010..000000000
--- a/eos/effects/effect6470.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# remoteECMFalloff
-#
-# Used by:
-# Modules from group: ECM (39 of 39)
-# Starbases from group: Electronic Warfare Battery (12 of 12)
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "projected", "active"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" in context:
-        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
-
-        if 'effect' in kwargs:
-            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6472.py b/eos/effects/effect6472.py
deleted file mode 100644
index b97beb097..000000000
--- a/eos/effects/effect6472.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# doomsdayBeamDOT
-#
-# Used by:
-# Modules named like: Lance (4 of 4)
-type = "active"
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6473.py b/eos/effects/effect6473.py
deleted file mode 100644
index 3e92fb8f6..000000000
--- a/eos/effects/effect6473.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# doomsdayConeDOT
-#
-# Used by:
-# Module: Bosonic Field Generator
-type = "active"
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6474.py b/eos/effects/effect6474.py
deleted file mode 100644
index 4e0fcc1dd..000000000
--- a/eos/effects/effect6474.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# doomsdayHOG
-#
-# Used by:
-# Module: Gravitational Transportation Field Oscillator
-type = "active"
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6475.py b/eos/effects/effect6475.py
deleted file mode 100644
index ece92271a..000000000
--- a/eos/effects/effect6475.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# structureRigDoomsdayTargetAmountBonus
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Structure Doomsday Weapon",
-                                     "lightningWeaponTargetAmount",
-                                     src.getModifiedItemAttr("structureRigDoomsdayTargetAmountBonus"))
diff --git a/eos/effects/effect6476.py b/eos/effects/effect6476.py
deleted file mode 100644
index eb143b14b..000000000
--- a/eos/effects/effect6476.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# doomsdayAOEWeb
-#
-# Used by:
-# Module: Stasis Webification Burst Projector
-# Structure Module: Standup Stasis Webification Burst Projector
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6477.py b/eos/effects/effect6477.py
deleted file mode 100644
index 6f9cd2f5e..000000000
--- a/eos/effects/effect6477.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# doomsdayAOENeut
-#
-# Used by:
-# Module: Energy Neutralization Burst Projector
-# Structure Module: Standup Energy Neutralization Burst Projector
-from eos.const import FittingModuleState
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "active", "projected"
-
-
-def handler(fit, src, context, **kwargs):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= FittingModuleState.ACTIVE) or
-                                   hasattr(src, "amountActive")):
-        amount = src.getModifiedItemAttr("energyNeutralizerAmount")
-
-        if 'effect' in kwargs:
-            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        time = src.getModifiedItemAttr("duration")
-
-        fit.addDrain(src, time, amount, 0)
diff --git a/eos/effects/effect6478.py b/eos/effects/effect6478.py
deleted file mode 100644
index 1c039c23c..000000000
--- a/eos/effects/effect6478.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# doomsdayAOEPaint
-#
-# Used by:
-# Module: Target Illumination Burst Projector
-# Structure Module: Standup Target Illumination Burst Projector
-type = "projected", "active"
-
-
-def handler(fit, container, context, *args, **kwargs):
-    if "projected" in context:
-        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6479.py b/eos/effects/effect6479.py
deleted file mode 100644
index 5ee1f31c9..000000000
--- a/eos/effects/effect6479.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# doomsdayAOETrack
-#
-# Used by:
-# Module: Weapon Disruption Burst Projector
-# Structure Module: Standup Weapon Disruption Burst Projector
-
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" in context:
-        for srcAttr, tgtAttr in (
-                ("aoeCloudSizeBonus", "aoeCloudSize"),
-                ("aoeVelocityBonus", "aoeVelocity"),
-                ("missileVelocityBonus", "maxVelocity"),
-                ("explosionDelayBonus", "explosionDelay"),
-        ):
-            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                            tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                            stackingPenalties=True, *args, **kwargs)
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6481.py b/eos/effects/effect6481.py
deleted file mode 100644
index ab55bf185..000000000
--- a/eos/effects/effect6481.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# doomsdayAOEDamp
-#
-# Used by:
-# Module: Sensor Dampening Burst Projector
-# Structure Module: Standup Sensor Dampening Burst Projector
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True, *args, **kwargs)
-
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6482.py b/eos/effects/effect6482.py
deleted file mode 100644
index 8d79e289d..000000000
--- a/eos/effects/effect6482.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# doomsdayAOEBubble
-#
-# Used by:
-# Module: Warp Disruption Burst Projector
-# Structure Module: Standup Warp Disruption Burst Projector
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    return
diff --git a/eos/effects/effect6484.py b/eos/effects/effect6484.py
deleted file mode 100644
index c2de4f4f5..000000000
--- a/eos/effects/effect6484.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# emergencyHullEnergizer
-#
-# Used by:
-# Variations of module: Capital Emergency Hull Energizer I (5 of 5)
-type = "active"
-runtime = "late"
-
-
-def handler(fit, src, context):
-    for dmgType in ('em', 'thermal', 'kinetic', 'explosive'):
-        fit.ship.multiplyItemAttr('{}DamageResonance'.format(dmgType),
-                                  src.getModifiedItemAttr("hull{}DamageResonance".format(dmgType.title())),
-                                  stackingPenalties=True, penaltyGroup="postMul")
diff --git a/eos/effects/effect6485.py b/eos/effects/effect6485.py
deleted file mode 100644
index 03763fd5a..000000000
--- a/eos/effects/effect6485.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# fighterAbilityLaunchBomb
-#
-# Used by:
-# Fighters from group: Heavy Fighter (16 of 34)
-"""
-Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
-effects, and thus this effect file contains some custom information useful only to fighters.
-"""
-# User-friendly name for the ability
-displayName = "Bomb"
-
-# Attribute prefix that this ability targets
-prefix = "fighterAbilityLaunchBomb"
-
-type = "active"
-
-# This flag is required for effects that use charges in order to properly calculate reload time
-hasCharges = True
-
-
-def handler(fit, src, context):
-    pass
diff --git a/eos/effects/effect6487.py b/eos/effects/effect6487.py
deleted file mode 100644
index 874cbf0d7..000000000
--- a/eos/effects/effect6487.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# modifyEnergyWarfareResistance
-#
-# Used by:
-# Modules from group: Capacitor Battery (30 of 30)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("energyWarfareResistance",
-                           module.getModifiedItemAttr("energyWarfareResistanceBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6488.py b/eos/effects/effect6488.py
deleted file mode 100644
index 467c7edef..000000000
--- a/eos/effects/effect6488.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# scriptSensorBoosterSensorStrengthBonusBonus
-#
-# Used by:
-# Charges from group: Sensor Booster Script (3 of 3)
-type = "active"
-
-
-def handler(fit, module, context):
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        module.boostItemAttr("scan{}StrengthPercent".format(scanType),
-                             module.getModifiedChargeAttr("sensorStrengthBonusBonus"))
diff --git a/eos/effects/effect6501.py b/eos/effects/effect6501.py
deleted file mode 100644
index 3b85fee4a..000000000
--- a/eos/effects/effect6501.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtA1DamageBonus
-#
-# Used by:
-# Ship: Revelation
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
diff --git a/eos/effects/effect6502.py b/eos/effects/effect6502.py
deleted file mode 100644
index 207c827f0..000000000
--- a/eos/effects/effect6502.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusDreadnoughtA2ArmorResists
-#
-# Used by:
-# Ship: Revelation
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
-                           skill="Amarr Dreadnought")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
-                           skill="Amarr Dreadnought")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
-                           skill="Amarr Dreadnought")
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtA2"),
-                           skill="Amarr Dreadnought")
diff --git a/eos/effects/effect6503.py b/eos/effects/effect6503.py
deleted file mode 100644
index 1571c46bf..000000000
--- a/eos/effects/effect6503.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtA3CapNeed
-#
-# Used by:
-# Ship: Revelation
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtA3"), skill="Amarr Dreadnought")
diff --git a/eos/effects/effect6504.py b/eos/effects/effect6504.py
deleted file mode 100644
index 9d06fd5db..000000000
--- a/eos/effects/effect6504.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# shipBonusDreadnoughtC1DamageBonus
-#
-# Used by:
-# Ship: Phoenix
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusDreadnoughtC1"), skill="Caldari Dreadnought")
diff --git a/eos/effects/effect6505.py b/eos/effects/effect6505.py
deleted file mode 100644
index 6a533902c..000000000
--- a/eos/effects/effect6505.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusDreadnoughtC2ShieldResists
-#
-# Used by:
-# Variations of ship: Phoenix (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
-                           skill="Caldari Dreadnought")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
-                           skill="Caldari Dreadnought")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
-                           skill="Caldari Dreadnought")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusDreadnoughtC2"),
-                           skill="Caldari Dreadnought")
diff --git a/eos/effects/effect6506.py b/eos/effects/effect6506.py
deleted file mode 100644
index d6d5b9074..000000000
--- a/eos/effects/effect6506.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtG1DamageBonus
-#
-# Used by:
-# Ship: Moros
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
diff --git a/eos/effects/effect6507.py b/eos/effects/effect6507.py
deleted file mode 100644
index b109e3e30..000000000
--- a/eos/effects/effect6507.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtG2ROFBonus
-#
-# Used by:
-# Variations of ship: Moros (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG2"), skill="Gallente Dreadnought")
diff --git a/eos/effects/effect6508.py b/eos/effects/effect6508.py
deleted file mode 100644
index 39b99c0f5..000000000
--- a/eos/effects/effect6508.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtG3RepairTime
-#
-# Used by:
-# Ship: Moros
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"), "duration",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG3"), skill="Gallente Dreadnought")
diff --git a/eos/effects/effect6509.py b/eos/effects/effect6509.py
deleted file mode 100644
index c1de5b9f4..000000000
--- a/eos/effects/effect6509.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtM1DamageBonus
-#
-# Used by:
-# Ship: Naglfar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/effect6510.py b/eos/effects/effect6510.py
deleted file mode 100644
index c183f3c7b..000000000
--- a/eos/effects/effect6510.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtM2ROFBonus
-#
-# Used by:
-# Ship: Naglfar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtM2"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/effect6511.py b/eos/effects/effect6511.py
deleted file mode 100644
index 0e5ca87f9..000000000
--- a/eos/effects/effect6511.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtM3RepairTime
-#
-# Used by:
-# Ship: Naglfar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "duration",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtM2"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/effect6513.py b/eos/effects/effect6513.py
deleted file mode 100644
index 93d3dd847..000000000
--- a/eos/effects/effect6513.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# doomsdayAOEECM
-#
-# Used by:
-# Module: ECM Jammer Burst Projector
-# Structure Module: Standup ECM Jammer Burst Projector
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "projected", "active"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" in context:
-        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
-
-        if 'effect' in kwargs:
-            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6526.py b/eos/effects/effect6526.py
deleted file mode 100644
index 2ae2102d6..000000000
--- a/eos/effects/effect6526.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusForceAuxiliaryA1RemoteRepairAndCapAmount
-#
-# Used by:
-# Ship: Apostle
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems") or
-                                              mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"),
-                                  skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
-                                              mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"),
-                                  skill="Amarr Carrier")
diff --git a/eos/effects/effect6527.py b/eos/effects/effect6527.py
deleted file mode 100644
index 38dc7efd9..000000000
--- a/eos/effects/effect6527.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusForceAuxiliaryA2ArmorResists
-#
-# Used by:
-# Ship: Apostle
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryA2"),
-                           skill="Amarr Carrier")
diff --git a/eos/effects/effect6533.py b/eos/effects/effect6533.py
deleted file mode 100644
index 824f57069..000000000
--- a/eos/effects/effect6533.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusForceAuxiliaryA4WarfareLinksBonus
-#
-# Used by:
-# Ship: Apostle
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-                                              mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-                                              mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-                                              mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-                                              mod.item.requiresSkill("Information Command"),
-                                  "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-                                              mod.item.requiresSkill("Information Command"),
-                                  "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6534.py b/eos/effects/effect6534.py
deleted file mode 100644
index df5b5181b..000000000
--- a/eos/effects/effect6534.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusForceAuxiliaryM4WarfareLinksBonus
-#
-# Used by:
-# Ship: Lif
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryM4"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6535.py b/eos/effects/effect6535.py
deleted file mode 100644
index 63efca50e..000000000
--- a/eos/effects/effect6535.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusForceAuxiliaryG4WarfareLinksBonus
-#
-# Used by:
-# Ship: Ninazu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryG4"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6536.py b/eos/effects/effect6536.py
deleted file mode 100644
index fda300de2..000000000
--- a/eos/effects/effect6536.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusForceAuxiliaryC4WarfareLinksBonus
-#
-# Used by:
-# Ship: Minokawa
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryC4"), skill="Caldari Carrier")
diff --git a/eos/effects/effect6537.py b/eos/effects/effect6537.py
deleted file mode 100644
index d141e771a..000000000
--- a/eos/effects/effect6537.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole1CommandBurstCPUBonus
-#
-# Used by:
-# Ships from group: Force Auxiliary (6 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "cpu",
-                                  src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6545.py b/eos/effects/effect6545.py
deleted file mode 100644
index 952cbb532..000000000
--- a/eos/effects/effect6545.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# shipBonusForceAuxiliaryC1RemoteBoostAndCapAmount
-#
-# Used by:
-# Ship: Minokawa
-type = "passive"
-
-
-def handler(fit, src, context):
-    if src.getModifiedItemAttr("shipBonusForceAuxiliaryC1") is None:
-        return  # See GH Issue 1321
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems") or
-                                              mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryC1"),
-                                  skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or
-                                              mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "shieldBonus", src.getModifiedItemAttr("shipBonusForceAuxiliaryC1"),
-                                  skill="Caldari Carrier")
diff --git a/eos/effects/effect6546.py b/eos/effects/effect6546.py
deleted file mode 100644
index b18ae263a..000000000
--- a/eos/effects/effect6546.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusForceAuxiliaryC2ShieldResists
-#
-# Used by:
-# Variations of ship: Minokawa (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusForceAuxiliaryC2"),
-                           skill="Caldari Carrier")
diff --git a/eos/effects/effect6548.py b/eos/effects/effect6548.py
deleted file mode 100644
index 3ae370e41..000000000
--- a/eos/effects/effect6548.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusForceAuxiliaryG1RemoteCycleTime
-#
-# Used by:
-# Ship: Ninazu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or
-                                              mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"),
-                                  skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
-                                              mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"),
-                                  skill="Gallente Carrier")
diff --git a/eos/effects/effect6549.py b/eos/effects/effect6549.py
deleted file mode 100644
index bdbefdd49..000000000
--- a/eos/effects/effect6549.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusForceAuxiliaryG2LocalRepairAmount
-#
-# Used by:
-# Ship: Ninazu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount",
-                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG2"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"), "armorDamageAmount",
-                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG2"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6551.py b/eos/effects/effect6551.py
deleted file mode 100644
index 71d8d8e07..000000000
--- a/eos/effects/effect6551.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusForceAuxiliaryM1RemoteDuration
-#
-# Used by:
-# Ship: Lif
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or
-                                              mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"),
-                                  skill="Minmatar Carrier")
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or
-                                              mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"),
-                                  skill="Minmatar Carrier")
diff --git a/eos/effects/effect6552.py b/eos/effects/effect6552.py
deleted file mode 100644
index 2bff2d794..000000000
--- a/eos/effects/effect6552.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusForceAuxiliaryM2LocalBoostAmount
-#
-# Used by:
-# Ship: Lif
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "shieldBonus",
-                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), "shieldBonus",
-                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6555.py b/eos/effects/effect6555.py
deleted file mode 100644
index 9c7f9e777..000000000
--- a/eos/effects/effect6555.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# moduleBonusDroneNavigationComputer
-#
-# Used by:
-# Modules from group: Drone Navigation Computer (8 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity",
-                                 src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
diff --git a/eos/effects/effect6556.py b/eos/effects/effect6556.py
deleted file mode 100644
index e3a87f990..000000000
--- a/eos/effects/effect6556.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# moduleBonusDroneDamageAmplifier
-#
-# Used by:
-# Modules from group: Drone Damage Modules (11 of 11)
-# Modules named like: C3 'Hivaa Saitsuo' Ballistic Control System (2 of 2)
-# Module: Abyssal Ballistic Control System
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect6557.py b/eos/effects/effect6557.py
deleted file mode 100644
index d589475bd..000000000
--- a/eos/effects/effect6557.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# moduleBonusOmnidirectionalTrackingLink
-#
-# Used by:
-# Modules from group: Drone Tracking Modules (10 of 10)
-type = "active"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionVelocity",
-                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed",
-                                 src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionRadius",
-                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretTrackingSpeed",
-                                   src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionRadius",
-                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
-                                   src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
-                                   stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "falloff",
-                                 src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionVelocity",
-                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
-                                   stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
-                                 src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
-                                   stackingPenalties=True)
diff --git a/eos/effects/effect6558.py b/eos/effects/effect6558.py
deleted file mode 100644
index cb4d4b21e..000000000
--- a/eos/effects/effect6558.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# moduleBonusOmnidirectionalTrackingLinkOverload
-#
-# Used by:
-# Modules from group: Drone Tracking Modules (10 of 10)
-type = "overheat"
-
-
-def handler(fit, module, context):
-    overloadBonus = module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus")
-    module.boostItemAttr("maxRangeBonus", overloadBonus)
-    module.boostItemAttr("falloffBonus", overloadBonus)
-    module.boostItemAttr("trackingSpeedBonus", overloadBonus)
-    module.boostItemAttr("aoeCloudSizeBonus", overloadBonus)
-    module.boostItemAttr("aoeVelocityBonus", overloadBonus)
diff --git a/eos/effects/effect6559.py b/eos/effects/effect6559.py
deleted file mode 100644
index c6e8884e5..000000000
--- a/eos/effects/effect6559.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# moduleBonusOmnidirectionalTrackingEnhancer
-#
-# Used by:
-# Modules from group: Drone Tracking Enhancer (10 of 10)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionRadius",
-                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionRadius",
-                                   src.getModifiedItemAttr("aoeCloudSizeBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "falloff",
-                                 src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeFalloff", src.getModifiedItemAttr("falloffBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretTrackingSpeed",
-                                   src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
-                                 src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed",
-                                 src.getModifiedItemAttr("trackingSpeedBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("maxRangeBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionVelocity",
-                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionVelocity",
-                                   src.getModifiedItemAttr("aoeVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
-                                   src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect6560.py b/eos/effects/effect6560.py
deleted file mode 100644
index 4d22c78ae..000000000
--- a/eos/effects/effect6560.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# skillBonusFighters
-#
-# Used by:
-# Skill: Fighters
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6561.py b/eos/effects/effect6561.py
deleted file mode 100644
index d41e21428..000000000
--- a/eos/effects/effect6561.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusLightFighters
-#
-# Used by:
-# Skill: Light Fighters
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Light Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/effect6562.py b/eos/effects/effect6562.py
deleted file mode 100644
index d6758f279..000000000
--- a/eos/effects/effect6562.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusSupportFightersShield
-#
-# Used by:
-# Skill: Support Fighters
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("shieldBonus") * lvl)
diff --git a/eos/effects/effect6563.py b/eos/effects/effect6563.py
deleted file mode 100644
index 7c19ebb2d..000000000
--- a/eos/effects/effect6563.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# skillBonusHeavyFighters
-#
-# Used by:
-# Skill: Heavy Fighters
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Heavy Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6565.py b/eos/effects/effect6565.py
deleted file mode 100644
index 195835283..000000000
--- a/eos/effects/effect6565.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# citadelRigBonus
-#
-# Used by:
-# Structures from group: Citadel (9 of 9)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context):
-
-    for attr in [
-        "structureRigDoomsdayDamageLossTargetBonus",
-        "structureRigScanResBonus",
-        "structureRigPDRangeBonus",
-        "structureRigPDCapUseBonus",
-        "structureRigMissileExploVeloBonus",
-        "structureRigMissileVelocityBonus",
-        "structureRigEwarOptimalBonus",
-        "structureRigEwarFalloffBonus",
-        "structureRigEwarCapUseBonus",
-        "structureRigMissileExplosionRadiusBonus"
-    ]:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Jury Rigging"),
-                                  attr, src.getModifiedItemAttr("structureRoleBonus"))
diff --git a/eos/effects/effect6566.py b/eos/effects/effect6566.py
deleted file mode 100644
index e79f21515..000000000
--- a/eos/effects/effect6566.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# moduleBonusFighterSupportUnit
-#
-# Used by:
-# Modules from group: Fighter Support Unit (8 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("fighterBonusShieldCapacityPercent"))
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("fighterBonusVelocityPercent"), stackingPenalties=True, penaltyGroup="postMul")
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDuration",
-                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul")
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDuration",
-                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul")
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDuration",
-                                   src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul")
-    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldRechargeRate",
-                                   src.getModifiedItemAttr("fighterBonusShieldRechargePercent"))
diff --git a/eos/effects/effect6567.py b/eos/effects/effect6567.py
deleted file mode 100644
index fb58a5928..000000000
--- a/eos/effects/effect6567.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# moduleBonusNetworkedSensorArray
-#
-# Used by:
-# Module: Networked Sensor Array
-type = "active"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionBonus"), stackingPenalties=True)
-
-    for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
-        attr = "scan{}Strength".format(scanType)
-        bonus = src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType))
-        fit.ship.boostItemAttr(attr, bonus, stackingPenalties=True)
-        fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), attr, bonus,
-                                       stackingPenalties=True)
-
-    # EW cap need increase
-    groups = [
-        'Burst Jammer',
-        'Weapon Disruptor',
-        'ECM',
-        'Stasis Grappler',
-        'Sensor Dampener',
-        'Target Painter']
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
-                                              mod.item.requiresSkill("Propulsion Jamming"),
-                                  "capacitorNeed", src.getModifiedItemAttr("ewCapacitorNeedBonus"))
diff --git a/eos/effects/effect657.py b/eos/effects/effect657.py
deleted file mode 100644
index fe8b37aa4..000000000
--- a/eos/effects/effect657.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# agilityMultiplierEffect
-#
-# Used by:
-# Modules from group: Inertial Stabilizer (7 of 7)
-# Modules from group: Nanofiber Internal Structure (7 of 7)
-# Modules from group: Reinforced Bulkhead (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility",
-                           module.getModifiedItemAttr("agilityMultiplier"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6570.py b/eos/effects/effect6570.py
deleted file mode 100644
index 8cf44cbe8..000000000
--- a/eos/effects/effect6570.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillBonusFighterHangarManagement
-#
-# Used by:
-# Skill: Fighter Hangar Management
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.ship.boostItemAttr("fighterCapacity", src.getModifiedItemAttr("skillBonusFighterHangarSize") * lvl)
diff --git a/eos/effects/effect6571.py b/eos/effects/effect6571.py
deleted file mode 100644
index 9077ff379..000000000
--- a/eos/effects/effect6571.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalAutocannonSpecialization
-#
-# Used by:
-# Skill: Capital Autocannon Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Autocannon Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6572.py b/eos/effects/effect6572.py
deleted file mode 100644
index 3a2f7b5c9..000000000
--- a/eos/effects/effect6572.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalArtillerySpecialization
-#
-# Used by:
-# Skill: Capital Artillery Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Artillery Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6573.py b/eos/effects/effect6573.py
deleted file mode 100644
index 41d923389..000000000
--- a/eos/effects/effect6573.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalBlasterSpecialization
-#
-# Used by:
-# Skill: Capital Blaster Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Blaster Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6574.py b/eos/effects/effect6574.py
deleted file mode 100644
index 98d17a9bb..000000000
--- a/eos/effects/effect6574.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalRailgunSpecialization
-#
-# Used by:
-# Skill: Capital Railgun Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Railgun Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6575.py b/eos/effects/effect6575.py
deleted file mode 100644
index 514eb5b2a..000000000
--- a/eos/effects/effect6575.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalPulseLaserSpecialization
-#
-# Used by:
-# Skill: Capital Pulse Laser Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Pulse Laser Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6576.py b/eos/effects/effect6576.py
deleted file mode 100644
index 82ff0a0c1..000000000
--- a/eos/effects/effect6576.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusCapitalBeamLaserSpecialization
-#
-# Used by:
-# Skill: Capital Beam Laser Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Beam Laser Specialization"),
-                                  "damageMultiplier", src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
diff --git a/eos/effects/effect6577.py b/eos/effects/effect6577.py
deleted file mode 100644
index cc51709e3..000000000
--- a/eos/effects/effect6577.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusXLCruiseMissileSpecialization
-#
-# Used by:
-# Skill: XL Cruise Missile Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missile Specialization"), "speed",
-                                  src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/effect6578.py b/eos/effects/effect6578.py
deleted file mode 100644
index 7393d111e..000000000
--- a/eos/effects/effect6578.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusXLTorpedoSpecialization
-#
-# Used by:
-# Skill: XL Torpedo Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedo Specialization"), "speed",
-                                  src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/effect6580.py b/eos/effects/effect6580.py
deleted file mode 100644
index e54c5ef47..000000000
--- a/eos/effects/effect6580.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusRole2LogisticDroneRepAmountBonus
-#
-# Used by:
-# Ships from group: Force Auxiliary (5 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "structureDamageAmount",
-                                 src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "armorDamageAmount",
-                                 src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"), "shieldBonus",
-                                 src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect6581.py b/eos/effects/effect6581.py
deleted file mode 100644
index 3474de594..000000000
--- a/eos/effects/effect6581.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# moduleBonusTriageModule
-#
-# Used by:
-# Variations of module: Triage Module I (2 of 2)
-type = "active"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    # Remote effect bonuses (duration / amount / range / fallout)
-    for skill, amtAttr, stack in (
-            ("Capital Remote Armor Repair Systems", "armorDamageAmount", True),
-            ("Capital Shield Emission Systems", "shieldBonus", True),
-            ("Capital Capacitor Emission Systems", "powerTransferAmount", False),
-            ("Capital Remote Hull Repair Systems", "structureDamageAmount", False)):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "duration",
-                                      src.getModifiedItemAttr("siegeRemoteLogisticsDurationBonus"))
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
-                                      src.getModifiedItemAttr("siegeRemoteLogisticsAmountBonus"),
-                                      stackingPenalties=stack)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "maxRange",
-                                      src.getModifiedItemAttr("siegeRemoteLogisticsRangeBonus"), stackingPenalties=True)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "falloffEffectiveness",
-                                      src.getModifiedItemAttr("siegeRemoteLogisticsRangeBonus"), stackingPenalties=True)
-
-    # Local armor/shield rep effects (duration / amoutn)
-    for skill, amtAttr in (
-            ("Capital Shield Operation", "shieldBonus"),
-            ("Capital Repair Systems", "armorDamageAmount")):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), "duration",
-                                      src.getModifiedItemAttr("siegeLocalLogisticsDurationBonus"))
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), amtAttr,
-                                      src.getModifiedItemAttr("siegeLocalLogisticsAmountBonus"))
-
-    # Speed bonus
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("speedFactor"), stackingPenalties=True)
-
-    # Scan resolution multiplier
-    fit.ship.multiplyItemAttr("scanResolution", src.getModifiedItemAttr("scanResolutionMultiplier"),
-                              stackingPenalties=True)
-
-    # Mass multiplier
-    fit.ship.multiplyItemAttr("mass", src.getModifiedItemAttr("siegeMassMultiplier"), stackingPenalties=True)
-
-    # Max locked targets
-    fit.ship.increaseItemAttr("maxLockedTargets", src.getModifiedItemAttr("maxLockedTargetsBonus"))
-
-    # EW cap need increase
-    groups = [
-        'Burst Jammer',
-        'Weapon Disruptor',
-        'ECM',
-        'Stasis Grappler',
-        'Sensor Dampener',
-        'Target Painter']
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
-                                              mod.item.requiresSkill("Propulsion Jamming"),
-                                  "capacitorNeed", src.getModifiedItemAttr("ewCapacitorNeedBonus"))
-
-    # todo: test for April 2016 release
-    # Block EWAR & projected effects
-    fit.ship.forceItemAttr("disallowOffensiveModifiers", src.getModifiedItemAttr("disallowOffensiveModifiers"))
-    fit.ship.forceItemAttr("disallowAssistance", src.getModifiedItemAttr("disallowAssistance"))
-
-    # new in April 2016 release
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("droneDamageBonus"), stackingPenalties=True)
-
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
-    fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus"))
-    fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus"))
-    fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus"))
-
-    fit.ship.forceItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering"))
-    fit.ship.forceItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking"))
diff --git a/eos/effects/effect6582.py b/eos/effects/effect6582.py
deleted file mode 100644
index c63e33440..000000000
--- a/eos/effects/effect6582.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# moduleBonusSiegeModule
-#
-# Used by:
-# Variations of module: Siege Module I (2 of 2)
-type = "active"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    # Turrets
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or
-                                              mod.item.requiresSkill("Capital Hybrid Turret") or
-                                              mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", src.getModifiedItemAttr("siegeTurretDamageBonus"))
-
-    # Missiles
-    for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or
-                                                    mod.charge.requiresSkill("XL Cruise Missiles") or
-                                                    mod.charge.requiresSkill("Torpedoes"),
-                                        "%sDamage" % type, src.getModifiedItemAttr("siegeMissileDamageBonus"))
-
-    # Reppers
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation") or
-                                              mod.item.requiresSkill("Capital Repair Systems"),
-                                  "duration", src.getModifiedItemAttr("siegeLocalLogisticsDurationBonus"))
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"),
-                                  "shieldBonus", src.getModifiedItemAttr("siegeLocalLogisticsAmountBonus"),
-                                  stackingPenalties=True)
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("siegeLocalLogisticsAmountBonus"),
-                                  stackingPenalties=True)
-
-    # Speed penalty
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("speedFactor"))
-
-    # Mass
-    fit.ship.multiplyItemAttr("mass", src.getModifiedItemAttr("siegeMassMultiplier"),
-                              stackingPenalties=True, penaltyGroup="postMul")
-
-    # @ todo: test for April 2016 release
-    # Block Hostile EWAR and friendly effects
-    fit.ship.forceItemAttr("disallowOffensiveModifiers", src.getModifiedItemAttr("disallowOffensiveModifiers"))
-    fit.ship.forceItemAttr("disallowAssistance", src.getModifiedItemAttr("disallowAssistance"))
-
-    # new in April 2016 release
-    # missile ROF bonus
-    for group in ("Missile Launcher XL Torpedo", "Missile Launcher Rapid Torpedo", "Missile Launcher XL Cruise"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == group, "speed",
-                                      src.getModifiedItemAttr("siegeLauncherROFBonus"))
-
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "maxVelocity",
-                                    src.getModifiedItemAttr("siegeTorpedoVelocityBonus"), stackingPenalties=True)
-
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
-    fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus"))
-    fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus"))
-    fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus"))
-    fit.ship.boostItemAttr("weaponDisruptionResistance", src.getModifiedItemAttr("weaponDisruptionResistanceBonus"))
-
-    fit.ship.forceItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking"))
-    fit.ship.forceItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering"))
diff --git a/eos/effects/effect6591.py b/eos/effects/effect6591.py
deleted file mode 100644
index caee35c38..000000000
--- a/eos/effects/effect6591.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierA3WarpStrength
-#
-# Used by:
-# Ship: Aeon
-# Ship: Revenant
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierA3"),
-                              skill="Amarr Carrier")
diff --git a/eos/effects/effect6592.py b/eos/effects/effect6592.py
deleted file mode 100644
index 9a18457fd..000000000
--- a/eos/effects/effect6592.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierC3WarpStrength
-#
-# Used by:
-# Ship: Revenant
-# Ship: Wyvern
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierC3"),
-                              skill="Caldari Carrier")
diff --git a/eos/effects/effect6593.py b/eos/effects/effect6593.py
deleted file mode 100644
index 5c361a79e..000000000
--- a/eos/effects/effect6593.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSupercarrierG3WarpStrength
-#
-# Used by:
-# Variations of ship: Nyx (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierG3"),
-                              skill="Gallente Carrier")
diff --git a/eos/effects/effect6594.py b/eos/effects/effect6594.py
deleted file mode 100644
index dd652f578..000000000
--- a/eos/effects/effect6594.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierM3WarpStrength
-#
-# Used by:
-# Ship: Hel
-# Ship: Vendetta
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierM3"),
-                              skill="Minmatar Carrier")
diff --git a/eos/effects/effect6595.py b/eos/effects/effect6595.py
deleted file mode 100644
index 31981bba6..000000000
--- a/eos/effects/effect6595.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusCarrierA4WarfareLinksBonus
-#
-# Used by:
-# Ship: Archon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusCarrierA4"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6596.py b/eos/effects/effect6596.py
deleted file mode 100644
index 4e19f6916..000000000
--- a/eos/effects/effect6596.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusCarrierC4WarfareLinksBonus
-#
-# Used by:
-# Ship: Chimera
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusCarrierC4"), skill="Caldari Carrier")
diff --git a/eos/effects/effect6597.py b/eos/effects/effect6597.py
deleted file mode 100644
index 05eb85c60..000000000
--- a/eos/effects/effect6597.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusCarrierG4WarfareLinksBonus
-#
-# Used by:
-# Ship: Thanatos
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusCarrierG4"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6598.py b/eos/effects/effect6598.py
deleted file mode 100644
index 11592c9df..000000000
--- a/eos/effects/effect6598.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusCarrierM4WarfareLinksBonus
-#
-# Used by:
-# Ship: Nidhoggur
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusCarrierM4"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6599.py b/eos/effects/effect6599.py
deleted file mode 100644
index ebda73d9d..000000000
--- a/eos/effects/effect6599.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusCarrierA1ArmorResists
-#
-# Used by:
-# Ship: Archon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusCarrierA1"),
-                           skill="Amarr Carrier")
diff --git a/eos/effects/effect660.py b/eos/effects/effect660.py
deleted file mode 100644
index 4b745afd2..000000000
--- a/eos/effects/effect660.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileEMDmgBonus
-#
-# Used by:
-# Skills named like: Missiles (5 of 7)
-# Skill: Rockets
-# Skill: Torpedoes
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                    "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect6600.py b/eos/effects/effect6600.py
deleted file mode 100644
index 4b8cd7101..000000000
--- a/eos/effects/effect6600.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusCarrierC1ShieldResists
-#
-# Used by:
-# Ship: Chimera
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusCarrierC1"),
-                           skill="Caldari Carrier")
diff --git a/eos/effects/effect6601.py b/eos/effects/effect6601.py
deleted file mode 100644
index e17ff621a..000000000
--- a/eos/effects/effect6601.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusCarrierG1FighterDamage
-#
-# Used by:
-# Ship: Thanatos
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierG1"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6602.py b/eos/effects/effect6602.py
deleted file mode 100644
index 218947805..000000000
--- a/eos/effects/effect6602.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusCarrierM1FighterDamage
-#
-# Used by:
-# Ship: Nidhoggur
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusCarrierM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6603.py b/eos/effects/effect6603.py
deleted file mode 100644
index 1c1900cba..000000000
--- a/eos/effects/effect6603.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shipBonusSupercarrierA1FighterDamage
-#
-# Used by:
-# Ship: Aeon
-# Ship: Revenant
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA1"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6604.py b/eos/effects/effect6604.py
deleted file mode 100644
index 680e6ac24..000000000
--- a/eos/effects/effect6604.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shipBonusSupercarrierC1FighterDamage
-#
-# Used by:
-# Ship: Revenant
-# Ship: Wyvern
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierC1"), skill="Caldari Carrier")
diff --git a/eos/effects/effect6605.py b/eos/effects/effect6605.py
deleted file mode 100644
index 835a0f3fc..000000000
--- a/eos/effects/effect6605.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusSupercarrierG1FighterDamage
-#
-# Used by:
-# Variations of ship: Nyx (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6606.py b/eos/effects/effect6606.py
deleted file mode 100644
index 072aa2573..000000000
--- a/eos/effects/effect6606.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusSupercarrierM1FighterDamage
-#
-# Used by:
-# Ship: Hel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6607.py b/eos/effects/effect6607.py
deleted file mode 100644
index fdc2f24bc..000000000
--- a/eos/effects/effect6607.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusSupercarrierA5WarfareLinksBonus
-#
-# Used by:
-# Ship: Aeon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusSupercarrierA5"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6608.py b/eos/effects/effect6608.py
deleted file mode 100644
index 5ff00b1ca..000000000
--- a/eos/effects/effect6608.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusSupercarrierC5WarfareLinksBonus
-#
-# Used by:
-# Ship: Wyvern
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Shield Command") or mod.item.requiresSkill("Information Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusSupercarrierC5"), skill="Caldari Carrier")
diff --git a/eos/effects/effect6609.py b/eos/effects/effect6609.py
deleted file mode 100644
index aa6d4d1e2..000000000
--- a/eos/effects/effect6609.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusSupercarrierG5WarfareLinksBonus
-#
-# Used by:
-# Ship: Nyx
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Armored Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusSupercarrierG5"), skill="Gallente Carrier")
diff --git a/eos/effects/effect661.py b/eos/effects/effect661.py
deleted file mode 100644
index 6f12347b3..000000000
--- a/eos/effects/effect661.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileExplosiveDmgBonus
-#
-# Used by:
-# Skills named like: Missiles (5 of 7)
-# Skill: Rockets
-# Skill: Torpedoes
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                    "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect6610.py b/eos/effects/effect6610.py
deleted file mode 100644
index 403b6c6a7..000000000
--- a/eos/effects/effect6610.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# shipBonusSupercarrierM5WarfareLinksBonus
-#
-# Used by:
-# Ship: Hel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff4Value", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff1Value", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff3Value", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "buffDuration", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(
-        lambda mod: mod.item.requiresSkill("Skirmish Command") or mod.item.requiresSkill("Shield Command"),
-        "warfareBuff2Value", src.getModifiedItemAttr("shipBonusSupercarrierM5"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6611.py b/eos/effects/effect6611.py
deleted file mode 100644
index 832a17eff..000000000
--- a/eos/effects/effect6611.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSupercarrierC2AfterburnerBonus
-#
-# Used by:
-# Ship: Revenant
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedFactor",
-                                  src.getModifiedItemAttr("shipBonusSupercarrierC2"), skill="Caldari Carrier")
diff --git a/eos/effects/effect6612.py b/eos/effects/effect6612.py
deleted file mode 100644
index ef805c824..000000000
--- a/eos/effects/effect6612.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusSupercarrierA2FighterApplicationBonus
-#
-# Used by:
-# Ship: Revenant
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionVelocity",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionVelocity",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA2"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6613.py b/eos/effects/effect6613.py
deleted file mode 100644
index 05dcff6a1..000000000
--- a/eos/effects/effect6613.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSupercarrierRole1NumWarfareLinks
-#
-# Used by:
-# Ships from group: Supercarrier (6 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6614.py b/eos/effects/effect6614.py
deleted file mode 100644
index 283256d6c..000000000
--- a/eos/effects/effect6614.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusSupercarrierRole2ArmorShieldModuleBonus
-#
-# Used by:
-# Ships from group: Supercarrier (6 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "armorHPBonusAdd",
-                                  src.getModifiedItemAttr("shipBonusRole2"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"), "capacityBonus",
-                                  src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect6615.py b/eos/effects/effect6615.py
deleted file mode 100644
index 49c41fdd6..000000000
--- a/eos/effects/effect6615.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierA4BurstProjectorBonus
-#
-# Used by:
-# Ship: Aeon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
-                                  "durationWeaponDisruptionBurstProjector",
-                                  src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6616.py b/eos/effects/effect6616.py
deleted file mode 100644
index ce70f80f2..000000000
--- a/eos/effects/effect6616.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierC4BurstProjectorBonus
-#
-# Used by:
-# Ship: Wyvern
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
-                                  "durationECMJammerBurstProjector", src.getModifiedItemAttr("shipBonusSupercarrierC4"),
-                                  skill="Caldari Carrier")
diff --git a/eos/effects/effect6617.py b/eos/effects/effect6617.py
deleted file mode 100644
index 74b6a3ba6..000000000
--- a/eos/effects/effect6617.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierG4BurstProjectorBonus
-#
-# Used by:
-# Ship: Nyx
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
-                                  "durationSensorDampeningBurstProjector",
-                                  src.getModifiedItemAttr("shipBonusSupercarrierG4"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6618.py b/eos/effects/effect6618.py
deleted file mode 100644
index d75b19a16..000000000
--- a/eos/effects/effect6618.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierM4BurstProjectorBonus
-#
-# Used by:
-# Ship: Hel
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"),
-                                  "durationTargetIlluminationBurstProjector",
-                                  src.getModifiedItemAttr("shipBonusSupercarrierM4"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6619.py b/eos/effects/effect6619.py
deleted file mode 100644
index fdfc77d94..000000000
--- a/eos/effects/effect6619.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCarrierRole1NumWarfareLinks
-#
-# Used by:
-# Ships from group: Carrier (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect662.py b/eos/effects/effect662.py
deleted file mode 100644
index 162e5beb6..000000000
--- a/eos/effects/effect662.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileThermalDmgBonus
-#
-# Used by:
-# Skills named like: Missiles (5 of 7)
-# Skill: Rockets
-# Skill: Torpedoes
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                    "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect6620.py b/eos/effects/effect6620.py
deleted file mode 100644
index 8ba0cc3fc..000000000
--- a/eos/effects/effect6620.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtC3ReloadBonus
-#
-# Used by:
-# Ship: Phoenix
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "reloadTime",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtC3"), skill="Caldari Dreadnought")
diff --git a/eos/effects/effect6621.py b/eos/effects/effect6621.py
deleted file mode 100644
index 4eafbff18..000000000
--- a/eos/effects/effect6621.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusSupercarrierA2ArmorResists
-#
-# Used by:
-# Ship: Aeon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
-                           skill="Amarr Carrier")
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierA2"),
-                           skill="Amarr Carrier")
diff --git a/eos/effects/effect6622.py b/eos/effects/effect6622.py
deleted file mode 100644
index 5f9e36e9b..000000000
--- a/eos/effects/effect6622.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusSupercarrierC2ShieldResists
-#
-# Used by:
-# Ship: Wyvern
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
-                           skill="Caldari Carrier")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusSupercarrierC2"),
-                           skill="Caldari Carrier")
diff --git a/eos/effects/effect6623.py b/eos/effects/effect6623.py
deleted file mode 100644
index 5b23ff737..000000000
--- a/eos/effects/effect6623.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSupercarrierG2FighterHitpoints
-#
-# Used by:
-# Variations of ship: Nyx (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierG2"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6624.py b/eos/effects/effect6624.py
deleted file mode 100644
index d908f242c..000000000
--- a/eos/effects/effect6624.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierM2FighterVelocity
-#
-# Used by:
-# Ship: Hel
-# Ship: Vendetta
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6625.py b/eos/effects/effect6625.py
deleted file mode 100644
index 02228b9c6..000000000
--- a/eos/effects/effect6625.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusCarrierA2SupportFighterBonus
-#
-# Used by:
-# Ship: Archon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierA2"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
-                                   "fighterAbilityEnergyNeutralizerOptimalRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierA2"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6626.py b/eos/effects/effect6626.py
deleted file mode 100644
index ff46a2d1d..000000000
--- a/eos/effects/effect6626.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusCarrierC2SupportFighterBonus
-#
-# Used by:
-# Ship: Chimera
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierC2"), skill="Caldari Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
-                                   "fighterAbilityECMRangeOptimal", src.getModifiedItemAttr("shipBonusCarrierC2"),
-                                   skill="Caldari Carrier")
diff --git a/eos/effects/effect6627.py b/eos/effects/effect6627.py
deleted file mode 100644
index e3bfe9f1f..000000000
--- a/eos/effects/effect6627.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusCarrierG2SupportFighterBonus
-#
-# Used by:
-# Ship: Thanatos
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierG2"), skill="Gallente Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
-                                   "fighterAbilityWarpDisruptionRange", src.getModifiedItemAttr("shipBonusCarrierG2"),
-                                   skill="Gallente Carrier")
diff --git a/eos/effects/effect6628.py b/eos/effects/effect6628.py
deleted file mode 100644
index e28ccbfef..000000000
--- a/eos/effects/effect6628.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusCarrierM2SupportFighterBonus
-#
-# Used by:
-# Ship: Nidhoggur
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"), "fighterSquadronOrbitRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierM2"), skill="Minmatar Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Support Fighters"),
-                                   "fighterAbilityStasisWebifierOptimalRange",
-                                   src.getModifiedItemAttr("shipBonusCarrierM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6629.py b/eos/effects/effect6629.py
deleted file mode 100644
index d2c313dca..000000000
--- a/eos/effects/effect6629.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# scriptResistanceBonusBonus
-#
-# Used by:
-# Charges named like: Resistance Script (8 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    src.boostItemAttr("emDamageResistanceBonus", src.getModifiedChargeAttr("emDamageResistanceBonusBonus"))
-    src.boostItemAttr("explosiveDamageResistanceBonus",
-                      src.getModifiedChargeAttr("explosiveDamageResistanceBonusBonus"))
-    src.boostItemAttr("kineticDamageResistanceBonus", src.getModifiedChargeAttr("kineticDamageResistanceBonusBonus"))
-    src.boostItemAttr("thermalDamageResistanceBonus", src.getModifiedChargeAttr("thermalDamageResistanceBonusBonus"))
diff --git a/eos/effects/effect6634.py b/eos/effects/effect6634.py
deleted file mode 100644
index 92ec95b48..000000000
--- a/eos/effects/effect6634.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanA1DamageBonus
-#
-# Used by:
-# Ship: Avatar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
diff --git a/eos/effects/effect6635.py b/eos/effects/effect6635.py
deleted file mode 100644
index 08ea4ea52..000000000
--- a/eos/effects/effect6635.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusTitanC1KinDamageBonus
-#
-# Used by:
-# Ship: Leviathan
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
diff --git a/eos/effects/effect6636.py b/eos/effects/effect6636.py
deleted file mode 100644
index e44f41f53..000000000
--- a/eos/effects/effect6636.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanG1DamageBonus
-#
-# Used by:
-# Ship: Erebus
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
diff --git a/eos/effects/effect6637.py b/eos/effects/effect6637.py
deleted file mode 100644
index 538a0d8fc..000000000
--- a/eos/effects/effect6637.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanM1DamageBonus
-#
-# Used by:
-# Ship: Ragnarok
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
diff --git a/eos/effects/effect6638.py b/eos/effects/effect6638.py
deleted file mode 100644
index 52ce60bda..000000000
--- a/eos/effects/effect6638.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusTitanC2ROFBonus
-#
-# Used by:
-# Variations of ship: Leviathan (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher XL Cruise", "speed",
-                                  src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Torpedo", "speed",
-                                  src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher XL Torpedo", "speed",
-                                  src.getModifiedItemAttr("shipBonusTitanC2"), skill="Caldari Titan")
diff --git a/eos/effects/effect6639.py b/eos/effects/effect6639.py
deleted file mode 100644
index b24c555c9..000000000
--- a/eos/effects/effect6639.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusSupercarrierA4FighterApplicationBonus
-#
-# Used by:
-# Ship: Revenant
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesExplosionRadius",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileExplosionRadius",
-                                   src.getModifiedItemAttr("shipBonusSupercarrierA4"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6640.py b/eos/effects/effect6640.py
deleted file mode 100644
index 5931b824b..000000000
--- a/eos/effects/effect6640.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole1NumWarfareLinks
-#
-# Used by:
-# Ships from group: Titan (7 of 7)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6641.py b/eos/effects/effect6641.py
deleted file mode 100644
index 1c07545cb..000000000
--- a/eos/effects/effect6641.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusRole2ArmorPlates&ShieldExtendersBonus
-#
-# Used by:
-# Ships from group: Titan (7 of 7)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "armorHPBonusAdd",
-                                  src.getModifiedItemAttr("shipBonusRole2"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Upgrades"), "capacityBonus",
-                                  src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect6642.py b/eos/effects/effect6642.py
deleted file mode 100644
index 89e206f6d..000000000
--- a/eos/effects/effect6642.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusDoomsdayRapidFiring
-#
-# Used by:
-# Skill: Doomsday Rapid Firing
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Doomsday Operation"), "duration",
-                                  src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/effect6647.py b/eos/effects/effect6647.py
deleted file mode 100644
index f89d421c4..000000000
--- a/eos/effects/effect6647.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusTitanA3WarpStrength
-#
-# Used by:
-# Variations of ship: Avatar (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanA3"), skill="Amarr Titan")
diff --git a/eos/effects/effect6648.py b/eos/effects/effect6648.py
deleted file mode 100644
index 2932f5fc1..000000000
--- a/eos/effects/effect6648.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusTitanC3WarpStrength
-#
-# Used by:
-# Variations of ship: Leviathan (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanC3"), skill="Caldari Titan")
diff --git a/eos/effects/effect6649.py b/eos/effects/effect6649.py
deleted file mode 100644
index 460e39b5d..000000000
--- a/eos/effects/effect6649.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanG3WarpStrength
-#
-# Used by:
-# Variations of ship: Erebus (2 of 2)
-# Ship: Komodo
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanG3"), skill="Gallente Titan")
diff --git a/eos/effects/effect6650.py b/eos/effects/effect6650.py
deleted file mode 100644
index 2a56e6404..000000000
--- a/eos/effects/effect6650.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusTitanM3WarpStrength
-#
-# Used by:
-# Ships from group: Titan (3 of 7)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanM3"), skill="Minmatar Titan")
diff --git a/eos/effects/effect6651.py b/eos/effects/effect6651.py
deleted file mode 100644
index a1697eec7..000000000
--- a/eos/effects/effect6651.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# shipModuleAncillaryRemoteArmorRepairer
-#
-# Used by:
-# Modules from group: Ancillary Remote Armor Repairer (4 of 4)
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" not in context:
-        return
-
-    if module.charge and module.charge.name == "Nanite Repair Paste":
-        multiplier = 3
-    else:
-        multiplier = 1
-
-    amount = module.getModifiedItemAttr("armorDamageAmount") * multiplier
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    rps = amount / speed
-    fit.extraAttributes.increase("armorRepair", rps)
-    fit.extraAttributes.increase("armorRepairPreSpool", rps)
-    fit.extraAttributes.increase("armorRepairFullSpool", rps)
diff --git a/eos/effects/effect6652.py b/eos/effects/effect6652.py
deleted file mode 100644
index dc135bc0a..000000000
--- a/eos/effects/effect6652.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModuleAncillaryRemoteShieldBooster
-#
-# Used by:
-# Modules from group: Ancillary Remote Shield Booster (4 of 4)
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" not in context:
-        return
-    amount = module.getModifiedItemAttr("shieldBonus")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("shieldRepair", amount / speed, **kwargs)
diff --git a/eos/effects/effect6653.py b/eos/effects/effect6653.py
deleted file mode 100644
index 93084ad75..000000000
--- a/eos/effects/effect6653.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanA2CapNeed
-#
-# Used by:
-# Ship: Avatar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusTitanA2"), skill="Amarr Titan")
diff --git a/eos/effects/effect6654.py b/eos/effects/effect6654.py
deleted file mode 100644
index 87c12394d..000000000
--- a/eos/effects/effect6654.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanG2ROFBonus
-#
-# Used by:
-# Variations of ship: Erebus (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
diff --git a/eos/effects/effect6655.py b/eos/effects/effect6655.py
deleted file mode 100644
index 477698082..000000000
--- a/eos/effects/effect6655.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanM2ROFBonus
-#
-# Used by:
-# Ship: Ragnarok
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusTitanM2"), skill="Minmatar Titan")
diff --git a/eos/effects/effect6656.py b/eos/effects/effect6656.py
deleted file mode 100644
index 02023dc88..000000000
--- a/eos/effects/effect6656.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole3XLTorpdeoVelocityBonus
-#
-# Used by:
-# Variations of ship: Leviathan (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "maxVelocity",
-                                    src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect6657.py b/eos/effects/effect6657.py
deleted file mode 100644
index 13c64f8f2..000000000
--- a/eos/effects/effect6657.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# shipBonusTitanC5AllDamageBonus
-#
-# Used by:
-# Ship: Leviathan
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusTitanC5"), skill="Caldari Titan")
diff --git a/eos/effects/effect6658.py b/eos/effects/effect6658.py
deleted file mode 100644
index 09f0bd008..000000000
--- a/eos/effects/effect6658.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# moduleBonusBastionModule
-#
-# Used by:
-# Module: Bastion Module I
-type = "active"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    # Resistances
-    for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
-        for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
-            bonus = "%s%sDamageResonance" % (attrPrefix, damageType)
-            bonus = "%s%s" % (bonus[0].lower(), bonus[1:])
-            booster = "%s%sDamageResonance" % (layer, damageType)
-            penalize = False if layer == 'hull' else True
-            fit.ship.multiplyItemAttr(bonus, src.getModifiedItemAttr(booster),
-                                      stackingPenalties=penalize, penaltyGroup="preMul")
-
-    # Turrets
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or
-                                              mod.item.requiresSkill("Large Hybrid Turret") or
-                                              mod.item.requiresSkill("Large Projectile Turret"),
-                                  "maxRange", src.getModifiedItemAttr("maxRangeBonus"),
-                                  stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or
-                                              mod.item.requiresSkill("Large Hybrid Turret") or
-                                              mod.item.requiresSkill("Large Projectile Turret"),
-                                  "falloff", src.getModifiedItemAttr("falloffBonus"),
-                                  stackingPenalties=True)
-
-    # Missiles
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or
-                                                mod.charge.requiresSkill("Cruise Missiles") or
-                                                mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", src.getModifiedItemAttr("missileVelocityBonus"))
-
-    # Tanking
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("armorDamageAmountBonus"),
-                                  stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", src.getModifiedItemAttr("shieldBoostMultiplier"),
-                                  stackingPenalties=True)
-
-    # Speed penalty
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("speedFactor"))
-
-    # @todo: test these for April 2016 release
-    # Max locked targets
-    fit.ship.forceItemAttr("maxLockedTargets", src.getModifiedItemAttr("maxLockedTargets"))
-
-    # Block Hostile ewar
-    fit.ship.forceItemAttr("disallowOffensiveModifiers", src.getModifiedItemAttr("disallowOffensiveModifiers"))
-
-    # new with April 2016 release
-    for scanType in ('Magnetometric', 'Ladar', 'Gravimetric', 'Radar'):
-        fit.ship.boostItemAttr("scan{}Strength".format(scanType),
-                               src.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
-                               stackingPenalties=True)
-
-    fit.ship.boostItemAttr("remoteRepairImpedance", src.getModifiedItemAttr("remoteRepairImpedanceBonus"))
-    fit.ship.boostItemAttr("remoteAssistanceImpedance", src.getModifiedItemAttr("remoteAssistanceImpedanceBonus"))
-    fit.ship.boostItemAttr("sensorDampenerResistance", src.getModifiedItemAttr("sensorDampenerResistanceBonus"))
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"),
-                                     "activationBlocked", src.getModifiedItemAttr("activationBlockedStrenght"))
-    fit.ship.boostItemAttr("targetPainterResistance", src.getModifiedItemAttr("targetPainterResistanceBonus"))
-    fit.ship.boostItemAttr("weaponDisruptionResistance", src.getModifiedItemAttr("weaponDisruptionResistanceBonus"))
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("siegeModeWarpStatus"))
-
-    fit.ship.forceItemAttr("disallowDocking", src.getModifiedItemAttr("disallowDocking"))
-    fit.ship.forceItemAttr("disallowTethering", src.getModifiedItemAttr("disallowTethering"))
diff --git a/eos/effects/effect6661.py b/eos/effects/effect6661.py
deleted file mode 100644
index 63d22459a..000000000
--- a/eos/effects/effect6661.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCarrierM3FighterVelocity
-#
-# Used by:
-# Ship: Nidhoggur
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("shipBonusCarrierM3"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6662.py b/eos/effects/effect6662.py
deleted file mode 100644
index 4ad0965d0..000000000
--- a/eos/effects/effect6662.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCarrierG3FighterHitpoints
-#
-# Used by:
-# Ship: Thanatos
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("shipBonusCarrierG3"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6663.py b/eos/effects/effect6663.py
deleted file mode 100644
index d832d432b..000000000
--- a/eos/effects/effect6663.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# skillBonusDroneInterfacing
-#
-# Used by:
-# Skill: Drone Interfacing
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"), "miningDroneAmountPercent",
-                                 src.getModifiedItemAttr("miningAmountBonus") * lvl)
diff --git a/eos/effects/effect6664.py b/eos/effects/effect6664.py
deleted file mode 100644
index ea0738dc1..000000000
--- a/eos/effects/effect6664.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# skillBonusDroneSharpshooting
-#
-# Used by:
-# Skill: Drone Sharpshooting
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
-                                 src.getModifiedItemAttr("rangeSkillBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
-                                   src.getModifiedItemAttr("rangeSkillBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeOptimal",
-                                   src.getModifiedItemAttr("rangeSkillBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeOptimal",
-                                   src.getModifiedItemAttr("rangeSkillBonus") * lvl)
diff --git a/eos/effects/effect6665.py b/eos/effects/effect6665.py
deleted file mode 100644
index f36e82a3f..000000000
--- a/eos/effects/effect6665.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# skillBonusDroneDurability
-#
-# Used by:
-# Skill: Drone Durability
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
-                                 src.getModifiedItemAttr("hullHpBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
-                                 src.getModifiedItemAttr("armorHpBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
-                                 src.getModifiedItemAttr("shieldCapacityBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("shieldCapacityBonus") * lvl)
diff --git a/eos/effects/effect6667.py b/eos/effects/effect6667.py
deleted file mode 100644
index 4f5dd8bc5..000000000
--- a/eos/effects/effect6667.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# skillBonusDroneNavigation
-#
-# Used by:
-# Skill: Drone Navigation
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity",
-                                 src.getModifiedItemAttr("maxVelocityBonus") * lvl)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/effect6669.py b/eos/effects/effect6669.py
deleted file mode 100644
index 754bbf2f1..000000000
--- a/eos/effects/effect6669.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# moduleBonusCapitalDroneDurabilityEnhancer
-#
-# Used by:
-# Variations of module: Capital Drone Durability Enhancer I (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
-                                 src.getModifiedItemAttr("hullHpBonus"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
-                                 src.getModifiedItemAttr("hullHpBonus"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
-                                 src.getModifiedItemAttr("hullHpBonus"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("hullHpBonus"))
-    fit.ship.boostItemAttr("cpuOutput", src.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect6670.py b/eos/effects/effect6670.py
deleted file mode 100644
index 68be67520..000000000
--- a/eos/effects/effect6670.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# moduleBonusCapitalDroneScopeChip
-#
-# Used by:
-# Variations of module: Capital Drone Scope Chip I (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxRange",
-                                 src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesRange",
-                                   src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackTurretRangeOptimal", src.getModifiedItemAttr("rangeSkillBonus"),
-                                   stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
-                                   "fighterAbilityAttackMissileRangeOptimal",
-                                   src.getModifiedItemAttr("rangeSkillBonus"), stackingPenalties=True)
-    fit.ship.boostItemAttr("cpuOutput", src.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect6671.py b/eos/effects/effect6671.py
deleted file mode 100644
index c98e00110..000000000
--- a/eos/effects/effect6671.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# moduleBonusCapitalDroneSpeedAugmentor
-#
-# Used by:
-# Variations of module: Capital Drone Speed Augmentor I (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity",
-                                 src.getModifiedItemAttr("droneMaxVelocityBonus"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
-                                   src.getModifiedItemAttr("droneMaxVelocityBonus"), stackingPenalties=True)
-    fit.ship.boostItemAttr("cpuOutput", src.getModifiedItemAttr("drawback"))
diff --git a/eos/effects/effect6672.py b/eos/effects/effect6672.py
deleted file mode 100644
index dcbc93d39..000000000
--- a/eos/effects/effect6672.py
+++ /dev/null
@@ -1,17 +0,0 @@
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, module, context):
-    secModifier = module.getModifiedItemAttr("securityModifier")
-    module.multiplyItemAttr("structureRigDoomsdayDamageLossTargetBonus", secModifier)
-    module.multiplyItemAttr("structureRigScanResBonus", secModifier)
-    module.multiplyItemAttr("structureRigPDRangeBonus", secModifier)
-    module.multiplyItemAttr("structureRigPDCapUseBonus", secModifier)
-    module.multiplyItemAttr("structureRigMissileExploVeloBonus", secModifier)
-    module.multiplyItemAttr("structureRigMissileVelocityBonus", secModifier)
-    module.multiplyItemAttr("structureRigEwarOptimalBonus", secModifier)
-    module.multiplyItemAttr("structureRigEwarFalloffBonus", secModifier)
-    module.multiplyItemAttr("structureRigEwarCapUseBonus", secModifier)
-    module.multiplyItemAttr("structureRigMissileExplosionRadiusBonus", secModifier)
-    module.multiplyItemAttr("structureRigMaxTargetRangeBonus", secModifier)
diff --git a/eos/effects/effect6679.py b/eos/effects/effect6679.py
deleted file mode 100644
index e5c0d43c1..000000000
--- a/eos/effects/effect6679.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillStructureDoomsdayDurationBonus
-#
-# Used by:
-# Skill: Structure Doomsday Operation
-type = "passive", "structure"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Doomsday Weapon",
-                                  "duration", src.getModifiedItemAttr("durationBonus"),
-                                  skill="Structure Doomsday Operation")
diff --git a/eos/effects/effect668.py b/eos/effects/effect668.py
deleted file mode 100644
index 4de267555..000000000
--- a/eos/effects/effect668.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# missileKineticDmgBonus2
-#
-# Used by:
-# Skills named like: Missiles (5 of 7)
-# Skill: Rockets
-# Skill: Torpedoes
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill(skill),
-                                    "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect6681.py b/eos/effects/effect6681.py
deleted file mode 100644
index 86889e55e..000000000
--- a/eos/effects/effect6681.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole3NumWarfareLinks
-#
-# Used by:
-# Ships from group: Force Auxiliary (6 of 6)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect6682.py b/eos/effects/effect6682.py
deleted file mode 100644
index 30040db35..000000000
--- a/eos/effects/effect6682.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# structureModuleEffectStasisWebifier
-#
-# Used by:
-# Structure Modules from group: Structure Stasis Webifier (2 of 2)
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6683.py b/eos/effects/effect6683.py
deleted file mode 100644
index d89abe4b3..000000000
--- a/eos/effects/effect6683.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# structureModuleEffectTargetPainter
-#
-# Used by:
-# Variations of structure module: Standup Target Painter I (2 of 2)
-type = "projected", "active"
-
-
-def handler(fit, container, context, *args, **kwargs):
-    if "projected" in context:
-        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6684.py b/eos/effects/effect6684.py
deleted file mode 100644
index 23cd49378..000000000
--- a/eos/effects/effect6684.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# structureModuleEffectRemoteSensorDampener
-#
-# Used by:
-# Variations of structure module: Standup Remote Sensor Dampener I (2 of 2)
-
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True, *args, **kwargs)
-
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6685.py b/eos/effects/effect6685.py
deleted file mode 100644
index a2725fb5e..000000000
--- a/eos/effects/effect6685.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# structureModuleEffectECM
-#
-# Used by:
-# Structure Modules from group: Structure ECM Battery (3 of 3)
-type = "projected", "active"
-
-
-def handler(fit, module, context):
-    if "projected" in context:
-        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
-
-        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6686.py b/eos/effects/effect6686.py
deleted file mode 100644
index ff3f705ab..000000000
--- a/eos/effects/effect6686.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# structureModuleEffectWeaponDisruption
-#
-# Used by:
-# Variations of structure module: Standup Weapon Disruptor I (2 of 2)
-
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" in context:
-        for srcAttr, tgtAttr in (
-                ("aoeCloudSizeBonus", "aoeCloudSize"),
-                ("aoeVelocityBonus", "aoeVelocity"),
-                ("missileVelocityBonus", "maxVelocity"),
-                ("explosionDelayBonus", "explosionDelay"),
-        ):
-            fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                            tgtAttr, module.getModifiedItemAttr(srcAttr),
-                                            stackingPenalties=True, *args, **kwargs)
-
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6687.py b/eos/effects/effect6687.py
deleted file mode 100644
index e74505c96..000000000
--- a/eos/effects/effect6687.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# npcEntityRemoteArmorRepairer
-#
-# Used by:
-# Drones named like: Armor Maintenance Bot (6 of 6)
-type = "projected", "active"
-
-
-def handler(fit, container, context):
-    if "projected" in context:
-        bonus = container.getModifiedItemAttr("armorDamageAmount")
-        duration = container.getModifiedItemAttr("duration") / 1000.0
-        rps = bonus / duration
-        fit.extraAttributes.increase("armorRepair", rps)
-        fit.extraAttributes.increase("armorRepairPreSpool", rps)
-        fit.extraAttributes.increase("armorRepairFullSpool", rps)
diff --git a/eos/effects/effect6688.py b/eos/effects/effect6688.py
deleted file mode 100644
index 35e49b9d5..000000000
--- a/eos/effects/effect6688.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# npcEntityRemoteShieldBooster
-#
-# Used by:
-# Drones named like: Shield Maintenance Bot (6 of 6)
-type = "projected", "active"
-
-
-def handler(fit, container, context):
-    if "projected" in context:
-        bonus = container.getModifiedItemAttr("shieldBonus")
-        duration = container.getModifiedItemAttr("duration") / 1000.0
-        fit.extraAttributes.increase("shieldRepair", bonus / duration)
diff --git a/eos/effects/effect6689.py b/eos/effects/effect6689.py
deleted file mode 100644
index b3d935bc9..000000000
--- a/eos/effects/effect6689.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# npcEntityRemoteHullRepairer
-#
-# Used by:
-# Drones named like: Hull Maintenance Bot (6 of 6)
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-    bonus = module.getModifiedItemAttr("structureDamageAmount")
-    duration = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("hullRepair", bonus / duration)
diff --git a/eos/effects/effect6690.py b/eos/effects/effect6690.py
deleted file mode 100644
index ca4b34de7..000000000
--- a/eos/effects/effect6690.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# remoteWebifierEntity
-#
-# Used by:
-# Drones from group: Stasis Webifying Drone (3 of 3)
-type = "active", "projected"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6691.py b/eos/effects/effect6691.py
deleted file mode 100644
index ade55d190..000000000
--- a/eos/effects/effect6691.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# entityEnergyNeutralizerFalloff
-#
-# Used by:
-# Drones from group: Energy Neutralizer Drone (3 of 3)
-from eos.const import FittingModuleState
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "active", "projected"
-
-
-def handler(fit, src, context, **kwargs):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= FittingModuleState.ACTIVE) or
-                                   hasattr(src, "amountActive")):
-        amount = src.getModifiedItemAttr("energyNeutralizerAmount")
-        time = src.getModifiedItemAttr("energyNeutralizerDuration")
-
-        if 'effect' in kwargs:
-            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.addDrain(src, time, amount, 0)
diff --git a/eos/effects/effect6692.py b/eos/effects/effect6692.py
deleted file mode 100644
index 07b8c9169..000000000
--- a/eos/effects/effect6692.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# remoteTargetPaintEntity
-#
-# Used by:
-# Drones named like: TP (3 of 3)
-type = "projected", "active"
-
-
-def handler(fit, container, context, *args, **kwargs):
-    if "projected" in context:
-        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6693.py b/eos/effects/effect6693.py
deleted file mode 100644
index 642b55411..000000000
--- a/eos/effects/effect6693.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# remoteSensorDampEntity
-#
-# Used by:
-# Drones named like: SD (3 of 3)
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True, *args, **kwargs)
-
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6694.py b/eos/effects/effect6694.py
deleted file mode 100644
index 28661af18..000000000
--- a/eos/effects/effect6694.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# npcEntityWeaponDisruptor
-#
-# Used by:
-# Drones named like: TD (3 of 3)
-type = "projected", "active"
-
-
-def handler(fit, module, context, *args, **kwargs):
-    if "projected" in context:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, *args, **kwargs)
diff --git a/eos/effects/effect6695.py b/eos/effects/effect6695.py
deleted file mode 100644
index 9e382a641..000000000
--- a/eos/effects/effect6695.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# entityECMFalloff
-#
-# Used by:
-# Drones named like: EC (3 of 3)
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "projected", "active"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" in context:
-        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
-
-        if 'effect' in kwargs:
-            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6697.py b/eos/effects/effect6697.py
deleted file mode 100644
index 312e04d7a..000000000
--- a/eos/effects/effect6697.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# rigDrawbackReductionArmor
-#
-# Used by:
-# Skill: Armor Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Armor", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Resource Processing", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6698.py b/eos/effects/effect6698.py
deleted file mode 100644
index 679e381eb..000000000
--- a/eos/effects/effect6698.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# rigDrawbackReductionAstronautics
-#
-# Used by:
-# Skill: Astronautics Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Navigation", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Anchor", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6699.py b/eos/effects/effect6699.py
deleted file mode 100644
index 1761fae59..000000000
--- a/eos/effects/effect6699.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionDrones
-#
-# Used by:
-# Skill: Drones Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Drones", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect67.py b/eos/effects/effect67.py
deleted file mode 100644
index 1351132dd..000000000
--- a/eos/effects/effect67.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# miningLaser
-#
-# Used by:
-# Modules from group: Frequency Mining Laser (3 of 3)
-# Modules from group: Mining Laser (15 of 15)
-# Modules from group: Strip Miner (5 of 5)
-# Module: Citizen Miner
-type = 'active'
-
-
-def handler(fit, module, context):
-    # Set reload time to 1 second
-    module.reloadTime = 1000
diff --git a/eos/effects/effect670.py b/eos/effects/effect670.py
deleted file mode 100644
index 6a3165c0a..000000000
--- a/eos/effects/effect670.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# antiWarpScramblingPassive
-#
-# Used by:
-# Modules from group: Warp Core Stabilizer (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
diff --git a/eos/effects/effect6700.py b/eos/effects/effect6700.py
deleted file mode 100644
index 7e27b8d0b..000000000
--- a/eos/effects/effect6700.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# rigDrawbackReductionElectronic
-#
-# Used by:
-# Skill: Electronic Superiority Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Electronic Systems", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Scanning", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Targeting", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6701.py b/eos/effects/effect6701.py
deleted file mode 100644
index c6c339041..000000000
--- a/eos/effects/effect6701.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionProjectile
-#
-# Used by:
-# Skill: Projectile Weapon Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Projectile Weapon", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6702.py b/eos/effects/effect6702.py
deleted file mode 100644
index 9d99e3513..000000000
--- a/eos/effects/effect6702.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionEnergyWeapon
-#
-# Used by:
-# Skill: Energy Weapon Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Energy Weapon", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6703.py b/eos/effects/effect6703.py
deleted file mode 100644
index b7ffc0955..000000000
--- a/eos/effects/effect6703.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionHybrid
-#
-# Used by:
-# Skill: Hybrid Weapon Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Hybrid Weapon", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6704.py b/eos/effects/effect6704.py
deleted file mode 100644
index 04276c9b9..000000000
--- a/eos/effects/effect6704.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionLauncher
-#
-# Used by:
-# Skill: Launcher Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Launcher", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6705.py b/eos/effects/effect6705.py
deleted file mode 100644
index fa2f75f88..000000000
--- a/eos/effects/effect6705.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# rigDrawbackReductionShield
-#
-# Used by:
-# Skill: Shield Rigging
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Rig Shield", "drawback",
-                                  src.getModifiedItemAttr("rigDrawbackBonus") * lvl)
diff --git a/eos/effects/effect6706.py b/eos/effects/effect6706.py
deleted file mode 100644
index 853626c7d..000000000
--- a/eos/effects/effect6706.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# setBonusAsklepian
-#
-# Used by:
-# Implants named like: grade Asklepian (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.appliedImplants.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Cybernetics"),
-                                             "armorRepairBonus", src.getModifiedItemAttr("implantSetSerpentis2"))
diff --git a/eos/effects/effect6708.py b/eos/effects/effect6708.py
deleted file mode 100644
index 725c43f33..000000000
--- a/eos/effects/effect6708.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# armorRepairAmountBonusSubcap
-#
-# Used by:
-# Implants named like: grade Asklepian (15 of 18)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("armorRepairBonus"))
diff --git a/eos/effects/effect6709.py b/eos/effects/effect6709.py
deleted file mode 100644
index 4144b30b4..000000000
--- a/eos/effects/effect6709.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole1CapitalHybridDamageBonus
-#
-# Used by:
-# Ship: Vehement
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6710.py b/eos/effects/effect6710.py
deleted file mode 100644
index c822336ba..000000000
--- a/eos/effects/effect6710.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtM1WebStrengthBonus
-#
-# Used by:
-# Ship: Vehement
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/effect6711.py b/eos/effects/effect6711.py
deleted file mode 100644
index c79148d3e..000000000
--- a/eos/effects/effect6711.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole3CapitalHybridDamageBonus
-#
-# Used by:
-# Ship: Vanquisher
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect6712.py b/eos/effects/effect6712.py
deleted file mode 100644
index 54ba011c7..000000000
--- a/eos/effects/effect6712.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanM1WebStrengthBonus
-#
-# Used by:
-# Ship: Vanquisher
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor",
-                                  src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
diff --git a/eos/effects/effect6713.py b/eos/effects/effect6713.py
deleted file mode 100644
index 534d7357c..000000000
--- a/eos/effects/effect6713.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusSupercarrierM1BurstProjectorWebBonus
-#
-# Used by:
-# Ship: Hel
-# Ship: Vendetta
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"), "speedFactor",
-                                  src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6714.py b/eos/effects/effect6714.py
deleted file mode 100644
index f21b89391..000000000
--- a/eos/effects/effect6714.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# ECMBurstJammer
-#
-# Used by:
-# Modules from group: Burst Jammer (11 of 11)
-from eos.modifiedAttributeDict import ModifiedAttributeDict
-
-type = "projected", "active"
-
-
-def handler(fit, module, context, **kwargs):
-    if "projected" in context:
-        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
-
-        if 'effect' in kwargs:
-            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
-
-        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/effect6717.py b/eos/effects/effect6717.py
deleted file mode 100644
index f2dfdf612..000000000
--- a/eos/effects/effect6717.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# roleBonusIceOreMiningDurationCap
-#
-# Used by:
-# Variations of ship: Covetor (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), "capacitorNeed",
-                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), "duration",
-                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration",
-                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "capacitorNeed",
-                                  src.getModifiedItemAttr("miningDurationRoleBonus"))
diff --git a/eos/effects/effect6720.py b/eos/effects/effect6720.py
deleted file mode 100644
index 77cc9a69d..000000000
--- a/eos/effects/effect6720.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusDroneRepairMC1
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldBonus",
-                                 src.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "structureDamageAmount",
-                                 src.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorDamageAmount",
-                                 src.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6721.py b/eos/effects/effect6721.py
deleted file mode 100644
index cacbd4478..000000000
--- a/eos/effects/effect6721.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# eliteBonusLogisticRemoteArmorRepairOptimalFalloff1
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness",
-                                  src.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusLogistics1"),
-                                  skill="Logistics Cruisers")
diff --git a/eos/effects/effect6722.py b/eos/effects/effect6722.py
deleted file mode 100644
index fae8acfac..000000000
--- a/eos/effects/effect6722.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# roleBonusRemoteArmorRepairOptimalFalloff
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "falloffEffectiveness",
-                                  src.getModifiedItemAttr("roleBonusRepairRange"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "maxRange",
-                                  src.getModifiedItemAttr("roleBonusRepairRange"))
diff --git a/eos/effects/effect6723.py b/eos/effects/effect6723.py
deleted file mode 100644
index ac83921f0..000000000
--- a/eos/effects/effect6723.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCloakCpuMC2
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"), "cpu",
-                                  src.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect6724.py b/eos/effects/effect6724.py
deleted file mode 100644
index 5c9b24c1c..000000000
--- a/eos/effects/effect6724.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusLogisticRemoteArmorRepairDuration3
-#
-# Used by:
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration",
-                                  src.getModifiedItemAttr("eliteBonusLogistics3"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect6725.py b/eos/effects/effect6725.py
deleted file mode 100644
index 9c6f67d13..000000000
--- a/eos/effects/effect6725.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSETFalloffAF2
-#
-# Used by:
-# Ship: Caedes
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "falloff",
-                                  src.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect6726.py b/eos/effects/effect6726.py
deleted file mode 100644
index fe201e1df..000000000
--- a/eos/effects/effect6726.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCloakCpuMF1
-#
-# Used by:
-# Ship: Caedes
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"), "cpu",
-                                  src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect6727.py b/eos/effects/effect6727.py
deleted file mode 100644
index 8c142334a..000000000
--- a/eos/effects/effect6727.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusCoverOpsNOSNeutFalloff1
-#
-# Used by:
-# Ship: Caedes
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusCovertOps1"),
-                                  stackingPenalties=True, skill="Covert Ops")
diff --git a/eos/effects/effect6730.py b/eos/effects/effect6730.py
deleted file mode 100644
index 70478fa71..000000000
--- a/eos/effects/effect6730.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusMicrowarpdrive
-#
-# Used by:
-# Modules from group: Propulsion Module (68 of 133)
-type = "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
-    speedBoost = module.getModifiedItemAttr("speedFactor")
-    mass = fit.ship.getModifiedItemAttr("mass")
-    thrust = module.getModifiedItemAttr("speedBoostFactor")
-    fit.ship.boostItemAttr("maxVelocity", speedBoost * thrust / mass)
-    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"),
-                           stackingPenalties=True)
diff --git a/eos/effects/effect6731.py b/eos/effects/effect6731.py
deleted file mode 100644
index 71f4c96b1..000000000
--- a/eos/effects/effect6731.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# moduleBonusAfterburner
-#
-# Used by:
-# Modules from group: Propulsion Module (65 of 133)
-type = "active"
-runTime = "late"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))
-    speedBoost = module.getModifiedItemAttr("speedFactor")
-    mass = fit.ship.getModifiedItemAttr("mass")
-    thrust = module.getModifiedItemAttr("speedBoostFactor")
-    fit.ship.boostItemAttr("maxVelocity", speedBoost * thrust / mass)
diff --git a/eos/effects/effect6732.py b/eos/effects/effect6732.py
deleted file mode 100644
index c7cf29ce3..000000000
--- a/eos/effects/effect6732.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# moduleBonusWarfareLinkArmor
-#
-# Used by:
-# Variations of module: Armor Command Burst I (2 of 2)
-
-"""
-Some documentation:
-When the fit is calculated, we gather up all the gang effects and stick them onto the fit. We don't run the actual
-effect yet, only give the fit details so that it can run the effect at a later time. We need to do this so that we can
-only run the strongest effect. When we are done, one of the last things that we do with the fit is to loop through those
-bonuses and actually run the effect. To do this, we have a special argument passed into the effect handler that tells it
-which warfareBuffID to run (shouldn't need this right now, but better safe than sorry)
-"""
-
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6733.py b/eos/effects/effect6733.py
deleted file mode 100644
index 45cd0ac6f..000000000
--- a/eos/effects/effect6733.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusWarfareLinkShield
-#
-# Used by:
-# Variations of module: Shield Command Burst I (2 of 2)
-
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6734.py b/eos/effects/effect6734.py
deleted file mode 100644
index fc400c791..000000000
--- a/eos/effects/effect6734.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusWarfareLinkSkirmish
-#
-# Used by:
-# Variations of module: Skirmish Command Burst I (2 of 2)
-
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6735.py b/eos/effects/effect6735.py
deleted file mode 100644
index dd1e1111b..000000000
--- a/eos/effects/effect6735.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusWarfareLinkInfo
-#
-# Used by:
-# Variations of module: Information Command Burst I (2 of 2)
-
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6736.py b/eos/effects/effect6736.py
deleted file mode 100644
index 55876bc34..000000000
--- a/eos/effects/effect6736.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusWarfareLinkMining
-#
-# Used by:
-# Variations of module: Mining Foreman Burst I (2 of 2)
-
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6737.py b/eos/effects/effect6737.py
deleted file mode 100644
index b0998fbb4..000000000
--- a/eos/effects/effect6737.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# chargeBonusWarfareCharge
-#
-# Used by:
-# Items from market group: Ammunition & Charges > Command Burst Charges (15 of 15)
-type = "active"
-
-
-def handler(fit, module, context):
-    for x in range(1, 4):
-        value = module.getModifiedChargeAttr("warfareBuff{}Multiplier".format(x))
-        module.multiplyItemAttr("warfareBuff{}Value".format(x), value)
diff --git a/eos/effects/effect675.py b/eos/effects/effect675.py
deleted file mode 100644
index 9fcfb86fe..000000000
--- a/eos/effects/effect675.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringEnergyPulseWeapons
-#
-# Used by:
-# Skill: Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Pulse Weapons"),
-                                  "cpu", skill.getModifiedItemAttr("cpuNeedBonus") * skill.level)
diff --git a/eos/effects/effect6753.py b/eos/effects/effect6753.py
deleted file mode 100644
index 741de5ba4..000000000
--- a/eos/effects/effect6753.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# moduleTitanEffectGenerator
-#
-# Used by:
-# Modules from group: Titan Phenomena Generator (4 of 4)
-type = "active", "gang"
-
-
-def handler(fit, module, context, **kwargs):
-    for x in range(1, 5):
-        if module.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = module.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
diff --git a/eos/effects/effect6762.py b/eos/effects/effect6762.py
deleted file mode 100644
index fe8cdff5a..000000000
--- a/eos/effects/effect6762.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# miningDroneSpecBonus
-#
-# Used by:
-# Skill: Mining Drone Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Drone Specialization"), "miningAmount",
-                                 src.getModifiedItemAttr("miningAmountBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Drone Specialization"), "maxVelocity",
-                                 src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/effect6763.py b/eos/effects/effect6763.py
deleted file mode 100644
index 9cd10d66a..000000000
--- a/eos/effects/effect6763.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# iceHarvestingDroneOperationDurationBonus
-#
-# Used by:
-# Modules named like: Drone Mining Augmentor (8 of 8)
-# Skill: Ice Harvesting Drone Operation
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level if "skill" in context else 1
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting Drone Operation"), "duration", src.getModifiedItemAttr("rofBonus") * lvl)
diff --git a/eos/effects/effect6764.py b/eos/effects/effect6764.py
deleted file mode 100644
index 18af9f3b1..000000000
--- a/eos/effects/effect6764.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# iceHarvestingDroneSpecBonus
-#
-# Used by:
-# Skill: Ice Harvesting Drone Specialization
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting Drone Specialization"), "duration",
-                                 src.getModifiedItemAttr("rofBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting Drone Specialization"),
-                                 "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl)
diff --git a/eos/effects/effect6765.py b/eos/effects/effect6765.py
deleted file mode 100644
index b127ae30d..000000000
--- a/eos/effects/effect6765.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# spatialPhenomenaGenerationDurationBonus
-#
-# Used by:
-# Skill: Spatial Phenomena Generation
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Spatial Phenomena Generation"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6766.py b/eos/effects/effect6766.py
deleted file mode 100644
index 887644ece..000000000
--- a/eos/effects/effect6766.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# commandProcessorEffect
-#
-# Used by:
-# Modules named like: Command Processor I (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive",
-                                     src.getModifiedItemAttr("maxGangModules"))
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupOnline",
-                                     src.getModifiedItemAttr("maxGangModules"))
diff --git a/eos/effects/effect6769.py b/eos/effects/effect6769.py
deleted file mode 100644
index 5500e8578..000000000
--- a/eos/effects/effect6769.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# commandBurstAoEBonus
-#
-# Used by:
-# Skill: Fleet Command
-# Skill: Leadership
-# Skill: Wing Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "maxRange",
-                                  src.getModifiedItemAttr("areaOfEffectBonus") * src.level)
diff --git a/eos/effects/effect677.py b/eos/effects/effect677.py
deleted file mode 100644
index d64e19944..000000000
--- a/eos/effects/effect677.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# weaponUpgradesCpuNeedBonusPostPercentCpuLocationShipModulesRequiringMissileLauncherOperation
-#
-# Used by:
-# Implants named like: Zainou 'Gnome' Launcher CPU Efficiency LE (6 of 6)
-# Skill: Weapon Upgrades
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "cpu", container.getModifiedItemAttr("cpuNeedBonus") * level)
diff --git a/eos/effects/effect6770.py b/eos/effects/effect6770.py
deleted file mode 100644
index 171dfbbb2..000000000
--- a/eos/effects/effect6770.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# armoredCommandDurationBonus
-#
-# Used by:
-# Skill: Armored Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6771.py b/eos/effects/effect6771.py
deleted file mode 100644
index a7425a974..000000000
--- a/eos/effects/effect6771.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shieldCommandDurationBonus
-#
-# Used by:
-# Skill: Shield Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6772.py b/eos/effects/effect6772.py
deleted file mode 100644
index f5a7dc351..000000000
--- a/eos/effects/effect6772.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# informationCommandDurationBonus
-#
-# Used by:
-# Skill: Information Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6773.py b/eos/effects/effect6773.py
deleted file mode 100644
index 7b42437e1..000000000
--- a/eos/effects/effect6773.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skirmishCommandDurationBonus
-#
-# Used by:
-# Skill: Skirmish Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6774.py b/eos/effects/effect6774.py
deleted file mode 100644
index 14a290d2e..000000000
--- a/eos/effects/effect6774.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# miningForemanDurationBonus
-#
-# Used by:
-# Skill: Mining Foreman
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6776.py b/eos/effects/effect6776.py
deleted file mode 100644
index 6bc5e365e..000000000
--- a/eos/effects/effect6776.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# armoredCommandStrengthBonus
-#
-# Used by:
-# Skill: Armored Command Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
diff --git a/eos/effects/effect6777.py b/eos/effects/effect6777.py
deleted file mode 100644
index b95fe66df..000000000
--- a/eos/effects/effect6777.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shieldCommandStrengthBonus
-#
-# Used by:
-# Skill: Shield Command Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
diff --git a/eos/effects/effect6778.py b/eos/effects/effect6778.py
deleted file mode 100644
index e4431bee0..000000000
--- a/eos/effects/effect6778.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# informationCommandStrengthBonus
-#
-# Used by:
-# Skill: Information Command Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
diff --git a/eos/effects/effect6779.py b/eos/effects/effect6779.py
deleted file mode 100644
index 7963755df..000000000
--- a/eos/effects/effect6779.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# skirmishCommandStrengthBonus
-#
-# Used by:
-# Skill: Skirmish Command Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
diff --git a/eos/effects/effect6780.py b/eos/effects/effect6780.py
deleted file mode 100644
index e7af57839..000000000
--- a/eos/effects/effect6780.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# miningForemanStrengthBonus
-#
-# Used by:
-# Skill: Mining Director
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
diff --git a/eos/effects/effect6782.py b/eos/effects/effect6782.py
deleted file mode 100644
index c0207bef4..000000000
--- a/eos/effects/effect6782.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# commandBurstReloadTimeBonus
-#
-# Used by:
-# Skill: Command Burst Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"),
-                                  "reloadTime",
-                                  src.getModifiedItemAttr("reloadTimeBonus") * lvl)
diff --git a/eos/effects/effect6783.py b/eos/effects/effect6783.py
deleted file mode 100644
index f69aecd01..000000000
--- a/eos/effects/effect6783.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# commandBurstAoERoleBonus
-#
-# Used by:
-# Ships from group: Carrier (4 of 4)
-# Ships from group: Combat Battlecruiser (14 of 14)
-# Ships from group: Command Ship (8 of 8)
-# Ships from group: Force Auxiliary (6 of 6)
-# Ships from group: Supercarrier (6 of 6)
-# Ships from group: Titan (7 of 7)
-# Subsystems named like: Offensive Support Processor (4 of 4)
-# Ship: Orca
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "maxRange",
-                                  src.getModifiedItemAttr("roleBonusCommandBurstAoERange"))
diff --git a/eos/effects/effect6786.py b/eos/effects/effect6786.py
deleted file mode 100644
index 1a61286b7..000000000
--- a/eos/effects/effect6786.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shieldCommandBurstBonusICS3
-#
-# Used by:
-# Ship: Orca
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Multiplier",
-                                  src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Multiplier",
-                                  src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Multiplier",
-                                  src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Multiplier",
-                                  src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
diff --git a/eos/effects/effect6787.py b/eos/effects/effect6787.py
deleted file mode 100644
index 8b06c6dec..000000000
--- a/eos/effects/effect6787.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# shipBonusDroneHPDamageMiningICS4
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier",
-                                 src.getModifiedItemAttr("shipBonusICS4"),
-                                 skill="Industrial Command Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity",
-                                 src.getModifiedItemAttr("shipBonusICS4"),
-                                 skill="Industrial Command Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP",
-                                 src.getModifiedItemAttr("shipBonusICS4"),
-                                 skill="Industrial Command Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp",
-                                 src.getModifiedItemAttr("shipBonusICS4"),
-                                 skill="Industrial Command Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount",
-                                 src.getModifiedItemAttr("shipBonusICS4"),
-                                 skill="Industrial Command Ships"
-                                 )
diff --git a/eos/effects/effect6788.py b/eos/effects/effect6788.py
deleted file mode 100644
index 4119b36c7..000000000
--- a/eos/effects/effect6788.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusDroneIceHarvestingICS5
-#
-# Used by:
-# Ships from group: Industrial Command Ship (2 of 2)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Ice Harvesting Drone Operation"),
-                                 "duration",
-                                 src.getModifiedItemAttr("shipBonusICS5"),
-                                 skill="Industrial Command Ships"
-                                 )
diff --git a/eos/effects/effect6789.py b/eos/effects/effect6789.py
deleted file mode 100644
index f6c5137bd..000000000
--- a/eos/effects/effect6789.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# industrialBonusDroneDamage
-#
-# Used by:
-# Ships from group: Blockade Runner (4 of 4)
-# Ships from group: Deep Space Transport (4 of 4)
-# Ships from group: Exhumer (3 of 3)
-# Ships from group: Industrial (17 of 17)
-# Ships from group: Industrial Command Ship (2 of 2)
-# Ships from group: Mining Barge (3 of 3)
-# Variations of ship: Venture (3 of 3)
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier",
-                                 src.getModifiedItemAttr("industrialBonusDroneDamage"))
diff --git a/eos/effects/effect6790.py b/eos/effects/effect6790.py
deleted file mode 100644
index b45241f9f..000000000
--- a/eos/effects/effect6790.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneIceHarvestingRole
-#
-# Used by:
-# Ship: Orca
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting Drone Operation"), "duration",
-                                 src.getModifiedItemAttr("roleBonusDroneIceHarvestingSpeed"))
diff --git a/eos/effects/effect6792.py b/eos/effects/effect6792.py
deleted file mode 100644
index 8cd53cd81..000000000
--- a/eos/effects/effect6792.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# shipBonusDroneHPDamageMiningORECapital4
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier",
-                                 src.getModifiedItemAttr("shipBonusORECapital4"),
-                                 skill="Capital Industrial Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "shieldCapacity",
-                                 src.getModifiedItemAttr("shipBonusORECapital4"),
-                                 skill="Capital Industrial Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "armorHP",
-                                 src.getModifiedItemAttr("shipBonusORECapital4"),
-                                 skill="Capital Industrial Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "hp",
-                                 src.getModifiedItemAttr("shipBonusORECapital4"),
-                                 skill="Capital Industrial Ships"
-                                 )
-
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"),
-                                 "miningAmount",
-                                 src.getModifiedItemAttr("shipBonusORECapital4"),
-                                 skill="Capital Industrial Ships"
-                                 )
diff --git a/eos/effects/effect6793.py b/eos/effects/effect6793.py
deleted file mode 100644
index 29d55819e..000000000
--- a/eos/effects/effect6793.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# miningForemanBurstBonusORECapital2
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration",
-                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
diff --git a/eos/effects/effect6794.py b/eos/effects/effect6794.py
deleted file mode 100644
index 8ad4a3462..000000000
--- a/eos/effects/effect6794.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# shieldCommandBurstBonusORECapital3
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
-                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value",
-                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
diff --git a/eos/effects/effect6795.py b/eos/effects/effect6795.py
deleted file mode 100644
index 754ea3fe6..000000000
--- a/eos/effects/effect6795.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipBonusDroneIceHarvestingORECapital5
-#
-# Used by:
-# Ship: Rorqual
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Ice Harvesting Drone Operation"),
-                                 "duration",
-                                 src.getModifiedItemAttr("shipBonusORECapital5"),
-                                 skill="Capital Industrial Ships"
-                                 )
diff --git a/eos/effects/effect6796.py b/eos/effects/effect6796.py
deleted file mode 100644
index 8ce7e5d6d..000000000
--- a/eos/effects/effect6796.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSHTDamagePostDiv
-#
-# Used by:
-# Module: Hecate Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-        "damageMultiplier",
-        1 / module.getModifiedItemAttr("modeDamageBonusPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6797.py b/eos/effects/effect6797.py
deleted file mode 100644
index 788237c03..000000000
--- a/eos/effects/effect6797.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSPTDamagePostDiv
-#
-# Used by:
-# Module: Svipul Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-        "damageMultiplier",
-        1 / module.getModifiedItemAttr("modeDamageBonusPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6798.py b/eos/effects/effect6798.py
deleted file mode 100644
index 83c827795..000000000
--- a/eos/effects/effect6798.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSETDamagePostDiv
-#
-# Used by:
-# Module: Confessor Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-        "damageMultiplier",
-        1 / module.getModifiedItemAttr("modeDamageBonusPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6799.py b/eos/effects/effect6799.py
deleted file mode 100644
index 31df33c3a..000000000
--- a/eos/effects/effect6799.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# shipModeSmallMissileDamagePostDiv
-#
-# Used by:
-# Module: Jackdaw Sharpshooter Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    types = ("thermal", "em", "explosive", "kinetic")
-    for type in types:
-        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                           "{}Damage".format(type),
-                                           1 / module.getModifiedItemAttr("modeDamageBonusPostDiv"),
-                                           stackingPenalties=True,
-                                           penaltyGroup="postDiv")
diff --git a/eos/effects/effect6800.py b/eos/effects/effect6800.py
deleted file mode 100644
index 891b84a82..000000000
--- a/eos/effects/effect6800.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# modeDampTDResistsPostDiv
-#
-# Used by:
-# Modules named like: Sharpshooter Mode (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("weaponDisruptionResistance", 1 / module.getModifiedItemAttr("modeEwarResistancePostDiv"))
-    fit.ship.multiplyItemAttr("sensorDampenerResistance", 1 / module.getModifiedItemAttr("modeEwarResistancePostDiv"))
diff --git a/eos/effects/effect6801.py b/eos/effects/effect6801.py
deleted file mode 100644
index fdc4a67d3..000000000
--- a/eos/effects/effect6801.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# modeMWDandABBoostPostDiv
-#
-# Used by:
-# Module: Confessor Propulsion Mode
-# Module: Svipul Propulsion Mode
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(
-        lambda mod: mod.item.requiresSkill("High Speed Maneuvering") or mod.item.requiresSkill("Afterburner"),
-        "speedFactor",
-        1 / module.getModifiedItemAttr("modeVelocityPostDiv"),
-        stackingPenalties=True,
-        penaltyGroup="postDiv"
-    )
diff --git a/eos/effects/effect6807.py b/eos/effects/effect6807.py
deleted file mode 100644
index b318f11cb..000000000
--- a/eos/effects/effect6807.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# invulnerabilityCoreDurationBonus
-#
-# Used by:
-# Skill: Invulnerability Core Operation
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Invulnerability Core Operation"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Invulnerability Core Operation"), "duration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
diff --git a/eos/effects/effect6844.py b/eos/effects/effect6844.py
deleted file mode 100644
index 137e31f44..000000000
--- a/eos/effects/effect6844.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# skillMultiplierDefenderMissileVelocity
-#
-# Used by:
-# Skill: Defender Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Defender Missiles"),
-                                    "maxVelocity", skill.getModifiedItemAttr("missileVelocityBonus") * skill.level)
diff --git a/eos/effects/effect6845.py b/eos/effects/effect6845.py
deleted file mode 100644
index cd2c1e733..000000000
--- a/eos/effects/effect6845.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCommandDestroyerRole1DefenderBonus
-#
-# Used by:
-# Ships from group: Command Destroyer (4 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Defender Missiles"),
-                                  "moduleReactivationDelay", ship.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6851.py b/eos/effects/effect6851.py
deleted file mode 100644
index d21771a03..000000000
--- a/eos/effects/effect6851.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole3CapitalEnergyDamageBonus
-#
-# Used by:
-# Ship: Chemosh
-# Ship: Molok
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect6852.py b/eos/effects/effect6852.py
deleted file mode 100644
index c026e376e..000000000
--- a/eos/effects/effect6852.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusTitanM1WebRangeBonus
-#
-# Used by:
-# Ship: Molok
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
diff --git a/eos/effects/effect6853.py b/eos/effects/effect6853.py
deleted file mode 100644
index 596439814..000000000
--- a/eos/effects/effect6853.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusTitanA1EnergyWarfareAmountBonus
-#
-# Used by:
-# Ship: Molok
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
diff --git a/eos/effects/effect6855.py b/eos/effects/effect6855.py
deleted file mode 100644
index 86e7725ac..000000000
--- a/eos/effects/effect6855.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusDreadnoughtA1EnergyWarfareAmountBonus
-#
-# Used by:
-# Ship: Chemosh
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
diff --git a/eos/effects/effect6856.py b/eos/effects/effect6856.py
deleted file mode 100644
index f79762142..000000000
--- a/eos/effects/effect6856.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDreadnoughtM1WebRangeBonus
-#
-# Used by:
-# Ship: Chemosh
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "maxRange", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
diff --git a/eos/effects/effect6857.py b/eos/effects/effect6857.py
deleted file mode 100644
index f3a1d2a62..000000000
--- a/eos/effects/effect6857.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusForceAuxiliaryA1NosferatuRangeBonus
-#
-# Used by:
-# Ship: Dagon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "maxRange", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "falloffEffectiveness", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6858.py b/eos/effects/effect6858.py
deleted file mode 100644
index 113c0e899..000000000
--- a/eos/effects/effect6858.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusForceAuxiliaryA1NosferatuDrainAmount
-#
-# Used by:
-# Ship: Dagon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
-                                  "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
diff --git a/eos/effects/effect6859.py b/eos/effects/effect6859.py
deleted file mode 100644
index 1d67fbb4b..000000000
--- a/eos/effects/effect6859.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole4NosferatuCPUBonus
-#
-# Used by:
-# Ship: Dagon
-# Ship: Rabisu
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "cpu", src.getModifiedItemAttr("shipBonusRole4"))
diff --git a/eos/effects/effect6860.py b/eos/effects/effect6860.py
deleted file mode 100644
index 5e87c2241..000000000
--- a/eos/effects/effect6860.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusRole5RemoteArmorRepairPowergridBonus
-#
-# Used by:
-# Ships from group: Logistics (3 of 7)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "power",
-                                  src.getModifiedItemAttr("shipBonusRole5"))
diff --git a/eos/effects/effect6861.py b/eos/effects/effect6861.py
deleted file mode 100644
index 8e33eb7a0..000000000
--- a/eos/effects/effect6861.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipBonusRole5CapitalRemoteArmorRepairPowergridBonus
-#
-# Used by:
-# Ship: Dagon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "power", src.getModifiedItemAttr("shipBonusRole5"))
diff --git a/eos/effects/effect6862.py b/eos/effects/effect6862.py
deleted file mode 100644
index fd4dca81a..000000000
--- a/eos/effects/effect6862.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusForceAuxiliaryM1RemoteArmorRepairDuration
-#
-# Used by:
-# Ship: Dagon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6865.py b/eos/effects/effect6865.py
deleted file mode 100644
index 1a25a973a..000000000
--- a/eos/effects/effect6865.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusCoverOpsWarpVelocity1
-#
-# Used by:
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
diff --git a/eos/effects/effect6866.py b/eos/effects/effect6866.py
deleted file mode 100644
index 0b41b4185..000000000
--- a/eos/effects/effect6866.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusSmallMissileFlightTimeCF1
-#
-# Used by:
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"),
-                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"),
-                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect6867.py b/eos/effects/effect6867.py
deleted file mode 100644
index 86ac5f332..000000000
--- a/eos/effects/effect6867.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSPTRoFMF
-#
-# Used by:
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "speed", src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect6871.py b/eos/effects/effect6871.py
deleted file mode 100644
index 16d1b65c5..000000000
--- a/eos/effects/effect6871.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# concordSecStatusTankBonus
-#
-# Used by:
-# Ship: Enforcer
-# Ship: Marshal
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, src, context):
-
-    # Get pilot sec status bonus directly here, instead of going through the intermediary effects
-    # via https://forums.eveonline.com/default.aspx?g=posts&t=515826
-    try:
-        bonus = max(0, min(50.0, (src.parent.character.secStatus * 10)))
-    except:
-        bonus = None
-
-    if bonus is not None:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", bonus, stackingPenalties=True)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", bonus, stackingPenalties=True)
diff --git a/eos/effects/effect6872.py b/eos/effects/effect6872.py
deleted file mode 100644
index abbf4f6c6..000000000
--- a/eos/effects/effect6872.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteReconStasisWebBonus1
-#
-# Used by:
-# Ship: Enforcer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect6873.py b/eos/effects/effect6873.py
deleted file mode 100644
index 909c577a1..000000000
--- a/eos/effects/effect6873.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusReconWarpVelocity3
-#
-# Used by:
-# Ship: Enforcer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6874.py b/eos/effects/effect6874.py
deleted file mode 100644
index a8d76a49e..000000000
--- a/eos/effects/effect6874.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusMedMissileFlightTimeCC2
-#
-# Used by:
-# Ship: Enforcer
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect6877.py b/eos/effects/effect6877.py
deleted file mode 100644
index b3f824494..000000000
--- a/eos/effects/effect6877.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# eliteBonusBlackOpsWarpVelocity1
-#
-# Used by:
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusBlackOps1"), stackingPenalties=True, skill="Black Ops")
diff --git a/eos/effects/effect6878.py b/eos/effects/effect6878.py
deleted file mode 100644
index 67519dc01..000000000
--- a/eos/effects/effect6878.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusBlackOpsScramblerRange4
-#
-# Used by:
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusBlackOps4"), stackingPenalties=True, skill="Black Ops")
diff --git a/eos/effects/effect6879.py b/eos/effects/effect6879.py
deleted file mode 100644
index c1ea901de..000000000
--- a/eos/effects/effect6879.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusBlackOpsWebRange3
-#
-# Used by:
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange",
-                                  src.getModifiedItemAttr("eliteBonusBlackOps3"), stackingPenalties=True, skill="Black Ops")
diff --git a/eos/effects/effect6880.py b/eos/effects/effect6880.py
deleted file mode 100644
index a64adde8d..000000000
--- a/eos/effects/effect6880.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# shipBonusLauncherRoF2CB
-#
-# Used by:
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise", "speed",
-                                  src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo", "speed",
-                                  src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy", "speed",
-                                  src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect6881.py b/eos/effects/effect6881.py
deleted file mode 100644
index 9108bddbe..000000000
--- a/eos/effects/effect6881.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusLargeMissileFlightTimeCB1
-#
-# Used by:
-# Ship: Marshal
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosionDelay",
-                                    src.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "explosionDelay",
-                                    src.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
diff --git a/eos/effects/effect6883.py b/eos/effects/effect6883.py
deleted file mode 100644
index 00531404a..000000000
--- a/eos/effects/effect6883.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusForceAuxiliaryM2LocalRepairAmount
-#
-# Used by:
-# Ship: Dagon
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryM2"), skill="Minmatar Carrier")
diff --git a/eos/effects/effect6894.py b/eos/effects/effect6894.py
deleted file mode 100644
index 52c427fa1..000000000
--- a/eos/effects/effect6894.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemEnergyNeutFittingReduction
-#
-# Used by:
-# Subsystem: Legion Core - Energy Parasitic Complex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"),
-    "cpu", src.getModifiedItemAttr("subsystemEnergyNeutFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"),
-                                  "power", src.getModifiedItemAttr("subsystemEnergyNeutFittingReduction"))
diff --git a/eos/effects/effect6895.py b/eos/effects/effect6895.py
deleted file mode 100644
index ea3567a27..000000000
--- a/eos/effects/effect6895.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemMETFittingReduction
-#
-# Used by:
-# Subsystem: Legion Offensive - Liquid Crystal Magnifiers
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "cpu", src.getModifiedItemAttr("subsystemMETFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "power", src.getModifiedItemAttr("subsystemMETFittingReduction"))
diff --git a/eos/effects/effect6896.py b/eos/effects/effect6896.py
deleted file mode 100644
index 29aaec123..000000000
--- a/eos/effects/effect6896.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# subsystemMHTFittingReduction
-#
-# Used by:
-# Subsystem: Proteus Offensive - Drone Synthesis Projector
-# Subsystem: Proteus Offensive - Hybrid Encoding Platform
-# Subsystem: Tengu Offensive - Magnetic Infusion Basin
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "cpu", src.getModifiedItemAttr("subsystemMHTFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "power", src.getModifiedItemAttr("subsystemMHTFittingReduction"))
diff --git a/eos/effects/effect6897.py b/eos/effects/effect6897.py
deleted file mode 100644
index 7660239b8..000000000
--- a/eos/effects/effect6897.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemMPTFittingReduction
-#
-# Used by:
-# Subsystem: Loki Offensive - Projectile Scoping Array
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "power", src.getModifiedItemAttr("subsystemMPTFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "cpu", src.getModifiedItemAttr("subsystemMPTFittingReduction"))
diff --git a/eos/effects/effect6898.py b/eos/effects/effect6898.py
deleted file mode 100644
index 070407bca..000000000
--- a/eos/effects/effect6898.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# subsystemMRARFittingReduction
-#
-# Used by:
-# Subsystems named like: Offensive Support Processor (3 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") and
-                                              mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                  "cpu", src.getModifiedItemAttr("subsystemMRARFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") and
-                                              mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                  "power", src.getModifiedItemAttr("subsystemMRARFittingReduction"))
diff --git a/eos/effects/effect6899.py b/eos/effects/effect6899.py
deleted file mode 100644
index 98185b770..000000000
--- a/eos/effects/effect6899.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemMRSBFittingReduction
-#
-# Used by:
-# Subsystem: Loki Offensive - Support Processor
-# Subsystem: Tengu Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") and
-                                              mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                  "cpu", src.getModifiedItemAttr("subsystemMRSBFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") and
-                                              mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1,
-                                  "power", src.getModifiedItemAttr("subsystemMRSBFittingReduction"))
diff --git a/eos/effects/effect6900.py b/eos/effects/effect6900.py
deleted file mode 100644
index 299536c2a..000000000
--- a/eos/effects/effect6900.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemMMissileFittingReduction
-#
-# Used by:
-# Subsystem: Legion Offensive - Assault Optimization
-# Subsystem: Loki Offensive - Launcher Efficiency Configuration
-# Subsystem: Tengu Offensive - Accelerated Ejection Bay
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "cpu", src.getModifiedItemAttr("subsystemMMissileFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
-                                  "power", src.getModifiedItemAttr("subsystemMMissileFittingReduction"))
diff --git a/eos/effects/effect6908.py b/eos/effects/effect6908.py
deleted file mode 100644
index d245c16ca..000000000
--- a/eos/effects/effect6908.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserCaldariNaniteRepairTime2
-#
-# Used by:
-# Ship: Tengu
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserCaldari2"),
-                                  skill="Caldari Strategic Cruiser")
diff --git a/eos/effects/effect6909.py b/eos/effects/effect6909.py
deleted file mode 100644
index 3f15088b8..000000000
--- a/eos/effects/effect6909.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserAmarrNaniteRepairTime2
-#
-# Used by:
-# Ship: Legion
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserAmarr2"),
-                                  skill="Amarr Strategic Cruiser")
diff --git a/eos/effects/effect6910.py b/eos/effects/effect6910.py
deleted file mode 100644
index 0652e251e..000000000
--- a/eos/effects/effect6910.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserGallenteNaniteRepairTime2
-#
-# Used by:
-# Ship: Proteus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserGallente2"),
-                                  skill="Gallente Strategic Cruiser")
diff --git a/eos/effects/effect6911.py b/eos/effects/effect6911.py
deleted file mode 100644
index 9fe7b88c9..000000000
--- a/eos/effects/effect6911.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusStrategicCruiserMinmatarNaniteRepairTime2
-#
-# Used by:
-# Ship: Loki
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate",
-                                  ship.getModifiedItemAttr("shipBonusStrategicCruiserMinmatar2"),
-                                  skill="Minmatar Strategic Cruiser")
diff --git a/eos/effects/effect6920.py b/eos/effects/effect6920.py
deleted file mode 100644
index c2b7db0ed..000000000
--- a/eos/effects/effect6920.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureHPBonusAddPassive
-#
-# Used by:
-# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
-# Subsystem: Loki Defensive - Adaptive Defense Node
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("hp", module.getModifiedItemAttr("structureHPBonusAdd") or 0)
diff --git a/eos/effects/effect6921.py b/eos/effects/effect6921.py
deleted file mode 100644
index a7f2c9f58..000000000
--- a/eos/effects/effect6921.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subSystemBonusAmarrDefensive2ScanProbeStrength
-#
-# Used by:
-# Subsystem: Legion Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", src.getModifiedItemAttr("subsystemBonusAmarrDefensive2"),
-                                    skill="Amarr Defensive Systems")
diff --git a/eos/effects/effect6923.py b/eos/effects/effect6923.py
deleted file mode 100644
index 49ae9388a..000000000
--- a/eos/effects/effect6923.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive1HMLHAMVelo
-#
-# Used by:
-# Subsystem: Loki Offensive - Launcher Efficiency Configuration
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles") or mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                  "maxVelocity", container.getModifiedItemAttr("subsystemBonusMinmatarOffensive"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect6924.py b/eos/effects/effect6924.py
deleted file mode 100644
index 7dd2cde86..000000000
--- a/eos/effects/effect6924.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive3MissileExpVelo
-#
-# Used by:
-# Subsystem: Loki Offensive - Launcher Efficiency Configuration
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                  "aoeVelocity", container.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect6925.py b/eos/effects/effect6925.py
deleted file mode 100644
index 72b7e628d..000000000
--- a/eos/effects/effect6925.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# subsystemBonusGallenteOffensive2DroneVeloTracking
-#
-# Used by:
-# Subsystem: Proteus Offensive - Drone Synthesis Projector
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "maxVelocity", src.getModifiedItemAttr("subsystemBonusGallenteOffensive2"),
-                                 skill="Gallente Offensive Systems")
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
-                                 "trackingSpeed", src.getModifiedItemAttr("subsystemBonusGallenteOffensive2"),
-                                 skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect6926.py b/eos/effects/effect6926.py
deleted file mode 100644
index 76c076a0f..000000000
--- a/eos/effects/effect6926.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusAmarrPropulsionWarpCapacitor
-#
-# Used by:
-# Subsystem: Legion Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect6927.py b/eos/effects/effect6927.py
deleted file mode 100644
index f7f965c59..000000000
--- a/eos/effects/effect6927.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarPropulsionWarpCapacitor
-#
-# Used by:
-# Subsystem: Loki Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"),
-                           skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect6928.py b/eos/effects/effect6928.py
deleted file mode 100644
index e089fdf80..000000000
--- a/eos/effects/effect6928.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariPropulsion2PropModHeatBenefit
-#
-# Used by:
-# Subsystem: Tengu Propulsion - Fuel Catalyst
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner") or mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "overloadSpeedFactorBonus", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"),
-                                  skill="Caldari Propulsion Systems")
diff --git a/eos/effects/effect6929.py b/eos/effects/effect6929.py
deleted file mode 100644
index 96dc20bb4..000000000
--- a/eos/effects/effect6929.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusGallentePropulsion2PropModHeatBenefit
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Localized Injectors
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner") or mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "overloadSpeedFactorBonus", src.getModifiedItemAttr("subsystemBonusGallentePropulsion2"),
-                                  skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect6930.py b/eos/effects/effect6930.py
deleted file mode 100644
index a4f8215f8..000000000
--- a/eos/effects/effect6930.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# subsystemBonusAmarrCore2EnergyResistance
-#
-# Used by:
-# Subsystem: Legion Core - Augmented Antimatter Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusAmarrCore2"), skill="Amarr Core Systems")
diff --git a/eos/effects/effect6931.py b/eos/effects/effect6931.py
deleted file mode 100644
index c2f93a623..000000000
--- a/eos/effects/effect6931.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarCore2EnergyResistance
-#
-# Used by:
-# Subsystem: Loki Core - Augmented Nuclear Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusMinmatarCore2"),
-                           skill="Minmatar Core Systems")
diff --git a/eos/effects/effect6932.py b/eos/effects/effect6932.py
deleted file mode 100644
index 1a3c834c2..000000000
--- a/eos/effects/effect6932.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCore2EnergyResistance
-#
-# Used by:
-# Subsystem: Proteus Core - Augmented Fusion Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusGallenteCore2"),
-                           skill="Gallente Core Systems")
diff --git a/eos/effects/effect6933.py b/eos/effects/effect6933.py
deleted file mode 100644
index 9a2d0c415..000000000
--- a/eos/effects/effect6933.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariCore2EnergyResistance
-#
-# Used by:
-# Subsystem: Tengu Core - Augmented Graviton Reactor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusCaldariCore2"),
-                           skill="Caldari Core Systems")
diff --git a/eos/effects/effect6934.py b/eos/effects/effect6934.py
deleted file mode 100644
index 52840f0b1..000000000
--- a/eos/effects/effect6934.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipMaxLockedTargetsBonusAddPassive
-#
-# Used by:
-# Subsystems named like: Core Dissolution Sequencer (2 of 2)
-# Subsystems named like: Core Electronic Efficiency Gate (2 of 2)
-# Subsystems named like: Offensive Support Processor (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("maxLockedTargets", src.getModifiedItemAttr("maxLockedTargetsBonus"))
diff --git a/eos/effects/effect6935.py b/eos/effects/effect6935.py
deleted file mode 100644
index 0d74c77e5..000000000
--- a/eos/effects/effect6935.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrCore3EnergyWarHeatBonus
-#
-# Used by:
-# Subsystem: Legion Core - Energy Parasitic Complex
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrCore3"), skill="Amarr Core Systems")
diff --git a/eos/effects/effect6936.py b/eos/effects/effect6936.py
deleted file mode 100644
index b9233bacb..000000000
--- a/eos/effects/effect6936.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarCore3StasisWebHeatBonus
-#
-# Used by:
-# Subsystem: Loki Core - Immobility Drivers
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web",
-                                  "overloadRangeBonus", src.getModifiedItemAttr("subsystemBonusMinmatarCore3"),
-                                  skill="Minmatar Core Systems")
diff --git a/eos/effects/effect6937.py b/eos/effects/effect6937.py
deleted file mode 100644
index 9060dac39..000000000
--- a/eos/effects/effect6937.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteCore3WarpScramHeatBonus
-#
-# Used by:
-# Subsystem: Proteus Core - Friction Extension Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "overloadRangeBonus",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteCore3"), skill="Gallente Core Systems")
diff --git a/eos/effects/effect6938.py b/eos/effects/effect6938.py
deleted file mode 100644
index c17c23ea2..000000000
--- a/eos/effects/effect6938.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusCaldariCore3ECMHeatBonus
-#
-# Used by:
-# Subsystem: Tengu Core - Obfuscation Manifold
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "overloadECMStrengthBonus",
-                                  src.getModifiedItemAttr("subsystemBonusCaldariCore3"), skill="Caldari Core Systems")
diff --git a/eos/effects/effect6939.py b/eos/effects/effect6939.py
deleted file mode 100644
index 20459415a..000000000
--- a/eos/effects/effect6939.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusAmarrDefensive2HardenerHeat
-#
-# Used by:
-# Subsystem: Legion Defensive - Augmented Plating
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrDefensive2"), skill="Amarr Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadHardeningBonus",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrDefensive2"), skill="Amarr Defensive Systems")
diff --git a/eos/effects/effect6940.py b/eos/effects/effect6940.py
deleted file mode 100644
index d4c2f7e1d..000000000
--- a/eos/effects/effect6940.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusGallenteDefensive2HardenerHeat
-#
-# Used by:
-# Subsystem: Proteus Defensive - Augmented Plating
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadHardeningBonus",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems")
diff --git a/eos/effects/effect6941.py b/eos/effects/effect6941.py
deleted file mode 100644
index 259f761eb..000000000
--- a/eos/effects/effect6941.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariDefensive2HardenerHeat
-#
-# Used by:
-# Subsystem: Tengu Defensive - Supplemental Screening
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Tactical Shield Manipulation"),
-                                  "overloadHardeningBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive2"),
-                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/effect6942.py b/eos/effects/effect6942.py
deleted file mode 100644
index f87466071..000000000
--- a/eos/effects/effect6942.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# subsystemBonusMinmatarDefensive2HardenerHeat
-#
-# Used by:
-# Subsystem: Loki Defensive - Augmented Durability
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadHardeningBonus",
-                                  src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Tactical Shield Manipulation"), "overloadHardeningBonus",
-                                  src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems")
diff --git a/eos/effects/effect6943.py b/eos/effects/effect6943.py
deleted file mode 100644
index e4c0bf66e..000000000
--- a/eos/effects/effect6943.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemBonusAmarrDefensive3ArmorRepHeat
-#
-# Used by:
-# Subsystem: Legion Defensive - Covert Reconfiguration
-# Subsystem: Legion Defensive - Nanobot Injector
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusAmarrDefensive3"),
-                                  skill="Amarr Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusAmarrDefensive3"),
-                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/effect6944.py b/eos/effects/effect6944.py
deleted file mode 100644
index 1f2e9d309..000000000
--- a/eos/effects/effect6944.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemBonusGallenteDefensive3ArmorRepHeat
-#
-# Used by:
-# Subsystem: Proteus Defensive - Covert Reconfiguration
-# Subsystem: Proteus Defensive - Nanobot Injector
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusGallenteDefensive3"),
-                                  skill="Gallente Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusGallenteDefensive3"),
-                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/effect6945.py b/eos/effects/effect6945.py
deleted file mode 100644
index a18f076f1..000000000
--- a/eos/effects/effect6945.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemBonusCaldariDefensive3ShieldBoostHeat
-#
-# Used by:
-# Subsystem: Tengu Defensive - Amplification Node
-# Subsystem: Tengu Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "overloadShieldBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"),
-                                  skill="Caldari Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"),
-                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/effect6946.py b/eos/effects/effect6946.py
deleted file mode 100644
index fe6c0e1ee..000000000
--- a/eos/effects/effect6946.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# subsystemBonusMinmatarDefensive3LocalRepHeat
-#
-# Used by:
-# Subsystem: Loki Defensive - Adaptive Defense Node
-# Subsystem: Loki Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"),
-                                  "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive3"),
-                                  skill="Minmatar Defensive Systems")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive3"),
-                                  skill="Minmatar Defensive Systems")
diff --git a/eos/effects/effect6947.py b/eos/effects/effect6947.py
deleted file mode 100644
index 828d383a2..000000000
--- a/eos/effects/effect6947.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subSystemBonusCaldariDefensive2ScanProbeStrength
-#
-# Used by:
-# Subsystem: Tengu Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", src.getModifiedItemAttr("subsystemBonusCaldariDefensive2"),
-                                    skill="Caldari Defensive Systems")
diff --git a/eos/effects/effect6949.py b/eos/effects/effect6949.py
deleted file mode 100644
index e5e7955d8..000000000
--- a/eos/effects/effect6949.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subSystemBonusGallenteDefensive2ScanProbeStrength
-#
-# Used by:
-# Subsystem: Proteus Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength",
-                                    src.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems")
diff --git a/eos/effects/effect6951.py b/eos/effects/effect6951.py
deleted file mode 100644
index 8879074a6..000000000
--- a/eos/effects/effect6951.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subSystemBonusMinmatarDefensive2ScanProbeStrength
-#
-# Used by:
-# Subsystem: Loki Defensive - Covert Reconfiguration
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength",
-                                    src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems")
diff --git a/eos/effects/effect6953.py b/eos/effects/effect6953.py
deleted file mode 100644
index b5d4c577c..000000000
--- a/eos/effects/effect6953.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# mediumRemoteRepFittingAdjustment
-#
-# Used by:
-# Variations of module: Medium Remote Armor Repairer I (12 of 12)
-# Variations of module: Medium Remote Shield Booster I (11 of 11)
-# Module: Medium Ancillary Remote Armor Repairer
-# Module: Medium Ancillary Remote Shield Booster
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("power", module.getModifiedItemAttr("mediumRemoteRepFittingMultiplier"))
-    module.multiplyItemAttr("cpu", module.getModifiedItemAttr("mediumRemoteRepFittingMultiplier"))
diff --git a/eos/effects/effect6954.py b/eos/effects/effect6954.py
deleted file mode 100644
index 8549a57bf..000000000
--- a/eos/effects/effect6954.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# subsystemBonusCommandBurstFittingReduction
-#
-# Used by:
-# Subsystems named like: Offensive Support Processor (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "power",
-                                  src.getModifiedItemAttr("subsystemCommandBurstFittingReduction"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "cpu",
-                                  src.getModifiedItemAttr("subsystemCommandBurstFittingReduction"))
diff --git a/eos/effects/effect6955.py b/eos/effects/effect6955.py
deleted file mode 100644
index ab3a9f867..000000000
--- a/eos/effects/effect6955.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemRemoteShieldBoostFalloffBonus
-#
-# Used by:
-# Subsystem: Loki Offensive - Support Processor
-# Subsystem: Tengu Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Remote Shield Booster", "Ancillary Remote Shield Booster"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("remoteShieldBoosterFalloffBonus"))
diff --git a/eos/effects/effect6956.py b/eos/effects/effect6956.py
deleted file mode 100644
index 6112559c3..000000000
--- a/eos/effects/effect6956.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemRemoteArmorRepairerOptimalBonus
-#
-# Used by:
-# Subsystems named like: Offensive Support Processor (3 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Remote Armor Repairer", "Ancillary Remote Armor Repairer"),
-                                  "maxRange", src.getModifiedItemAttr("remoteArmorRepairerOptimalBonus"))
diff --git a/eos/effects/effect6957.py b/eos/effects/effect6957.py
deleted file mode 100644
index 20ac549af..000000000
--- a/eos/effects/effect6957.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemRemoteArmorRepairerFalloffBonus
-#
-# Used by:
-# Subsystems named like: Offensive Support Processor (3 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Remote Armor Repairer", "Ancillary Remote Armor Repairer"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("remoteArmorRepairerFalloffBonus"))
diff --git a/eos/effects/effect6958.py b/eos/effects/effect6958.py
deleted file mode 100644
index d7e603aab..000000000
--- a/eos/effects/effect6958.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrOffensive3RemoteArmorRepairHeat
-#
-# Used by:
-# Subsystem: Legion Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems")
diff --git a/eos/effects/effect6959.py b/eos/effects/effect6959.py
deleted file mode 100644
index 651810140..000000000
--- a/eos/effects/effect6959.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallenteOffensive3RemoteArmorRepairHeat
-#
-# Used by:
-# Subsystem: Proteus Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "overloadSelfDurationBonus",
-                                  src.getModifiedItemAttr("subsystemBonusGallenteOffensive3"), skill="Gallente Offensive Systems")
diff --git a/eos/effects/effect6960.py b/eos/effects/effect6960.py
deleted file mode 100644
index 44a471a6d..000000000
--- a/eos/effects/effect6960.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusCaldariOffensive3RemoteShieldBoosterHeat
-#
-# Used by:
-# Subsystem: Tengu Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusCaldariOffensive3"),
-                                  skill="Caldari Offensive Systems")
diff --git a/eos/effects/effect6961.py b/eos/effects/effect6961.py
deleted file mode 100644
index a88a2907d..000000000
--- a/eos/effects/effect6961.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# subsystemBonusMinmatarOffensive3RemoteRepHeat
-#
-# Used by:
-# Subsystem: Loki Offensive - Support Processor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"),
-                                  skill="Minmatar Offensive Systems")
diff --git a/eos/effects/effect6962.py b/eos/effects/effect6962.py
deleted file mode 100644
index bc59ac952..000000000
--- a/eos/effects/effect6962.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusAmarrPropulsion2WarpSpeed
-#
-# Used by:
-# Subsystem: Legion Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion2"),
-                           skill="Amarr Propulsion Systems")
diff --git a/eos/effects/effect6963.py b/eos/effects/effect6963.py
deleted file mode 100644
index d8d8262ca..000000000
--- a/eos/effects/effect6963.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusMinmatarPropulsion2WarpSpeed
-#
-# Used by:
-# Subsystem: Loki Propulsion - Interdiction Nullifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion2"),
-                           skill="Minmatar Propulsion Systems")
diff --git a/eos/effects/effect6964.py b/eos/effects/effect6964.py
deleted file mode 100644
index 33f4dc718..000000000
--- a/eos/effects/effect6964.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# subsystemBonusGallentePropulsionWarpSpeed
-#
-# Used by:
-# Subsystem: Proteus Propulsion - Hyperspatial Optimization
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("baseWarpSpeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"),
-                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/effect6981.py b/eos/effects/effect6981.py
deleted file mode 100644
index 7e8745859..000000000
--- a/eos/effects/effect6981.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# shipBonusTitanG1KinThermDamageBonus
-#
-# Used by:
-# Ship: Komodo
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG1"), skill="Gallente Titan")
diff --git a/eos/effects/effect6982.py b/eos/effects/effect6982.py
deleted file mode 100644
index d98b44d4b..000000000
--- a/eos/effects/effect6982.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# shipBonusTitanG2EMExplosiveDamageBonus
-#
-# Used by:
-# Ship: Komodo
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "explosiveDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "emDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "emDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "explosiveDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "emDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "explosiveDamage",
-                                  src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")
diff --git a/eos/effects/effect6983.py b/eos/effects/effect6983.py
deleted file mode 100644
index 2216bea00..000000000
--- a/eos/effects/effect6983.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusTitanC1ShieldResists
-#
-# Used by:
-# Ship: Komodo
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
diff --git a/eos/effects/effect6984.py b/eos/effects/effect6984.py
deleted file mode 100644
index 4daa1d80e..000000000
--- a/eos/effects/effect6984.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusRole4FighterDamageAndHitpoints
-#
-# Used by:
-# Ship: Caiman
-# Ship: Komodo
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
-                                   src.getModifiedItemAttr("shipBonusRole4"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusRole4"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusRole4"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier",
-                                   src.getModifiedItemAttr("shipBonusRole4"))
diff --git a/eos/effects/effect6985.py b/eos/effects/effect6985.py
deleted file mode 100644
index e79593c44..000000000
--- a/eos/effects/effect6985.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# shipBonusDreadnoughtG1KinThermDamageBonus
-#
-# Used by:
-# Ship: Caiman
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
-                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
diff --git a/eos/effects/effect6986.py b/eos/effects/effect6986.py
deleted file mode 100644
index 08c87ce85..000000000
--- a/eos/effects/effect6986.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusForceAuxiliaryG1RemoteShieldBoostAmount
-#
-# Used by:
-# Ship: Loggerhead
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "shieldBonus",
-                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"), skill="Gallente Carrier")
diff --git a/eos/effects/effect6987.py b/eos/effects/effect6987.py
deleted file mode 100644
index 100056f61..000000000
--- a/eos/effects/effect6987.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# shipBonusRole2LogisticDroneRepAmountAndHitpointBonus
-#
-# Used by:
-# Ship: Loggerhead
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "structureDamageAmount", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "shieldBonus", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "armorDamageAmount", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "armorHP", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "shieldCapacity", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Drone Operation"),
-                                    "hp", src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect699.py b/eos/effects/effect699.py
deleted file mode 100644
index 5401527b9..000000000
--- a/eos/effects/effect699.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# signatureAnalysisScanResolutionBonusPostPercentScanResolutionShip
-#
-# Used by:
-# Implants named like: Zainou 'Gypsy' Signature Analysis SA (6 of 6)
-# Modules named like: Targeting System Subcontroller (8 of 8)
-# Implant: Quafe Zero
-# Skill: Signature Analysis
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context or "implant" in context or "booster" in context else True
-    fit.ship.boostItemAttr("scanResolution", container.getModifiedItemAttr("scanResolutionBonus") * level,
-                           stackingPenalties=penalized)
diff --git a/eos/effects/effect6992.py b/eos/effects/effect6992.py
deleted file mode 100644
index bbec67fbd..000000000
--- a/eos/effects/effect6992.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# roleBonusMHTDamage1
-#
-# Used by:
-# Ship: Victor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect6993.py b/eos/effects/effect6993.py
deleted file mode 100644
index 19645f49e..000000000
--- a/eos/effects/effect6993.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# roleBonus2BoosterPenaltyReduction
-#
-# Used by:
-# Ship: Victor
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterMissileAOECloudPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterCapacitorCapacityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterAOEVelocityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterArmorRepairAmountPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterMissileVelocityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterTurretTrackingPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterShieldCapacityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterTurretOptimalRangePenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterShieldBoostAmountPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterTurretFalloffPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterArmorHPPenalty", src.getModifiedItemAttr("shipBonusRole2"))
-    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterMaxVelocityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect6994.py b/eos/effects/effect6994.py
deleted file mode 100644
index 3bb0f6833..000000000
--- a/eos/effects/effect6994.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteReconBonusMHTDamage1
-#
-# Used by:
-# Ship: Victor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
diff --git a/eos/effects/effect6995.py b/eos/effects/effect6995.py
deleted file mode 100644
index 66dac5bc6..000000000
--- a/eos/effects/effect6995.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# targetABCAttack
-#
-# Used by:
-# Modules from group: Precursor Weapon (15 of 15)
-type = 'active'
-
-
-def handler(fit, module, context):
-    # Set reload time to 1 second
-    module.reloadTime = 1000
diff --git a/eos/effects/effect6996.py b/eos/effects/effect6996.py
deleted file mode 100644
index 658f94883..000000000
--- a/eos/effects/effect6996.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteReconBonusArmorRepAmount3
-#
-# Used by:
-# Ship: Victor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount",
-                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect6997.py b/eos/effects/effect6997.py
deleted file mode 100644
index 00a63046b..000000000
--- a/eos/effects/effect6997.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteCovertOpsBonusArmorRepAmount4
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount",
-                                  src.getModifiedItemAttr("eliteBonusCovertOps4"), skill="Covert Ops")
diff --git a/eos/effects/effect6999.py b/eos/effects/effect6999.py
deleted file mode 100644
index 926aa81c0..000000000
--- a/eos/effects/effect6999.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# covertOpsStealthBomberSiegeMissileLauncherCPUNeedBonus
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
-                                     "cpu", ship.getModifiedItemAttr("stealthBomberLauncherCPU"))
diff --git a/eos/effects/effect7000.py b/eos/effects/effect7000.py
deleted file mode 100644
index 1173ac822..000000000
--- a/eos/effects/effect7000.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusSHTFalloffGF1
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), "falloff",
-                                  src.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
diff --git a/eos/effects/effect7001.py b/eos/effects/effect7001.py
deleted file mode 100644
index c87583d18..000000000
--- a/eos/effects/effect7001.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# roleBonusTorpRoF1
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo", "speed", src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect7002.py b/eos/effects/effect7002.py
deleted file mode 100644
index e61365e2a..000000000
--- a/eos/effects/effect7002.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# roleBonusBombLauncherPWGCPU3
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"), "power", src.getModifiedItemAttr("shipBonusRole3"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"), "cpu", src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect7003.py b/eos/effects/effect7003.py
deleted file mode 100644
index 2a9628566..000000000
--- a/eos/effects/effect7003.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCovertOpsSHTDamage3
-#
-# Used by:
-# Ship: Virtuoso
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("eliteBonusCovertOps3"), skill="Covert Ops")
diff --git a/eos/effects/effect7008.py b/eos/effects/effect7008.py
deleted file mode 100644
index 5ae185d64..000000000
--- a/eos/effects/effect7008.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureFullPowerStateHitpointModifier
-#
-# Used by:
-# Items from category: Structure (17 of 17)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.multiplyItemAttr("shieldCapacity", src.getModifiedItemAttr("structureFullPowerStateHitpointMultiplier") or 0)
-    fit.ship.multiplyItemAttr("armorHP", src.getModifiedItemAttr("structureFullPowerStateHitpointMultiplier") or 0)
diff --git a/eos/effects/effect7009.py b/eos/effects/effect7009.py
deleted file mode 100644
index a4f574110..000000000
--- a/eos/effects/effect7009.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# serviceModuleFullPowerHitpointPostAssign
-#
-# Used by:
-# Structure Modules from group: Structure Citadel Service Module (2 of 2)
-# Structure Modules from group: Structure Engineering Service Module (6 of 6)
-# Structure Modules from group: Structure Navigation Service Module (3 of 3)
-# Structure Modules from group: Structure Resource Processing Service Module (4 of 4)
-# Structure Module: Standup Moon Drill I
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    fit.ship.forceItemAttr("structureFullPowerStateHitpointMultiplier", src.getModifiedItemAttr("serviceModuleFullPowerStateHitpointMultiplier"))
diff --git a/eos/effects/effect7012.py b/eos/effects/effect7012.py
deleted file mode 100644
index a7a6d9551..000000000
--- a/eos/effects/effect7012.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# moduleBonusAssaultDamageControl
-#
-# Used by:
-# Variations of module: Assault Damage Control I (5 of 5)
-type = "active"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
-        for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
-            bonus = "%s%sDamageResonance" % (attrPrefix, damageType)
-            bonus = "%s%s" % (bonus[0].lower(), bonus[1:])
-            booster = "%s%sDamageResonance" % (layer, damageType)
-
-            src.forceItemAttr(booster, src.getModifiedItemAttr("resistanceMultiplier"))
diff --git a/eos/effects/effect7013.py b/eos/effects/effect7013.py
deleted file mode 100644
index 18afde89e..000000000
--- a/eos/effects/effect7013.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipKineticMissileDamage1
-#
-# Used by:
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
-                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect7014.py b/eos/effects/effect7014.py
deleted file mode 100644
index 04ee9c25d..000000000
--- a/eos/effects/effect7014.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipThermalMissileDamage1
-#
-# Used by:
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage",
-                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect7015.py b/eos/effects/effect7015.py
deleted file mode 100644
index ae5a4aed2..000000000
--- a/eos/effects/effect7015.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipEMMissileDamage1
-#
-# Used by:
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage",
-                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect7016.py b/eos/effects/effect7016.py
deleted file mode 100644
index 626f6ce51..000000000
--- a/eos/effects/effect7016.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipExplosiveMissileDamage1
-#
-# Used by:
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage",
-                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect7017.py b/eos/effects/effect7017.py
deleted file mode 100644
index e17de01c1..000000000
--- a/eos/effects/effect7017.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipExplosionVelocity2
-#
-# Used by:
-# Ship: Jaguar
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeVelocity",
-                                    src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates")
diff --git a/eos/effects/effect7018.py b/eos/effects/effect7018.py
deleted file mode 100644
index df4394b19..000000000
--- a/eos/effects/effect7018.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipSETROFAF
-#
-# Used by:
-# Ship: Retribution
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "speed",
-                                  src.getModifiedItemAttr("shipBonusAF"), stackingPenalties=False, skill="Amarr Frigate")
diff --git a/eos/effects/effect7020.py b/eos/effects/effect7020.py
deleted file mode 100644
index 531f18ded..000000000
--- a/eos/effects/effect7020.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# remoteWebifierMaxRangeBonus
-#
-# Used by:
-# Implants named like: Inquest 'Eros' Stasis Webifier MR (3 of 3)
-# Implants named like: Inquest 'Hedone' Entanglement Optimizer WS (3 of 3)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange",
-                                  src.getModifiedItemAttr("stasisWebRangeBonus"), stackingPenalties=False)
diff --git a/eos/effects/effect7021.py b/eos/effects/effect7021.py
deleted file mode 100644
index 52ac17bc8..000000000
--- a/eos/effects/effect7021.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# structureRigMaxTargetRange
-#
-# Used by:
-# Structure Modules from group: Structure Combat Rig L - Max Targets and Sensor Boosting (2 of 2)
-# Structure Modules from group: Structure Combat Rig M - Boosted Sensors (2 of 2)
-# Structure Modules from group: Structure Combat Rig XL - Doomsday and Targeting (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("structureRigMaxTargetRangeBonus"))
diff --git a/eos/effects/effect7024.py b/eos/effects/effect7024.py
deleted file mode 100644
index 20c82238a..000000000
--- a/eos/effects/effect7024.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusDroneTrackingEliteGunship2
-#
-# Used by:
-# Ship: Ishkur
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed",
-                                 src.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
diff --git a/eos/effects/effect7026.py b/eos/effects/effect7026.py
deleted file mode 100644
index 6f03786d6..000000000
--- a/eos/effects/effect7026.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# scriptStandupWarpScram
-#
-# Used by:
-# Charge: Standup Focused Warp Scrambling Script
-
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context, *args, **kwargs):
-    src.boostItemAttr("maxRange", src.getModifiedChargeAttr("warpScrambleRangeBonus"))
diff --git a/eos/effects/effect7027.py b/eos/effects/effect7027.py
deleted file mode 100644
index b0477fe60..000000000
--- a/eos/effects/effect7027.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# structureCapacitorCapacityBonus
-#
-# Used by:
-# Structure Modules from group: Structure Capacitor Battery (2 of 2)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.increaseItemAttr("capacitorCapacity", ship.getModifiedItemAttr("capacitorBonus"))
diff --git a/eos/effects/effect7028.py b/eos/effects/effect7028.py
deleted file mode 100644
index f5977b6fe..000000000
--- a/eos/effects/effect7028.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# structureModifyPowerRechargeRate
-#
-# Used by:
-# Structure Modules from group: Structure Capacitor Power Relay (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("rechargeRate", module.getModifiedItemAttr("capacitorRechargeRateMultiplier"))
diff --git a/eos/effects/effect7029.py b/eos/effects/effect7029.py
deleted file mode 100644
index 9c2c727ae..000000000
--- a/eos/effects/effect7029.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# structureArmorHPBonus
-#
-# Used by:
-# Structure Modules from group: Structure Armor Reinforcer (2 of 2)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("hiddenArmorHPMultiplier", src.getModifiedItemAttr("armorHpBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect7030.py b/eos/effects/effect7030.py
deleted file mode 100644
index 48dc00c7d..000000000
--- a/eos/effects/effect7030.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# structureAoERoFRoleBonus
-#
-# Used by:
-# Items from category: Structure (11 of 17)
-# Structures from group: Citadel (8 of 9)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Guided Bomb Launcher",
-                                  "speed", ship.getModifiedItemAttr("structureAoERoFRoleBonus"))
-    for attr in ["duration", "durationTargetIlluminationBurstProjector", "durationWeaponDisruptionBurstProjector",
-                 "durationECMJammerBurstProjector", "durationSensorDampeningBurstProjector", "capacitorNeed"]:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Structure Burst Projector",
-                                      attr, ship.getModifiedItemAttr("structureAoERoFRoleBonus"))
diff --git a/eos/effects/effect7031.py b/eos/effects/effect7031.py
deleted file mode 100644
index f9ef052fa..000000000
--- a/eos/effects/effect7031.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileKineticDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7032.py b/eos/effects/effect7032.py
deleted file mode 100644
index cf22a33c3..000000000
--- a/eos/effects/effect7032.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileThermalDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7033.py b/eos/effects/effect7033.py
deleted file mode 100644
index a2e53af5a..000000000
--- a/eos/effects/effect7033.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileEMDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "emDamage", src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7034.py b/eos/effects/effect7034.py
deleted file mode 100644
index c4a2df83e..000000000
--- a/eos/effects/effect7034.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyMissileExplosiveDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7035.py b/eos/effects/effect7035.py
deleted file mode 100644
index 3ea3ea593..000000000
--- a/eos/effects/effect7035.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyAssaultMissileExplosiveDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7036.py b/eos/effects/effect7036.py
deleted file mode 100644
index dc9dfef75..000000000
--- a/eos/effects/effect7036.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyAssaultMissileEMDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7037.py b/eos/effects/effect7037.py
deleted file mode 100644
index dd3e5b94a..000000000
--- a/eos/effects/effect7037.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyAssaultMissileThermalDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "thermalDamage", src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7038.py b/eos/effects/effect7038.py
deleted file mode 100644
index fdb946508..000000000
--- a/eos/effects/effect7038.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusHeavyAssaultMissileKineticDamageCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", src.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/effect7039.py b/eos/effects/effect7039.py
deleted file mode 100644
index 61abbf2f4..000000000
--- a/eos/effects/effect7039.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# structureHiddenMissileDamageMultiplier
-#
-# Used by:
-# Items from category: Structure (14 of 17)
-type = "passive"
-
-
-def handler(fit, src, context):
-    groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
-    for dmgType in ("em", "kinetic", "explosive", "thermal"):
-        fit.modules.filteredChargeMultiply(lambda mod: mod.item.group.name in groups,
-                                           "%sDamage" % dmgType,
-                                           src.getModifiedItemAttr("hiddenMissileDamageMultiplier"))
diff --git a/eos/effects/effect7040.py b/eos/effects/effect7040.py
deleted file mode 100644
index af1b39be3..000000000
--- a/eos/effects/effect7040.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# structureHiddenArmorHPMultiplier
-#
-# Used by:
-# Items from category: Structure (17 of 17)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.multiplyItemAttr("armorHP", src.getModifiedItemAttr("hiddenArmorHPMultiplier") or 0)
diff --git a/eos/effects/effect7042.py b/eos/effects/effect7042.py
deleted file mode 100644
index 853eed5d1..000000000
--- a/eos/effects/effect7042.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipArmorHitPointsAC1
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect7043.py b/eos/effects/effect7043.py
deleted file mode 100644
index 06fdfea96..000000000
--- a/eos/effects/effect7043.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipShieldHitpointsCC1
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect7044.py b/eos/effects/effect7044.py
deleted file mode 100644
index 6c08d527f..000000000
--- a/eos/effects/effect7044.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipAgilityBonusGC1
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect7045.py b/eos/effects/effect7045.py
deleted file mode 100644
index e366d23af..000000000
--- a/eos/effects/effect7045.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipSignatureRadiusMC1
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("signatureRadius", src.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser")
diff --git a/eos/effects/effect7046.py b/eos/effects/effect7046.py
deleted file mode 100644
index 5ca4a504d..000000000
--- a/eos/effects/effect7046.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# eliteBonusFlagCruiserAllResistances1
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("explosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("thermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("kineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
-    fit.ship.boostItemAttr("emDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
diff --git a/eos/effects/effect7047.py b/eos/effects/effect7047.py
deleted file mode 100644
index 2020db2d9..000000000
--- a/eos/effects/effect7047.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# roleBonusFlagCruiserModuleFittingReduction
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Propulsion Module", "Micro Jump Drive"),
-                                  "power", src.getModifiedItemAttr("flagCruiserFittingBonusPropMods"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Propulsion Module", "Micro Jump Drive"),
-                                  "cpu", src.getModifiedItemAttr("flagCruiserFittingBonusPropMods"))
-
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Target Painter", "Scan Probe Launcher"),
-                                  "cpu", src.getModifiedItemAttr("flagCruiserFittingBonusPainterProbes"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Target Painter", "Scan Probe Launcher"),
-                                  "power", src.getModifiedItemAttr("flagCruiserFittingBonusPainterProbes"))
diff --git a/eos/effects/effect7050.py b/eos/effects/effect7050.py
deleted file mode 100644
index fa01e217d..000000000
--- a/eos/effects/effect7050.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# aoe_beacon_bioluminescence_cloud
-#
-# Used by:
-# Celestials named like: Bioluminescence Cloud (3 of 3)
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7051.py b/eos/effects/effect7051.py
deleted file mode 100644
index f11c9805b..000000000
--- a/eos/effects/effect7051.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# aoe_beacon_caustic_cloud
-#
-# Used by:
-# Celestials named like: Caustic Cloud (3 of 3)
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7052.py b/eos/effects/effect7052.py
deleted file mode 100644
index 7400a0707..000000000
--- a/eos/effects/effect7052.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# roleBonusFlagCruiserTargetPainterModifications
-#
-# Used by:
-# Ship: Monitor
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", "signatureRadiusBonus",
-                                  src.getModifiedItemAttr("targetPainterStrengthModifierFlagCruisers"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", "maxRange",
-                                  src.getModifiedItemAttr("targetPainterRangeModifierFlagCruisers"))
diff --git a/eos/effects/effect7055.py b/eos/effects/effect7055.py
deleted file mode 100644
index a734806d8..000000000
--- a/eos/effects/effect7055.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# shipLargeWeaponsDamageBonus
-#
-# Used by:
-# Ship: Praxis
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "thermalDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "explosiveDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "kineticDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "emDamage",
-                                    src.getModifiedItemAttr("shipBonusRole7"))
diff --git a/eos/effects/effect7058.py b/eos/effects/effect7058.py
deleted file mode 100644
index 085114e7c..000000000
--- a/eos/effects/effect7058.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# aoe_beacon_filament_cloud
-#
-# Used by:
-# Celestials named like: Filament Cloud (3 of 3)
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7059.py b/eos/effects/effect7059.py
deleted file mode 100644
index c13489860..000000000
--- a/eos/effects/effect7059.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# weather_caustic_toxin
-#
-# Used by:
-# Celestial: caustic_toxin_weather_1
-# Celestial: caustic_toxin_weather_2
-# Celestial: caustic_toxin_weather_3
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect706.py b/eos/effects/effect706.py
deleted file mode 100644
index 1ab7538c1..000000000
--- a/eos/effects/effect706.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# covertOpsWarpResistance
-#
-# Used by:
-# Ships from group: Covert Ops (5 of 8)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpFactor", src.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
diff --git a/eos/effects/effect7060.py b/eos/effects/effect7060.py
deleted file mode 100644
index c67b7924d..000000000
--- a/eos/effects/effect7060.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# weather_darkness
-#
-# Used by:
-# Celestial: darkness_weather_1
-# Celestial: darkness_weather_2
-# Celestial: darkness_weather_3
-# Celestial: pvp_weather_1
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 5):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7061.py b/eos/effects/effect7061.py
deleted file mode 100644
index b6e78935f..000000000
--- a/eos/effects/effect7061.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# weather_electric_storm
-#
-# Used by:
-# Celestial: electric_storm_weather_1
-# Celestial: electric_storm_weather_2
-# Celestial: electric_storm_weather_3
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7062.py b/eos/effects/effect7062.py
deleted file mode 100644
index 9ddfe1a30..000000000
--- a/eos/effects/effect7062.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# weather_infernal
-#
-# Used by:
-# Celestial: infernal_weather_1
-# Celestial: infernal_weather_2
-# Celestial: infernal_weather_3
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7063.py b/eos/effects/effect7063.py
deleted file mode 100644
index 913a7de2b..000000000
--- a/eos/effects/effect7063.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# weather_xenon_gas
-#
-# Used by:
-# Celestial: xenon_gas_weather_1
-# Celestial: xenon_gas_weather_2
-# Celestial: xenon_gas_weather_3
-runTime = "early"
-type = ("projected", "passive", "gang")
-
-
-def handler(fit, beacon, context, **kwargs):
-    for x in range(1, 3):
-        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
-            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
-            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
diff --git a/eos/effects/effect7064.py b/eos/effects/effect7064.py
deleted file mode 100644
index 61b26655c..000000000
--- a/eos/effects/effect7064.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# weather_basic
-#
-# Used by:
-# Celestial: basic_weather
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, beacon, context):
-    pass
diff --git a/eos/effects/effect7071.py b/eos/effects/effect7071.py
deleted file mode 100644
index 1d3fbe176..000000000
--- a/eos/effects/effect7071.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# smallPrecursorTurretDmgBonusRequiredSkill
-#
-# Used by:
-# Skill: Small Precursor Weapon
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7072.py b/eos/effects/effect7072.py
deleted file mode 100644
index c35fcda31..000000000
--- a/eos/effects/effect7072.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# mediumPrecursorTurretDmgBonusRequiredSkill
-#
-# Used by:
-# Skill: Medium Precursor Weapon
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7073.py b/eos/effects/effect7073.py
deleted file mode 100644
index 32ba9bb8b..000000000
--- a/eos/effects/effect7073.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# largePrecursorTurretDmgBonusRequiredSkill
-#
-# Used by:
-# Skill: Large Precursor Weapon
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Precursor Weapon"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7074.py b/eos/effects/effect7074.py
deleted file mode 100644
index 8a3b7babe..000000000
--- a/eos/effects/effect7074.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# smallDisintegratorSkillDmgBonus
-#
-# Used by:
-# Skill: Small Disintegrator Specialization
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Disintegrator Specialization"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7075.py b/eos/effects/effect7075.py
deleted file mode 100644
index f7a2cc10e..000000000
--- a/eos/effects/effect7075.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# mediumDisintegratorSkillDmgBonus
-#
-# Used by:
-# Skill: Medium Disintegrator Specialization
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Disintegrator Specialization"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7076.py b/eos/effects/effect7076.py
deleted file mode 100644
index c3b03337d..000000000
--- a/eos/effects/effect7076.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# largeDisintegratorSkillDmgBonus
-#
-# Used by:
-# Skill: Large Disintegrator Specialization
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Disintegrator Specialization"),
-                                  "damageMultiplier", container.getModifiedItemAttr("damageMultiplierBonus") * level)
diff --git a/eos/effects/effect7077.py b/eos/effects/effect7077.py
deleted file mode 100644
index b070c9ee2..000000000
--- a/eos/effects/effect7077.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# disintegratorWeaponDamageMultiply
-#
-# Used by:
-# Modules from group: Entropic Radiation Sink (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Precursor Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect7078.py b/eos/effects/effect7078.py
deleted file mode 100644
index eccf38371..000000000
--- a/eos/effects/effect7078.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# disintegratorWeaponSpeedMultiply
-#
-# Used by:
-# Modules from group: Entropic Radiation Sink (4 of 4)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Precursor Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect7079.py b/eos/effects/effect7079.py
deleted file mode 100644
index 9a35e373c..000000000
--- a/eos/effects/effect7079.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipPCBSSPeedBonusPCBS1
-#
-# Used by:
-# Ship: Leshak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Precursor Weapon"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusPBS1"), skill="Precursor Battleship")
diff --git a/eos/effects/effect7080.py b/eos/effects/effect7080.py
deleted file mode 100644
index 3f35b237c..000000000
--- a/eos/effects/effect7080.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipPCBSDmgBonusPCBS2
-#
-# Used by:
-# Ship: Leshak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Precursor Weapon"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPBS2"), skill="Precursor Battleship")
diff --git a/eos/effects/effect7085.py b/eos/effects/effect7085.py
deleted file mode 100644
index 06e686ab2..000000000
--- a/eos/effects/effect7085.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipbonusPCTDamagePC1
-#
-# Used by:
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPC1"), skill="Precursor Cruiser")
diff --git a/eos/effects/effect7086.py b/eos/effects/effect7086.py
deleted file mode 100644
index 4914d290e..000000000
--- a/eos/effects/effect7086.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipbonusPCTTrackingPC2
-#
-# Used by:
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusPC2"), skill="Precursor Cruiser")
diff --git a/eos/effects/effect7087.py b/eos/effects/effect7087.py
deleted file mode 100644
index 7403b2146..000000000
--- a/eos/effects/effect7087.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipbonusPCTOptimalPF2
-#
-# Used by:
-# Ship: Damavik
-# Ship: Hydra
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusPF2"), skill="Precursor Frigate")
diff --git a/eos/effects/effect7088.py b/eos/effects/effect7088.py
deleted file mode 100644
index 59a1071e2..000000000
--- a/eos/effects/effect7088.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipbonusPCTDamagePF1
-#
-# Used by:
-# Ship: Damavik
-# Ship: Hydra
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPF1"), skill="Precursor Frigate")
diff --git a/eos/effects/effect7091.py b/eos/effects/effect7091.py
deleted file mode 100644
index ec427ec11..000000000
--- a/eos/effects/effect7091.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusNosNeutCapNeedRoleBonus2
-#
-# Used by:
-# Variations of ship: Rodiva (2 of 2)
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect7092.py b/eos/effects/effect7092.py
deleted file mode 100644
index ac4ef0aa0..000000000
--- a/eos/effects/effect7092.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusRemoteRepCapNeedRoleBonus2
-#
-# Used by:
-# Ship: Damavik
-# Ship: Drekavac
-# Ship: Hydra
-# Ship: Kikimora
-# Ship: Leshak
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect7093.py b/eos/effects/effect7093.py
deleted file mode 100644
index 69e4017a8..000000000
--- a/eos/effects/effect7093.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusSmartbombCapNeedRoleBonus2
-#
-# Used by:
-# Variations of ship: Rodiva (2 of 2)
-# Ship: Damavik
-# Ship: Drekavac
-# Ship: Hydra
-# Ship: Kikimora
-# Ship: Leshak
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Energy Pulse Weapons"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect7094.py b/eos/effects/effect7094.py
deleted file mode 100644
index 31963a4da..000000000
--- a/eos/effects/effect7094.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusRemoteRepMaxRangeRoleBonus1
-#
-# Used by:
-# Ship: Damavik
-# Ship: Drekavac
-# Ship: Hydra
-# Ship: Kikimora
-# Ship: Leshak
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect7097.py b/eos/effects/effect7097.py
deleted file mode 100644
index f1aaa88e2..000000000
--- a/eos/effects/effect7097.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipGroupPrecursorTurret
-#
-# Used by:
-# Skill: Surgical Strike
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Precursor Weapon",
-                                  "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
diff --git a/eos/effects/effect7111.py b/eos/effects/effect7111.py
deleted file mode 100644
index 595b9a679..000000000
--- a/eos/effects/effect7111.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# systemSmallPrecursorTurretDamage
-#
-# Used by:
-# Celestials named like: Wolf Rayet Effect Beacon Class (5 of 6)
-runTime = "early"
-type = ("projected", "passive")
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                     "damageMultiplier", module.getModifiedItemAttr("smallWeaponDamageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect7112.py b/eos/effects/effect7112.py
deleted file mode 100644
index 52dfa7796..000000000
--- a/eos/effects/effect7112.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# shipBonusNeutCapNeedRoleBonus2
-#
-# Used by:
-# Ship: Damavik
-# Ship: Drekavac
-# Ship: Hydra
-# Ship: Kikimora
-# Ship: Leshak
-# Ship: Tiamat
-# Ship: Vedmak
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "capacitorNeed",
-                                  src.getModifiedItemAttr("shipBonusRole2"))
diff --git a/eos/effects/effect7116.py b/eos/effects/effect7116.py
deleted file mode 100644
index 55db46631..000000000
--- a/eos/effects/effect7116.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusReconScanProbeStrength2
-#
-# Used by:
-# Ship: Tiamat
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength",
-                                    src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/effect7117.py b/eos/effects/effect7117.py
deleted file mode 100644
index 2532ab94a..000000000
--- a/eos/effects/effect7117.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# roleBonusWarpSpeed
-#
-# Used by:
-# Ship: Cynabal
-# Ship: Dramiel
-# Ship: Leopard
-# Ship: Machariel
-# Ship: Victorieux Luxury Yacht
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("shipRoleBonusWarpSpeed"))
diff --git a/eos/effects/effect7118.py b/eos/effects/effect7118.py
deleted file mode 100644
index 550cdc94b..000000000
--- a/eos/effects/effect7118.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusCovertOps3PCTdamagePerCycle
-#
-# Used by:
-# Ship: Hydra
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"), "damageMultiplierBonusPerCycle",
-                                     src.getModifiedItemAttr("eliteBonusCovertOps3"), skill="Covert Ops")
diff --git a/eos/effects/effect7119.py b/eos/effects/effect7119.py
deleted file mode 100644
index 5aabfdcb7..000000000
--- a/eos/effects/effect7119.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusReconShip3PCTdamagePerCycle
-#
-# Used by:
-# Ship: Tiamat
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"), "damageMultiplierBonusPerCycle",
-                                     src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/effect7142.py b/eos/effects/effect7142.py
deleted file mode 100644
index ebeb25f5a..000000000
--- a/eos/effects/effect7142.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# massEntanglerEffect5
-#
-# Used by:
-# Module: Zero-Point Mass Entangler
-type = "active"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("warpScrambleStrength"))
-    fit.ship.boostItemAttr("mass", src.getModifiedItemAttr("massBonusPercentage"), stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedFactor",
-                                  src.getModifiedItemAttr("speedFactorBonus"), stackingPenalties=True)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedBoostFactor",
-                                  src.getModifiedItemAttr("speedBoostFactorBonus"))
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "activationBlocked",
-                                     src.getModifiedItemAttr("activationBlockedStrenght"))
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("maxVelocityBonus"), stackingPenalties=True)
diff --git a/eos/effects/effect7154.py b/eos/effects/effect7154.py
deleted file mode 100644
index 23adcba2d..000000000
--- a/eos/effects/effect7154.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusPD1DisintegratorDamage
-#
-# Used by:
-# Ship: Kikimora
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPD1"),
-                                  skill="Precursor Destroyer")
diff --git a/eos/effects/effect7155.py b/eos/effects/effect7155.py
deleted file mode 100644
index da8e257ea..000000000
--- a/eos/effects/effect7155.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusPBC1DisintegratorDamage
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPBC1"),
-                                  skill="Precursor Battlecruiser")
diff --git a/eos/effects/effect7156.py b/eos/effects/effect7156.py
deleted file mode 100644
index 74e4dca9d..000000000
--- a/eos/effects/effect7156.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# smallDisintegratorMaxRangeBonus
-#
-# Used by:
-# Ship: Kikimora
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "maxRange", ship.getModifiedItemAttr("maxRangeBonus"))
diff --git a/eos/effects/effect7157.py b/eos/effects/effect7157.py
deleted file mode 100644
index c56940a22..000000000
--- a/eos/effects/effect7157.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipBonusPD2DisintegratorMaxRange
-#
-# Used by:
-# Ship: Kikimora
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusPD2"),
-                                  skill="Precursor Destroyer")
diff --git a/eos/effects/effect7158.py b/eos/effects/effect7158.py
deleted file mode 100644
index 0248e9374..000000000
--- a/eos/effects/effect7158.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorKineticResistancePBC2
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusPBC2"),
-                           skill="Precursor Battlecruiser")
diff --git a/eos/effects/effect7159.py b/eos/effects/effect7159.py
deleted file mode 100644
index 99149f084..000000000
--- a/eos/effects/effect7159.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorThermalResistancePBC2
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusPBC2"),
-                           skill="Precursor Battlecruiser")
diff --git a/eos/effects/effect7160.py b/eos/effects/effect7160.py
deleted file mode 100644
index 8fcf35f0e..000000000
--- a/eos/effects/effect7160.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorEMResistancePBC2
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusPBC2"),
-                           skill="Precursor Battlecruiser")
diff --git a/eos/effects/effect7161.py b/eos/effects/effect7161.py
deleted file mode 100644
index 588feda67..000000000
--- a/eos/effects/effect7161.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorExplosiveResistancePBC2
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusPBC2"),
-                           skill="Precursor Battlecruiser")
diff --git a/eos/effects/effect7162.py b/eos/effects/effect7162.py
deleted file mode 100644
index 193bcd298..000000000
--- a/eos/effects/effect7162.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipRoleDisintegratorMaxRangeCBC
-#
-# Used by:
-# Ship: Drekavac
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"),
-                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/effect7166.py b/eos/effects/effect7166.py
deleted file mode 100644
index 94a53be2b..000000000
--- a/eos/effects/effect7166.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# ShipModuleRemoteArmorMutadaptiveRepairer
-#
-# Used by:
-# Modules from group: Mutadaptive Remote Armor Repairer (5 of 5)
-
-
-import eos.config
-from eos.utils.spoolSupport import SpoolType, SpoolOptions, calculateSpoolup, resolveSpoolOptions
-
-
-type = "projected", "active"
-runTime = "late"
-
-
-def handler(fit, container, context, **kwargs):
-    if "projected" in context:
-        repAmountBase = container.getModifiedItemAttr("armorDamageAmount")
-        cycleTime = container.getModifiedItemAttr("duration") / 1000.0
-        repSpoolMax = container.getModifiedItemAttr("repairMultiplierBonusMax")
-        repSpoolPerCycle = container.getModifiedItemAttr("repairMultiplierBonusPerCycle")
-        defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage']
-        spoolType, spoolAmount = resolveSpoolOptions(SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False), container)
-        rps = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, spoolType, spoolAmount)[0]) / cycleTime
-        rpsPreSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SCALE, 0)[0]) / cycleTime
-        rpsFullSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SCALE, 1)[0]) / cycleTime
-        fit.extraAttributes.increase("armorRepair", rps, **kwargs)
-        fit.extraAttributes.increase("armorRepairPreSpool", rpsPreSpool, **kwargs)
-        fit.extraAttributes.increase("armorRepairFullSpool", rpsFullSpool, **kwargs)
diff --git a/eos/effects/effect7167.py b/eos/effects/effect7167.py
deleted file mode 100644
index bfd670862..000000000
--- a/eos/effects/effect7167.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusRemoteCapacitorTransferRangeRole1
-#
-# Used by:
-# Variations of ship: Rodiva (2 of 2)
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", "maxRange", src.getModifiedItemAttr("shipBonusRole1"))
diff --git a/eos/effects/effect7168.py b/eos/effects/effect7168.py
deleted file mode 100644
index 64fca9ffb..000000000
--- a/eos/effects/effect7168.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRemoteRepairRangeRole3
-#
-# Used by:
-# Ship: Rodiva
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "maxRange", src.getModifiedItemAttr("shipBonusRole3"))
diff --git a/eos/effects/effect7169.py b/eos/effects/effect7169.py
deleted file mode 100644
index 7e892f3e4..000000000
--- a/eos/effects/effect7169.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRepAmountPC1
-#
-# Used by:
-# Ship: Rodiva
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "armorDamageAmount", src.getModifiedItemAttr("shipBonusPC1"), skill="Precursor Cruiser")
diff --git a/eos/effects/effect7170.py b/eos/effects/effect7170.py
deleted file mode 100644
index 22348514a..000000000
--- a/eos/effects/effect7170.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRepCapNeedPC2
-#
-# Used by:
-# Ship: Rodiva
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "capacitorNeed", src.getModifiedItemAttr("shipBonusPC2"), skill="Precursor Cruiser")
diff --git a/eos/effects/effect7171.py b/eos/effects/effect7171.py
deleted file mode 100644
index 67b2da620..000000000
--- a/eos/effects/effect7171.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRemoteRepRangePC1
-#
-# Used by:
-# Ship: Zarmazd
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "maxRange", src.getModifiedItemAttr("shipBonusPC1"), skill="Precursor Cruiser")
diff --git a/eos/effects/effect7172.py b/eos/effects/effect7172.py
deleted file mode 100644
index b936f644c..000000000
--- a/eos/effects/effect7172.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRemoteRepCapNeedeliteBonusLogisitics1
-#
-# Used by:
-# Ship: Zarmazd
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect7173.py b/eos/effects/effect7173.py
deleted file mode 100644
index b8ae258c3..000000000
--- a/eos/effects/effect7173.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# shipBonusMutadaptiveRemoteRepAmounteliteBonusLogisitics2
-#
-# Used by:
-# Ship: Zarmazd
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mutadaptive Remote Armor Repairer", "armorDamageAmount", src.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
diff --git a/eos/effects/effect7176.py b/eos/effects/effect7176.py
deleted file mode 100644
index 01ab85de7..000000000
--- a/eos/effects/effect7176.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# skillBonusDroneInterfacingNotFighters
-#
-# Used by:
-# Implant: CreoDron 'Bumblebee' Drone Tuner T10-5D
-# Implant: CreoDron 'Yellowjacket' Drone Tuner D5-10T
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier",
-                                 src.getModifiedItemAttr("damageMultiplierBonus"))
diff --git a/eos/effects/effect7177.py b/eos/effects/effect7177.py
deleted file mode 100644
index d2b8a0967..000000000
--- a/eos/effects/effect7177.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# skillBonusDroneDurabilityNotFighters
-#
-# Used by:
-# Implants from group: Cyber Drones (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp",
-                                 src.getModifiedItemAttr("hullHpBonus"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP",
-                                 src.getModifiedItemAttr("armorHpBonus"))
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity",
-                                 src.getModifiedItemAttr("shieldCapacityBonus"))
diff --git a/eos/effects/effect7179.py b/eos/effects/effect7179.py
deleted file mode 100644
index c9d0179a6..000000000
--- a/eos/effects/effect7179.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# stripMinerDurationMultiplier
-#
-# Used by:
-# Module: Frostline 'Omnivore' Harvester Upgrade
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Strip Miner",
-                                  "duration", module.getModifiedItemAttr("miningDurationMultiplier"))
diff --git a/eos/effects/effect7180.py b/eos/effects/effect7180.py
deleted file mode 100644
index 3d4cad5a5..000000000
--- a/eos/effects/effect7180.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# miningDurationMultiplierOnline
-#
-# Used by:
-# Module: Frostline 'Omnivore' Harvester Upgrade
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mining Laser",
-                                  "duration", module.getModifiedItemAttr("miningDurationMultiplier"))
diff --git a/eos/effects/effect7183.py b/eos/effects/effect7183.py
deleted file mode 100644
index 8eea16959..000000000
--- a/eos/effects/effect7183.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# implantWarpScrambleRangeBonus
-#
-# Used by:
-# Implants named like: Inquest 'Hedone' Entanglement Optimizer WS (3 of 3)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "maxRange",
-                                  src.getModifiedItemAttr("warpScrambleRangeBonus"), stackingPenalties=False)
diff --git a/eos/effects/effect726.py b/eos/effects/effect726.py
deleted file mode 100644
index 85388f312..000000000
--- a/eos/effects/effect726.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# shipBonusCargo2GI
-#
-# Used by:
-# Variations of ship: Miasmos (3 of 4)
-# Variations of ship: Nereus (2 of 2)
-# Ship: Iteron Mark V
-type = "passive"
-
-
-def handler(fit, ship, context):
-    # TODO: investigate if we can live without such ifs or hardcoding
-    # Viator doesn't have GI bonus
-    if "shipBonusGI" in fit.ship.item.attributes:
-        bonusAttr = "shipBonusGI"
-    else:
-        bonusAttr = "shipBonusGI2"
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr(bonusAttr), skill="Gallente Industrial")
diff --git a/eos/effects/effect727.py b/eos/effects/effect727.py
deleted file mode 100644
index 3e80fb36a..000000000
--- a/eos/effects/effect727.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCargoCI
-#
-# Used by:
-# Variations of ship: Badger (2 of 2)
-# Ship: Tayra
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusCI"), skill="Caldari Industrial")
diff --git a/eos/effects/effect728.py b/eos/effects/effect728.py
deleted file mode 100644
index bc98e3615..000000000
--- a/eos/effects/effect728.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCargoMI
-#
-# Used by:
-# Variations of ship: Wreathe (2 of 2)
-# Ship: Mammoth
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusMI"), skill="Minmatar Industrial")
diff --git a/eos/effects/effect729.py b/eos/effects/effect729.py
deleted file mode 100644
index b032ee1d1..000000000
--- a/eos/effects/effect729.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# shipBonusVelocityGI
-#
-# Used by:
-# Variations of ship: Epithal (2 of 2)
-# Variations of ship: Miasmos (4 of 4)
-# Ship: Iteron Mark V
-# Ship: Kryos
-# Ship: Viator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    # TODO: investigate if we can live without such ifs or hardcoding
-    # Viator doesn't have GI bonus
-    if "shipBonusGI" in fit.ship.item.attributes:
-        bonusAttr = "shipBonusGI"
-    else:
-        bonusAttr = "shipBonusGI2"
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr(bonusAttr), skill="Gallente Industrial")
diff --git a/eos/effects/effect730.py b/eos/effects/effect730.py
deleted file mode 100644
index 9f34a3e72..000000000
--- a/eos/effects/effect730.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusVelocityCI
-#
-# Used by:
-# Variations of ship: Tayra (2 of 2)
-# Ship: Crane
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusCI"), skill="Caldari Industrial")
diff --git a/eos/effects/effect732.py b/eos/effects/effect732.py
deleted file mode 100644
index 3ba16182d..000000000
--- a/eos/effects/effect732.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipVelocityBonusAI
-#
-# Used by:
-# Variations of ship: Bestower (2 of 2)
-# Ship: Prorator
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusAI"), skill="Amarr Industrial")
diff --git a/eos/effects/effect736.py b/eos/effects/effect736.py
deleted file mode 100644
index 73ccc8035..000000000
--- a/eos/effects/effect736.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipBonusCapCapAB
-#
-# Used by:
-# Ship: Apocalypse Imperial Issue
-# Ship: Paladin
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect744.py b/eos/effects/effect744.py
deleted file mode 100644
index 6dcf933fd..000000000
--- a/eos/effects/effect744.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# surveyScanspeedBonusPostPercentDurationLocationShipModulesRequiringElectronics
-#
-# Used by:
-# Modules named like: Signal Focusing Kit (8 of 8)
-# Skill: Survey
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"),
-                                  "duration", container.getModifiedItemAttr("scanspeedBonus") * level)
diff --git a/eos/effects/effect754.py b/eos/effects/effect754.py
deleted file mode 100644
index a10dafe76..000000000
--- a/eos/effects/effect754.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipHybridDamageBonusCF
-#
-# Used by:
-# Ship: Raptor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect757.py b/eos/effects/effect757.py
deleted file mode 100644
index 939e163fa..000000000
--- a/eos/effects/effect757.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipETDamageAF
-#
-# Used by:
-# Ship: Crucifier Navy Issue
-# Ship: Crusader
-# Ship: Imperial Navy Slicer
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "damageMultiplier",
-                                  src.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate")
diff --git a/eos/effects/effect760.py b/eos/effects/effect760.py
deleted file mode 100644
index 9849ecc4b..000000000
--- a/eos/effects/effect760.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipBonusSmallMissileRoFCF2
-#
-# Used by:
-# Ship: Buzzard
-# Ship: Hawk
-# Ship: Pacifier
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect763.py b/eos/effects/effect763.py
deleted file mode 100644
index 4fca60500..000000000
--- a/eos/effects/effect763.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# missileDMGBonus
-#
-# Used by:
-# Modules from group: Ballistic Control system (22 of 22)
-type = "passive"
-
-
-def handler(fit, container, context):
-    for dmgType in ("em", "kinetic", "explosive", "thermal"):
-        fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                           "%sDamage" % dmgType,
-                                           container.getModifiedItemAttr("missileDamageMultiplierBonus"),
-                                           stackingPenalties=True)
diff --git a/eos/effects/effect784.py b/eos/effects/effect784.py
deleted file mode 100644
index e7356d260..000000000
--- a/eos/effects/effect784.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# missileBombardmentMaxFlightTimeBonusPostPercentExplosionDelayOwnerCharModulesRequiringMissileLauncherOperation
-#
-# Used by:
-# Implants named like: Zainou 'Deadeye' Missile Bombardment MB (6 of 6)
-# Modules named like: Rocket Fuel Cache Partition (8 of 8)
-# Implant: Antipharmakon Toxot
-# Skill: Missile Bombardment
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context or "implant" in context or "booster" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosionDelay", container.getModifiedItemAttr("maxFlightTimeBonus") * level,
-                                    stackingPenalties=penalized)
diff --git a/eos/effects/effect804.py b/eos/effects/effect804.py
deleted file mode 100644
index 3bbb1103c..000000000
--- a/eos/effects/effect804.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# ammoInfluenceCapNeed
-#
-# Used by:
-# Items from category: Charge (493 of 949)
-type = "passive"
-
-
-def handler(fit, module, context):
-    # Dirty hack to work around cap charges setting cap booster
-    # injection amount to zero
-    rawAttr = module.item.getAttribute("capacitorNeed")
-    if rawAttr is not None and rawAttr >= 0:
-        module.boostItemAttr("capacitorNeed", module.getModifiedChargeAttr("capNeedBonus") or 0)
diff --git a/eos/effects/effect836.py b/eos/effects/effect836.py
deleted file mode 100644
index 93f4c33cf..000000000
--- a/eos/effects/effect836.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# skillFreightBonus
-#
-# Used by:
-# Modules named like: Cargohold Optimization (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("capacity", module.getModifiedItemAttr("cargoCapacityBonus"))
diff --git a/eos/effects/effect848.py b/eos/effects/effect848.py
deleted file mode 100644
index 292926bdd..000000000
--- a/eos/effects/effect848.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# cloakingTargetingDelayBonusPostPercentCloakingTargetingDelayBonusForShipModulesRequiringCloaking
-#
-# Used by:
-# Skill: Cloaking
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "cloakingTargetingDelay",
-                                  skill.getModifiedItemAttr("cloakingTargetingDelayBonus") * skill.level)
diff --git a/eos/effects/effect854.py b/eos/effects/effect854.py
deleted file mode 100644
index 38f073c5b..000000000
--- a/eos/effects/effect854.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# cloakingScanResolutionMultiplier
-#
-# Used by:
-# Modules from group: Cloaking Device (12 of 14)
-type = "offline"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("scanResolution",
-                              module.getModifiedItemAttr("scanResolutionMultiplier"),
-                              stackingPenalties=True, penaltyGroup="cloakingScanResolutionMultiplier")
diff --git a/eos/effects/effect856.py b/eos/effects/effect856.py
deleted file mode 100644
index 57174c39d..000000000
--- a/eos/effects/effect856.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# warpSkillSpeed
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6)
-# Implants named like: grade Ascendancy (10 of 12)
-# Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    penalized = False if "skill" in context or "implant" in context else True
-    fit.ship.boostItemAttr("baseWarpSpeed", container.getModifiedItemAttr("WarpSBonus"),
-                           stackingPenalties=penalized)
diff --git a/eos/effects/effect874.py b/eos/effects/effect874.py
deleted file mode 100644
index d4245be72..000000000
--- a/eos/effects/effect874.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipProjectileOptimalBonuseMF2
-#
-# Used by:
-# Ship: Cheetah
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate")
diff --git a/eos/effects/effect882.py b/eos/effects/effect882.py
deleted file mode 100644
index 08e85c17c..000000000
--- a/eos/effects/effect882.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridRangeBonusCF2
-#
-# Used by:
-# Ship: Harpy
-# Ship: Raptor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")
diff --git a/eos/effects/effect887.py b/eos/effects/effect887.py
deleted file mode 100644
index 73ffd229d..000000000
--- a/eos/effects/effect887.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipETspeedBonusAB2
-#
-# Used by:
-# Variations of ship: Armageddon (3 of 5)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")
diff --git a/eos/effects/effect889.py b/eos/effects/effect889.py
deleted file mode 100644
index 2655e614e..000000000
--- a/eos/effects/effect889.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# missileLauncherSpeedMultiplier
-#
-# Used by:
-# Modules from group: Ballistic Control system (22 of 22)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect89.py b/eos/effects/effect89.py
deleted file mode 100644
index 73c1d538d..000000000
--- a/eos/effects/effect89.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# projectileWeaponSpeedMultiply
-#
-# Used by:
-# Modules from group: Gyrostabilizer (14 of 14)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect891.py b/eos/effects/effect891.py
deleted file mode 100644
index b690761be..000000000
--- a/eos/effects/effect891.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipCruiseMissileVelocityBonusCB3
-#
-# Used by:
-# Variations of ship: Raven (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/effect892.py b/eos/effects/effect892.py
deleted file mode 100644
index 6bedfb8c6..000000000
--- a/eos/effects/effect892.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipTorpedosVelocityBonusCB3
-#
-# Used by:
-# Variations of ship: Raven (3 of 4)
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
diff --git a/eos/effects/effect896.py b/eos/effects/effect896.py
deleted file mode 100644
index 8c45bb186..000000000
--- a/eos/effects/effect896.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# covertOpsCpuBonus1
-#
-# Used by:
-# Ships from group: Stealth Bomber (4 of 5)
-# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Cloaking Device",
-                                     "cpu", container.getModifiedItemAttr("cloakingCpuNeedBonus"))
diff --git a/eos/effects/effect898.py b/eos/effects/effect898.py
deleted file mode 100644
index 3718e1666..000000000
--- a/eos/effects/effect898.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipMissileKineticDamageCF
-#
-# Used by:
-# Ship: Buzzard
-# Ship: Condor
-# Ship: Hawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
diff --git a/eos/effects/effect899.py b/eos/effects/effect899.py
deleted file mode 100644
index e656053e6..000000000
--- a/eos/effects/effect899.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# shipMissileKineticDamageCC
-#
-# Used by:
-# Ship: Cerberus
-# Ship: Onyx
-# Ship: Orthrus
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect900.py b/eos/effects/effect900.py
deleted file mode 100644
index 54f7716e0..000000000
--- a/eos/effects/effect900.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipDroneScoutThermalDamageGF2
-#
-# Used by:
-# Ship: Helios
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Light Drone Operation"),
-                                 "thermalDamage", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate")
diff --git a/eos/effects/effect907.py b/eos/effects/effect907.py
deleted file mode 100644
index dbb11d779..000000000
--- a/eos/effects/effect907.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipLaserRofAC2
-#
-# Used by:
-# Ship: Omen
-# Ship: Zealot
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect909.py b/eos/effects/effect909.py
deleted file mode 100644
index a801712c2..000000000
--- a/eos/effects/effect909.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipArmorHpAC2
-#
-# Used by:
-# Ship: Augoror Navy Issue
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect91.py b/eos/effects/effect91.py
deleted file mode 100644
index 42dddd186..000000000
--- a/eos/effects/effect91.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyWeaponDamageMultiply
-#
-# Used by:
-# Modules from group: Heat Sink (19 of 19)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect912.py b/eos/effects/effect912.py
deleted file mode 100644
index 1c1ce33d4..000000000
--- a/eos/effects/effect912.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipMissileLauncherRofCC2
-#
-# Used by:
-# Ship: Onyx
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
-                                  "speed", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
diff --git a/eos/effects/effect918.py b/eos/effects/effect918.py
deleted file mode 100644
index 16390827e..000000000
--- a/eos/effects/effect918.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipDronesMaxGC2
-#
-# Used by:
-# Ship: Guardian-Vexor
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect919.py b/eos/effects/effect919.py
deleted file mode 100644
index 4169cca0d..000000000
--- a/eos/effects/effect919.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# shipHybridTrackingGC2
-#
-# Used by:
-# Ship: Enforcer
-# Ship: Thorax
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser")
diff --git a/eos/effects/effect92.py b/eos/effects/effect92.py
deleted file mode 100644
index aeafffff7..000000000
--- a/eos/effects/effect92.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# projectileWeaponDamageMultiply
-#
-# Used by:
-# Modules from group: Gyrostabilizer (14 of 14)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect93.py b/eos/effects/effect93.py
deleted file mode 100644
index 87166fc7c..000000000
--- a/eos/effects/effect93.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# hybridWeaponDamageMultiply
-#
-# Used by:
-# Modules from group: Magnetic Field Stabilizer (15 of 15)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect95.py b/eos/effects/effect95.py
deleted file mode 100644
index 19dacfb85..000000000
--- a/eos/effects/effect95.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# energyWeaponSpeedMultiply
-#
-# Used by:
-# Modules from group: Heat Sink (19 of 19)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect958.py b/eos/effects/effect958.py
deleted file mode 100644
index 3b38e626e..000000000
--- a/eos/effects/effect958.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# shipArmorEmResistanceAC2
-#
-# Used by:
-# Ship: Maller
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser")
diff --git a/eos/effects/effect959.py b/eos/effects/effect959.py
deleted file mode 100644
index 76c98a057..000000000
--- a/eos/effects/effect959.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorExplosiveResistanceAC2
-#
-# Used by:
-# Ship: Maller
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"),
-                           skill="Amarr Cruiser")
diff --git a/eos/effects/effect96.py b/eos/effects/effect96.py
deleted file mode 100644
index 876ef5b3c..000000000
--- a/eos/effects/effect96.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# hybridWeaponSpeedMultiply
-#
-# Used by:
-# Modules from group: Magnetic Field Stabilizer (15 of 15)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",
-                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
-                                     stackingPenalties=True)
diff --git a/eos/effects/effect960.py b/eos/effects/effect960.py
deleted file mode 100644
index 5c96ab767..000000000
--- a/eos/effects/effect960.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorKineticResistanceAC2
-#
-# Used by:
-# Ship: Maller
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"),
-                           skill="Amarr Cruiser")
diff --git a/eos/effects/effect961.py b/eos/effects/effect961.py
deleted file mode 100644
index 3e3dab2cf..000000000
--- a/eos/effects/effect961.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# shipArmorThermalResistanceAC2
-#
-# Used by:
-# Ship: Maller
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"),
-                           skill="Amarr Cruiser")
diff --git a/eos/effects/effect968.py b/eos/effects/effect968.py
deleted file mode 100644
index c313f8e7e..000000000
--- a/eos/effects/effect968.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# shipProjectileDmgMC2
-#
-# Used by:
-# Variations of ship: Rupture (3 of 3)
-# Ship: Cynabal
-# Ship: Moracha
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC2"),
-                                  skill="Minmatar Cruiser")
diff --git a/eos/effects/effect980.py b/eos/effects/effect980.py
deleted file mode 100644
index 6906118dc..000000000
--- a/eos/effects/effect980.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# cloakingWarpSafe
-#
-# Used by:
-# Modules named like: Covert Ops Cloaking Device II (2 of 2)
-type = "active"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.extraAttributes["cloaked"] = True
-    # TODO: Implement
diff --git a/eos/effects/effect989.py b/eos/effects/effect989.py
deleted file mode 100644
index df9a7dbb0..000000000
--- a/eos/effects/effect989.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# eliteBonusGunshipHybridOptimal1
-#
-# Used by:
-# Ship: Enyo
-# Ship: Harpy
-# Ship: Ishkur
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect991.py b/eos/effects/effect991.py
deleted file mode 100644
index ea410651b..000000000
--- a/eos/effects/effect991.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipLaserOptimal1
-#
-# Used by:
-# Ship: Retribution
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")
diff --git a/eos/effects/effect996.py b/eos/effects/effect996.py
deleted file mode 100644
index 9fc26ca51..000000000
--- a/eos/effects/effect996.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusGunshipHybridTracking2
-#
-# Used by:
-# Ship: Enyo
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusGunship2"),
-                                  skill="Assault Frigates")
diff --git a/eos/effects/effect998.py b/eos/effects/effect998.py
deleted file mode 100644
index df8ed9532..000000000
--- a/eos/effects/effect998.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# eliteBonusGunshipProjectileFalloff2
-#
-# Used by:
-# Ship: Wolf
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
diff --git a/eos/effects/effect999.py b/eos/effects/effect999.py
deleted file mode 100644
index 883b11110..000000000
--- a/eos/effects/effect999.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# eliteBonusGunshipShieldBoost2
-#
-# Used by:
-# Ship: Hawk
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
-                                  "shieldBonus", ship.getModifiedItemAttr("eliteBonusGunship2"),
-                                  skill="Assault Frigates")
diff --git a/eos/gamedata.py b/eos/gamedata.py
index 40fbefe2f..07f25ae51 100644
--- a/eos/gamedata.py
+++ b/eos/gamedata.py
@@ -17,26 +17,20 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-import re
 
-from sqlalchemy.orm import reconstructor
-import eos.config as config
-import eos.db
-from .eqBase import EqBase
-from eos.saveddata.price import Price as types_Price
 from collections import OrderedDict
-import importlib
-
 
 from logbook import Logger
+from sqlalchemy.orm import reconstructor
+
+import eos.effects
+import eos.db
+from eos.saveddata.price import Price as types_Price
+from .eqBase import EqBase
+
 
 pyfalog = Logger(__name__)
 
-try:
-    import eos.effects.all as all_effects_module
-except ImportError:
-    all_effects_module = None
-
 
 class Effect(EqBase):
     """
@@ -56,8 +50,7 @@ class Effect(EqBase):
         Reconstructor, composes the object as we grab it from the database
         """
         self.__generated = False
-        self.__effectModule = None
-        self.handlerName = "effect{}".format(self.ID)
+        self.__effectDef = None
 
     @property
     def handler(self):
@@ -147,7 +140,7 @@ class Effect(EqBase):
         Whether this effect is implemented in code or not,
         unimplemented effects simply do nothing at all when run
         """
-        return self.handler != effectDummy
+        return self.handler is not eos.effects.EffectDef.handler
 
     def isType(self, type):
         """
@@ -161,43 +154,31 @@ class Effect(EqBase):
         if it doesn't, set dummy values and add a dummy handler
         """
         try:
-            if all_effects_module and config.use_all_effect_module:
-                pyfalog.debug("Loading {0} ({1}) from all module".format(self.handlerName, self.name))
-                func = getattr(all_effects_module, self.handlerName)
-                self.__effectModule = effectModule = func()
-                self.__handler = effectModule.get("handler", effectDummy)
-                self.__runTime = effectModule.get("runTime", "normal")
-                self.__activeByDefault = effectModule.get("activeByDefault", True)
-                t = effectModule.get("type", None)
-
-                t = t if isinstance(t, tuple) or t is None else (t,)
-                self.__type = t
-            else:
-                pyfalog.debug("Loading {0} ({1}) from effect file".format(self.handlerName, self.name))
-                self.__effectModule = effectModule = importlib.import_module('eos.effects.' + self.handlerName)
-                self.__handler = getattr(effectModule, "handler", effectDummy)
-                self.__runTime = getattr(effectModule, "runTime", "normal")
-                self.__activeByDefault = getattr(effectModule, "activeByDefault", True)
-                t = getattr(effectModule, "type", None)
-
-                t = t if isinstance(t, tuple) or t is None else (t,)
-                self.__type = t
+            effectDefName = "Effect{}".format(self.ID)
+            pyfalog.debug("Loading {0} ({1})".format(self.name, effectDefName))
+            self.__effectDef = effectDef = getattr(eos.effects, effectDefName)
+            self.__handler = getattr(effectDef, "handler", eos.effects.EffectDef.handler)
+            self.__runTime = getattr(effectDef, "runTime", "normal")
+            self.__activeByDefault = getattr(effectDef, "activeByDefault", True)
+            effectType = getattr(effectDef, "type", None)
+            effectType = effectType if isinstance(effectType, tuple) or effectType is None else (effectType,)
+            self.__type = effectType
         except ImportError as e:
             # Effect probably doesn't exist, so create a dummy effect and flag it with a warning.
-            self.__handler = effectDummy
+            self.__handler = eos.effects.EffectDef.handler
             self.__runTime = "normal"
             self.__activeByDefault = True
             self.__type = None
             pyfalog.debug("ImportError generating handler: {0}", e)
         except AttributeError as e:
             # Effect probably exists but there is an issue with it.  Turn it into a dummy effect so we can continue, but flag it with an error.
-            self.__handler = effectDummy
+            self.__handler = eos.effects.EffectDef.handler
             self.__runTime = "normal"
             self.__activeByDefault = True
             self.__type = None
             pyfalog.error("AttributeError generating handler: {0}", e)
         except Exception as e:
-            self.__handler = effectDummy
+            self.__handler = eos.effects.EffectDef.handler
             self.__runTime = "normal"
             self.__activeByDefault = True
             self.__type = None
@@ -211,13 +192,9 @@ class Effect(EqBase):
             self.__generateHandler()
 
         try:
-            return self.__effectModule.get(key, None)
+            return self.__effectDef.get(key, None)
         except:
-            return getattr(self.__effectModule, key, None)
-
-
-def effectDummy(*args, **kwargs):
-    pass
+            return getattr(self.__effectDef, key, None)
 
 
 class Item(EqBase):
diff --git a/scripts/effect_rollup.py b/scripts/effect_rollup.py
deleted file mode 100644
index bb8abfb67..000000000
--- a/scripts/effect_rollup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import os
-import os.path
-
-new_effect_file_contents = ""
-
-for filename in os.listdir(os.path.join('eos', 'effects')):
-    if filename.startswith("_") or not filename.endswith(".py") or filename == 'all.py':
-        continue
-
-    new_effect_file_contents += f"def {os.path.splitext(filename)[0]}():\n"
-
-    file = open(os.path.join('eos', 'effects', filename), "r")
-
-    for line in file:
-        if line.strip().startswith("#") or line.strip() == "":
-            continue
-        new_effect_file_contents += f"    {line}"
-
-    new_effect_file_contents += "\n    return locals()\n\n"
-
-with open(os.path.join('eos', 'effects', 'all.py'), "w") as f:
-    f.write(new_effect_file_contents)
-
-