diff --git a/CompatNoCheatPlus/MIGHT_README.TXT b/CompatNoCheatPlus/MIGHT_README.TXT
deleted file mode 100644
index 2ba3999..0000000
--- a/CompatNoCheatPlus/MIGHT_README.TXT
+++ /dev/null
@@ -1,8 +0,0 @@
-The folder "local-maven" contains the following dependencies,
-some of which will be removed, once the maven repository is found (see pom.xml):
-- NoCheatPlus
-- mcMMO
-- MagicSpells
-- Citizens
-
-TODO: Links to the projects, re-check for CURRENT repositories.
diff --git a/CompatNoCheatPlus/pom.xml b/CompatNoCheatPlus/pom.xml
index 18bc966..484fe37 100644
--- a/CompatNoCheatPlus/pom.xml
+++ b/CompatNoCheatPlus/pom.xml
@@ -59,13 +59,6 @@
           <version>2.0.16-SNAPSHOT</version>
           <scope>compile</scope>
        </dependency>
-       <dependency>
-       	<groupId>com.nisovin</groupId>
-       	<artifactId>MagicSpells</artifactId>
-       	<version>todo</version>
-       	<scope>system</scope>
-       	<systemPath>${basedir}/local-maven/MagicSpells.jar</systemPath>
-       </dependency>
     </dependencies>
   
     <!-- Building -->
diff --git a/CompatNoCheatPlus/src/me/asofold/bpl/cncp/CompatNoCheatPlus.java b/CompatNoCheatPlus/src/me/asofold/bpl/cncp/CompatNoCheatPlus.java
index 97d6b6a..cfdc6b3 100644
--- a/CompatNoCheatPlus/src/me/asofold/bpl/cncp/CompatNoCheatPlus.java
+++ b/CompatNoCheatPlus/src/me/asofold/bpl/cncp/CompatNoCheatPlus.java
@@ -182,11 +182,11 @@ public class CompatNoCheatPlus extends JavaPlugin implements Listener {
             builtinHooks.add(new me.asofold.bpl.cncp.hooks.mcmmo.HookmcMMO());
         }
         catch (Throwable t){}
-        // MagicSpells
-        try{
-            builtinHooks.add(new me.asofold.bpl.cncp.hooks.magicspells.HookMagicSpells());
-        }
-        catch (Throwable t){}
+//        // MagicSpells
+//        try{
+//            builtinHooks.add(new me.asofold.bpl.cncp.hooks.magicspells.HookMagicSpells());
+//        }
+//        catch (Throwable t){}
         // Simple generic hooks
         for (Hook hook : new Hook[]{
                 new HookPlayerClass(),
diff --git a/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/magicspells/HookMagicSpells.java b/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/magicspells/HookMagicSpells.java
index 4d794e9..8231f69 100644
--- a/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/magicspells/HookMagicSpells.java
+++ b/CompatNoCheatPlus/src/me/asofold/bpl/cncp/hooks/magicspells/HookMagicSpells.java
@@ -10,21 +10,11 @@ import me.asofold.bpl.cncp.config.compatlayer.CompatConfig;
 import me.asofold.bpl.cncp.config.compatlayer.CompatConfigFactory;
 import me.asofold.bpl.cncp.config.compatlayer.ConfigUtil;
 import me.asofold.bpl.cncp.hooks.AbstractConfigurableHook;
-import me.asofold.bpl.cncp.utils.TickTask2;
 
 import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.nisovin.magicspells.Spell;
-import com.nisovin.magicspells.Spell.SpellCastState;
-import com.nisovin.magicspells.events.SpellCastEvent;
-import com.nisovin.magicspells.events.SpellCastedEvent;
-
 import fr.neatmonster.nocheatplus.checks.CheckType;
-import fr.neatmonster.nocheatplus.hooks.NCPExemptionManager;
 
 public class HookMagicSpells extends AbstractConfigurableHook implements Listener{
 	
@@ -42,39 +32,39 @@ public class HookMagicSpells extends AbstractConfigurableHook implements Listene
 		};
 	}
 	
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void onSpellCast(final SpellCastEvent event){
-		if (event.getSpellCastState() != SpellCastState.NORMAL) return;
-		exempt(event.getCaster(), event.getSpell());
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void onSpellCasted(final SpellCastedEvent event){
-		unexempt(event.getCaster(), event.getSpell());
-	}
-	
-	private void exempt(final Player player, final Spell spell) {
-		final CheckType[] types = getCheckTypes(spell);
-		if (types == null) return;
-		for (final CheckType type : types){
-			NCPExemptionManager.exemptPermanently(player, type);
-			// Safety fall-back:
-			// TODO: Might interfere with "slow" effects of spells ? [might add config for this.]
-			TickTask2.addUnexemptions(player, types);
-		}
-	}
-	
-	private void unexempt(final Player player, final Spell spell) {
-		final CheckType[] types = getCheckTypes(spell);
-		if (types == null) return;
-		for (final CheckType type : types){
-			NCPExemptionManager.unexempt(player, type);
-		}
-	}
-	
-	protected CheckType[] getCheckTypes(final Spell spell){
-		return spellMap.get(spell.getName());
-	}
+//	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+//	public void onSpellCast(final SpellCastEvent event){
+//		if (event.getSpellCastState() != SpellCastState.NORMAL) return;
+//		exempt(event.getCaster(), event.getSpell());
+//	}
+//
+//	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+//	public void onSpellCasted(final SpellCastedEvent event){
+//		unexempt(event.getCaster(), event.getSpell());
+//	}
+//	
+//	private void exempt(final Player player, final Spell spell) {
+//		final CheckType[] types = getCheckTypes(spell);
+//		if (types == null) return;
+//		for (final CheckType type : types){
+//			NCPExemptionManager.exemptPermanently(player, type);
+//			// Safety fall-back:
+//			// TODO: Might interfere with "slow" effects of spells ? [might add config for this.]
+//			TickTask2.addUnexemptions(player, types);
+//		}
+//	}
+//	
+//	private void unexempt(final Player player, final Spell spell) {
+//		final CheckType[] types = getCheckTypes(spell);
+//		if (types == null) return;
+//		for (final CheckType type : types){
+//			NCPExemptionManager.unexempt(player, type);
+//		}
+//	}
+//	
+//	protected CheckType[] getCheckTypes(final Spell spell){
+//		return spellMap.get(spell.getName());
+//	}
 
 	/* (non-Javadoc)
 	 * @see me.asofold.bpl.cncp.hooks.AbstractConfigurableHook#applyConfig(me.asofold.bpl.cncp.config.compatlayer.CompatConfig, java.lang.String)