diff --git a/src/main/java/ru/betterend/BetterEnd.java b/src/main/java/ru/betterend/BetterEnd.java
index e5523188..98d03696 100644
--- a/src/main/java/ru/betterend/BetterEnd.java
+++ b/src/main/java/ru/betterend/BetterEnd.java
@@ -1,28 +1,8 @@
 package ru.betterend;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.levelgen.placement.PlacedFeature;
-import org.apache.commons.lang3.mutable.MutableInt;
 import ru.bclib.api.WorldDataAPI;
 import ru.bclib.api.biomes.BiomeAPI;
 import ru.bclib.util.Logger;
@@ -87,43 +67,10 @@ public class BetterEnd implements ModInitializer {
 		}
 
 		BiomeAPI.registerEndBiomeModification((biomeID, biome) -> {
-			//EndStructures.addBiomeStructures(biomeID, biome);
-			//TODO: 1.18 disabled to test feature-sorting of BE biomes
-			//EndFeatures.addBiomeFeatures(biomeID, biome);
+			EndStructures.addBiomeStructures(biomeID, biome);
+			EndFeatures.addBiomeFeatures(biomeID, biome);
 		});
-	List<Biome> biomes = new LinkedList<>();
-		biomes.add(net.minecraft.data.worldgen.biome.EndBiomes.endBarrens());
-		biomes.add(net.minecraft.data.worldgen.biome.EndBiomes.endHighlands());
-		biomes.add(net.minecraft.data.worldgen.biome.EndBiomes.endMidlands());
-		biomes.add(net.minecraft.data.worldgen.biome.EndBiomes.theEnd());
-		biomes.add(net.minecraft.data.worldgen.biome.EndBiomes.smallEndIslands());
 
-		List<Biome> lBiomes = new LinkedList<>();
-		lBiomes.add(EndBiomes.FOGGY_MUSHROOMLAND.getBiome());
-		lBiomes.add(EndBiomes.CHORUS_FOREST.getBiome());
-		lBiomes.add(EndBiomes.DUST_WASTELANDS.getBiome());
-		lBiomes.add(EndBiomes.MEGALAKE.getBiome());
-		lBiomes.add(EndBiomes.MEGALAKE_GROVE.getBiome());
-		lBiomes.add(EndBiomes.CRYSTAL_MOUNTAINS.getBiome());
-		lBiomes.add(EndBiomes.PAINTED_MOUNTAINS.getBiome());
-		lBiomes.add(EndBiomes.SHADOW_FOREST.getBiome());
-		lBiomes.add(EndBiomes.AMBER_LAND.getBiome());
-		lBiomes.add(EndBiomes.BLOSSOMING_SPIRES.getBiome());
-		lBiomes.add(EndBiomes.SULPHUR_SPRINGS.getBiome());
-		lBiomes.add(EndBiomes.UMBRELLA_JUNGLE.getBiome());
-		lBiomes.add(EndBiomes.GLOWING_GRASSLANDS.getBiome());
-		lBiomes.add(EndBiomes.DRAGON_GRAVEYARDS.getBiome());
-		lBiomes.add(EndBiomes.DRY_SHRUBLAND.getBiome());
-		lBiomes.add(EndBiomes.LANTERN_WOODS.getBiome());
-		lBiomes.add(EndBiomes.NEON_OASIS.getBiome());
-		lBiomes.add(EndBiomes.UMBRA_VALLEY.getBiome());
-
-		lBiomes.forEach(biome -> {
-			BiomeAPI.sortBiomeFeatures(biome);
-		});
-		biomes.addAll(lBiomes);
-
-		//buildFeaturesPerStep(lBiomes, true);
 	}
 	public static ResourceLocation makeID(String path) {
 		return new ResourceLocation(MOD_ID, path);