diff --git a/src/main/java/com/comandante/creeper/command/CastCommand.java b/src/main/java/com/comandante/creeper/command/CastCommand.java
index e3975653fb34e5e1b68d1c0ec70ec2445838940b..1c508a66a0d8601182ab9275cb2412d2fe6b4a58 100644
--- a/src/main/java/com/comandante/creeper/command/CastCommand.java
+++ b/src/main/java/com/comandante/creeper/command/CastCommand.java
@@ -44,11 +44,6 @@ public class CastCommand extends Command {
             }
             String desiredSpellName = originalMessageParts.get(1);
             Spell spell = SpellRegistry.getSpell(desiredSpellName);
-            if (spell instanceof AidsSpell) {
-                if (!player.getPlayerName().equals("fibs")) {
-                    return;
-                }
-            }
             if (spell == null) {
                 write("No spell found with the name: " + desiredSpellName + "\r\n");
                 return;
diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java
index 79a4170f99172ff68246b989f50317b99620c86a..608bfb17953d6b123421ed5cec3006f0ae095008 100755
--- a/src/main/java/com/comandante/creeper/player/Player.java
+++ b/src/main/java/com/comandante/creeper/player/Player.java
@@ -146,6 +146,7 @@ public class Player extends CreeperEntity {
     }
 
     public void killPlayer(Npc npc) {
+        resetEffects();
         synchronized (interner.intern(playerId)) {
             if (npc != null && doesActiveFightExist(npc)) {
                 removeAllActiveFights();
@@ -283,6 +284,14 @@ public class Player extends CreeperEntity {
         }
     }
 
+    public void resetEffects(){
+        synchronized (interner){
+            PlayerMetadata playerMetadata = getPlayerMetadata();
+            playerMetadata.resetEffects();
+            gameManager.getPlayerManager().savePlayerMetadata(playerMetadata);
+        }
+    }
+
     public void addLockerInventoryId(String entityId) {
         synchronized (interner.intern(playerId)) {
             PlayerMetadata playerMetadata = getPlayerMetadata();
diff --git a/src/main/java/com/comandante/creeper/player/PlayerMetadata.java b/src/main/java/com/comandante/creeper/player/PlayerMetadata.java
index 3e24accd8a382252df42e4203e5077d4b0f1b58b..44279f751ac671000d6f2afad54f5a1e8e3cc083 100644
--- a/src/main/java/com/comandante/creeper/player/PlayerMetadata.java
+++ b/src/main/java/com/comandante/creeper/player/PlayerMetadata.java
@@ -214,4 +214,8 @@ public class PlayerMetadata implements Serializable {
     public void setIsMarkedForDelete(boolean isMarkedForDelete) {
         this.isMarkedForDelete = isMarkedForDelete;
     }
+
+    protected void resetEffects(){
+        this.effects = Lists.newArrayList();
+    }
 }