diff --git a/src/main/java/ru/bclib/api/BiomeAPI.java b/src/main/java/ru/bclib/api/BiomeAPI.java
index 96e519a0..eb4ff13e 100644
--- a/src/main/java/ru/bclib/api/BiomeAPI.java
+++ b/src/main/java/ru/bclib/api/BiomeAPI.java
@@ -310,10 +310,14 @@ public class BiomeAPI {
 	}
 	
 	public static boolean isNetherBiome(ResourceLocation biomeID) {
-		return NETHER_BIOME_PICKER.getBiomes().contains(biomeID);
+		return pickerHasBiome(NETHER_BIOME_PICKER, biomeID);
 	}
 	
 	public static boolean isEndBiome(ResourceLocation biomeID) {
-		return END_LAND_BIOME_PICKER.getBiomes().contains(biomeID) || END_VOID_BIOME_PICKER.getBiomes().contains(biomeID);
+		return pickerHasBiome(END_LAND_BIOME_PICKER, biomeID) || pickerHasBiome(END_VOID_BIOME_PICKER, biomeID);
+	}
+	
+	private static boolean pickerHasBiome(BiomePicker picker, ResourceLocation key) {
+		return picker.getBiomes().stream().filter(biome -> biome.getID().equals(key)).findFirst().isPresent();
 	}
 }
diff --git a/src/main/java/ru/bclib/api/dataexchange/DataExchangeAPI.java b/src/main/java/ru/bclib/api/dataexchange/DataExchangeAPI.java
index 95e8d675..4a22c6db 100644
--- a/src/main/java/ru/bclib/api/dataexchange/DataExchangeAPI.java
+++ b/src/main/java/ru/bclib/api/dataexchange/DataExchangeAPI.java
@@ -5,10 +5,10 @@ import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.network.FriendlyByteBuf;
 import ru.bclib.BCLib;
+import ru.bclib.api.dataexchange.handler.DataExchange;
 import ru.bclib.api.dataexchange.handler.autosync.AutoSync;
 import ru.bclib.api.dataexchange.handler.autosync.AutoSync.NeedTransferPredicate;
 import ru.bclib.api.dataexchange.handler.autosync.AutoSyncID;
-import ru.bclib.api.dataexchange.handler.DataExchange;
 import ru.bclib.config.Config;
 import ru.bclib.util.ModUtil;
 
diff --git a/src/main/java/ru/bclib/api/dataexchange/handler/autosync/AutoFileSyncEntry.java b/src/main/java/ru/bclib/api/dataexchange/handler/autosync/AutoFileSyncEntry.java
index 4969bb2e..e01bc427 100644
--- a/src/main/java/ru/bclib/api/dataexchange/handler/autosync/AutoFileSyncEntry.java
+++ b/src/main/java/ru/bclib/api/dataexchange/handler/autosync/AutoFileSyncEntry.java
@@ -6,10 +6,9 @@ import ru.bclib.api.dataexchange.DataHandler;
 import ru.bclib.api.dataexchange.SyncFileHash;
 import ru.bclib.api.dataexchange.handler.autosync.AutoSync.NeedTransferPredicate;
 import ru.bclib.api.dataexchange.handler.autosync.SyncFolderDescriptor.SubFile;
-import ru.bclib.config.Config;
 import ru.bclib.util.ModUtil;
-import ru.bclib.util.Pair;
 import ru.bclib.util.ModUtil.ModInfo;
+import ru.bclib.util.Pair;
 import ru.bclib.util.Triple;
 
 import java.io.File;
diff --git a/src/main/java/ru/bclib/api/dataexchange/handler/autosync/HelloClient.java b/src/main/java/ru/bclib/api/dataexchange/handler/autosync/HelloClient.java
index bcb0ce90..ce2c84ea 100644
--- a/src/main/java/ru/bclib/api/dataexchange/handler/autosync/HelloClient.java
+++ b/src/main/java/ru/bclib/api/dataexchange/handler/autosync/HelloClient.java
@@ -18,9 +18,9 @@ import ru.bclib.api.dataexchange.handler.autosync.SyncFolderDescriptor.SubFile;
 import ru.bclib.gui.screens.SyncFilesScreen;
 import ru.bclib.gui.screens.WarnBCLibVersionMismatch;
 import ru.bclib.util.ModUtil;
+import ru.bclib.util.ModUtil.ModInfo;
 import ru.bclib.util.Pair;
 import ru.bclib.util.PathUtil;
-import ru.bclib.util.ModUtil.ModInfo;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/ru/bclib/api/datafixer/DataFixerAPI.java b/src/main/java/ru/bclib/api/datafixer/DataFixerAPI.java
index c0ef019c..4e03d1e1 100644
--- a/src/main/java/ru/bclib/api/datafixer/DataFixerAPI.java
+++ b/src/main/java/ru/bclib/api/datafixer/DataFixerAPI.java
@@ -32,12 +32,9 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * API to manage Patches that need to get applied to a world
diff --git a/src/main/java/ru/bclib/mixin/common/RecipeManagerMixin.java b/src/main/java/ru/bclib/mixin/common/RecipeManagerMixin.java
index 575a08d7..f398ef64 100644
--- a/src/main/java/ru/bclib/mixin/common/RecipeManagerMixin.java
+++ b/src/main/java/ru/bclib/mixin/common/RecipeManagerMixin.java
@@ -1,10 +1,7 @@
 package ru.bclib.mixin.common;
 
-import com.google.gson.JsonElement;
 import net.minecraft.Util;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.Container;
 import net.minecraft.world.item.crafting.Recipe;
 import net.minecraft.world.item.crafting.RecipeManager;
@@ -13,10 +10,6 @@ import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import ru.bclib.recipes.BCLRecipeManager;
 
 import java.util.ArrayList;
 import java.util.Collection;