diff --git a/src/main/java/net/babamod/mineclass/classes/MineClass.java b/src/main/java/net/babamod/mineclass/classes/MineClass.java
index 85d0c89..d2c35a1 100644
--- a/src/main/java/net/babamod/mineclass/classes/MineClass.java
+++ b/src/main/java/net/babamod/mineclass/classes/MineClass.java
@@ -19,8 +19,6 @@ public interface MineClass {
 
   Map<Material, List<Pair<Enchantment, Integer>>> getClassEnchantments();
 
-  boolean is(Player player);
-
   void reapplyEffects(Player player);
 
   boolean isItemForbidden(Material type);
diff --git a/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java b/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java
index 11db105..5968630 100644
--- a/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java
+++ b/src/main/java/net/babamod/mineclass/classes/MineClassFactory.java
@@ -77,8 +77,7 @@ public class MineClassFactory {
   public synchronized Optional<MineClass> getRightClass(Player player) {
     for (Map.Entry<String, MineClass> stringMineClassEntry : availableClasses.entrySet()) {
       if (getClassCode(player) != null
-              && getClassCode(player).equals(stringMineClassEntry.getKey())
-          || stringMineClassEntry.getValue().is(player)) {
+              && getClassCode(player).equals(stringMineClassEntry.getKey())) {
         return Optional.of(stringMineClassEntry.getValue());
       }
     }
diff --git a/src/main/java/net/babamod/mineclass/classes/MineClassImpl.java b/src/main/java/net/babamod/mineclass/classes/MineClassImpl.java
index 13cf9a3..3541279 100644
--- a/src/main/java/net/babamod/mineclass/classes/MineClassImpl.java
+++ b/src/main/java/net/babamod/mineclass/classes/MineClassImpl.java
@@ -10,14 +10,6 @@ import java.util.stream.Collectors;
 
 public abstract class MineClassImpl implements MineClass {
 
-  @Override
-  public boolean is(Player player) {
-    return player.getActivePotionEffects().stream()
-        .map(PotionEffect::getType)
-        .collect(Collectors.toList())
-        .containsAll(getPotionEffects().keySet());
-  }
-
   @Override
   public void reapplyEffects(Player player) {
     MineClassFactory.clearAllClassEffects(player);
diff --git a/src/main/java/net/babamod/mineclass/commands/CommandClass.java b/src/main/java/net/babamod/mineclass/commands/CommandClass.java
index 68a4c09..41461de 100644
--- a/src/main/java/net/babamod/mineclass/commands/CommandClass.java
+++ b/src/main/java/net/babamod/mineclass/commands/CommandClass.java
@@ -38,7 +38,9 @@ public class CommandClass implements CommandExecutor {
         MineClassFactory.getInstance().giveItemsForClassByCode(args[0], player);
         MineClassFactory.getInstance().dropForbiddenItemsForClassByCode(args[0], player);
         MineClassFactory.getInstance().setClassCode(player, args[0]);
-        player.addPotionEffect(new PotionEffect(PotionEffectType.SATURATION,200, 9));
+        if (!player.hasPotionEffect(PotionEffectType.SATURATION)) {
+          player.addPotionEffect(new PotionEffect(PotionEffectType.SATURATION,200, 9));
+        }
         return true;
       }
       if (args[0].equals("steve")) {