diff --git a/Mage.Sets/src/mage/cards/l/LivingLore.java b/Mage.Sets/src/mage/cards/l/LivingLore.java
index 7438a74bc3b..85b5d1144f9 100644
--- a/Mage.Sets/src/mage/cards/l/LivingLore.java
+++ b/Mage.Sets/src/mage/cards/l/LivingLore.java
@@ -14,12 +14,7 @@ import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Layer;
-import mage.constants.Outcome;
-import mage.constants.SubLayer;
-import mage.constants.Zone;
+import mage.constants.*;
 import mage.filter.common.FilterInstantOrSorceryCard;
 import mage.game.ExileZone;
 import mage.game.Game;
@@ -36,7 +31,7 @@ public final class LivingLore extends CardImpl {
 
     public LivingLore(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");
-        this.subtype.add("Avatar");
+        this.subtype.add(SubType.AVATAR);
         this.power = new MageInt(0);
         this.toughness = new MageInt(0);
 
diff --git a/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java b/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java
index 8f515860bce..bc72bae2dd4 100644
--- a/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java
+++ b/Mage.Sets/src/mage/cards/s/SnickeringSquirrel.java
@@ -8,10 +8,7 @@ import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.ReplacementEffectImpl;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
-import mage.constants.Duration;
-import mage.constants.Outcome;
-import mage.constants.Zone;
+import mage.constants.*;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
@@ -26,8 +23,7 @@ public final class SnickeringSquirrel extends CardImpl {
     public SnickeringSquirrel(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}");
 
-        this.subtype.add("Squirrel");
-        this.subtype.add("Advisor");
+        this.subtype.add(SubType.SQUIRREL, SubType.ADVISOR);
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
diff --git a/Mage/src/main/java/mage/cards/repository/CardInfo.java b/Mage/src/main/java/mage/cards/repository/CardInfo.java
index 2563d4e3077..e33bafe158b 100644
--- a/Mage/src/main/java/mage/cards/repository/CardInfo.java
+++ b/Mage/src/main/java/mage/cards/repository/CardInfo.java
@@ -301,7 +301,7 @@ public class CardInfo {
             return sl;
         }
         for (String s : subtypes.split(SEPARATOR)) {
-            sl.add(s);
+            sl.add(SubType.fromString(s));
         }
         return sl;
     }
diff --git a/Mage/src/main/java/mage/util/SubTypeList.java b/Mage/src/main/java/mage/util/SubTypeList.java
index 84b4fa74912..2dc37f16d51 100644
--- a/Mage/src/main/java/mage/util/SubTypeList.java
+++ b/Mage/src/main/java/mage/util/SubTypeList.java
@@ -20,20 +20,6 @@ public class SubTypeList extends ArrayList<SubType> {
         Collections.addAll(this, subTypesList);
     }
 
-    @Deprecated
-    public boolean addAll(List<String> subtypes) {
-        return addAll(subtypes.stream()
-                .map(SubType::byDescription)
-                .collect(Collectors.toList()));
-    }
-
-    @Deprecated
-    public boolean removeAll(List<String> subtypes) {
-        return removeAll(subtypes.stream()
-                .map(SubType::byDescription)
-                .collect(Collectors.toList()));
-    }
-
     public boolean add(SubType... subTypes) {
         return Collections.addAll(this, subTypes);
     }
@@ -42,18 +28,4 @@ public class SubTypeList extends ArrayList<SubType> {
         return super.removeAll(Arrays.stream(subTypes)
                 .collect(Collectors.toList()));
     }
-
-    @Deprecated
-    public boolean add(String s) {
-        SubType subType = SubType.byDescription(s);
-        if (subType != null) {
-            return add(subType);
-        }
-        return false;
-    }
-
-    @Deprecated
-    public boolean contains(String s) {
-        return contains(SubType.byDescription(s));
-    }
 }