diff --git a/src/main/java/ru/betterend/mixin/common/BiomeMixin.java b/src/main/java/ru/betterend/mixin/common/BiomeMixin.java
index c17c13e6..79f6c626 100644
--- a/src/main/java/ru/betterend/mixin/common/BiomeMixin.java
+++ b/src/main/java/ru/betterend/mixin/common/BiomeMixin.java
@@ -6,9 +6,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.registry.Registry;
 import net.minecraft.world.ChunkRegion;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.biome.GenerationSettings;
@@ -16,7 +14,6 @@ import net.minecraft.world.gen.ChunkRandom;
 import net.minecraft.world.gen.StructureAccessor;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 
-import ru.betterend.BetterEnd;
 import ru.betterend.registry.FeatureRegistry;
 
 @Mixin(Biome.class)
@@ -31,9 +28,8 @@ public abstract class BiomeMixin {
 	@Inject(method = "generateFeatureStep", at = @At("HEAD"))
 	public void generateFeatureStep(StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, ChunkRegion region, long populationSeed, ChunkRandom random, BlockPos pos, CallbackInfo cinfo) {
 		if (!injected) {
-			Identifier biomeId = region.toServerWorld().getRegistryManager().get(Registry.BIOME_KEY).getId(Biome.class.cast(this));
-			if (biomeId != null && !biomeId.getNamespace().equals(BetterEnd.MOD_ID) && category.equals(Biome.Category.THEEND)) {
-				FeatureRegistry.registerGlobals(this.generationSettings.getFeatures());
+			if (category.equals(Biome.Category.THEEND)) {
+				FeatureRegistry.registerGlobals(generationSettings.getFeatures());
 			}
 			this.injected = true;
 		}
diff --git a/src/main/java/ru/betterend/registry/FeatureRegistry.java b/src/main/java/ru/betterend/registry/FeatureRegistry.java
index 016bdd92..449f0499 100644
--- a/src/main/java/ru/betterend/registry/FeatureRegistry.java
+++ b/src/main/java/ru/betterend/registry/FeatureRegistry.java
@@ -20,7 +20,7 @@ import ru.betterend.world.features.VineFeature;
 
 public class FeatureRegistry {
 	
-	public final static List<EndFeature> globalFeatures = Lists.newArrayList();
+	private final static List<EndFeature> globalFeatures = Lists.newArrayList();
 	
 	// Trees //
 	public static final EndFeature MOSSY_GLOWSHROOM = new EndFeature("mossy_glowshroom", new MossyGlowshroomFeature(), 3);
diff --git a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java
index bcd8f05c..1a0979ff 100644
--- a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java
+++ b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java
@@ -18,9 +18,7 @@ public class BiomeChorusForest extends EndBiome {
 				.setParticles(ParticleTypes.PORTAL, 0.01F)
 				.setLoop(SoundRegistry.AMBIENT_CHORUS_FOREST)
 				.setMusic(SoundRegistry.MUSIC_CHORUS_FOREST)
-				.addFeature(FeatureRegistry.ENDER_ORE)
 				.addFeature(FeatureRegistry.VIOLECITE_LAYER)
-				.addFeature(FeatureRegistry.FLAVOLITE_LAYER)
 				.addFeature(FeatureRegistry.RARE_END_LAKE)
 				.addFeature(FeatureRegistry.PYTHADENDRON_TREE)
 				.addFeature(FeatureRegistry.PYTHADENDRON_BUSH)
diff --git a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java
index af8f5b95..bfdbd730 100644
--- a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java
+++ b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java
@@ -20,8 +20,6 @@ public class BiomeFoggyMushroomland extends EndBiome {
 				.setLoop(SoundRegistry.AMBIENT_FOGGY_MUSHROOMLAND)
 				.setMusic(SoundRegistry.MUSIC_FOGGY_MUSHROOMLAND)
 				.addStructureFeature(StructureRegistry.GIANT_MOSSY_GLOWSHROOM)
-				.addFeature(FeatureRegistry.ENDER_ORE)
-				.addFeature(FeatureRegistry.FLAVOLITE_LAYER)
 				.addFeature(FeatureRegistry.END_LAKE)
 				.addFeature(FeatureRegistry.MOSSY_GLOWSHROOM)
 				.addFeature(FeatureRegistry.BLUE_VINE)