diff --git a/mods/ITEMS/mcl_flowers/init.lua b/mods/ITEMS/mcl_flowers/init.lua
index 3b0ccc4c98..035f589f6c 100644
--- a/mods/ITEMS/mcl_flowers/init.lua
+++ b/mods/ITEMS/mcl_flowers/init.lua
@@ -3,12 +3,6 @@
 local init = os.clock()
 flower_tmp={}
 
-
--- Map Generation
-dofile(minetest.get_modpath("mcl_flowers").."/mapgen.lua")
-
-
-
 -------------------------------
 --- Fleur Simple (une case) ---
 -------------------------------
diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index fc06e4589b..98523c10e8 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -246,5 +246,8 @@ if mg_name ~= "v6" and mg_name ~= "flat" then
 	register_decorations()
 elseif mg_name == "flat" then
 	-- Implementation of Minecraft's Superflat mapgen, classic style
+	minetest.clear_registered_biomes()
+	minetest.clear_registered_decorations()
+	minetest.clear_registered_schematics()
 	register_classic_superflat_biome()
 end
diff --git a/mods/MAPGEN/mcl_mapgen_plants/depends.txt b/mods/MAPGEN/mcl_mapgen_plants/depends.txt
new file mode 100644
index 0000000000..a7031ce8fe
--- /dev/null
+++ b/mods/MAPGEN/mcl_mapgen_plants/depends.txt
@@ -0,0 +1,2 @@
+mcl_core
+mcl_flowers
diff --git a/mods/ITEMS/mcl_flowers/mapgen.lua b/mods/MAPGEN/mcl_mapgen_plants/init.lua
similarity index 100%
rename from mods/ITEMS/mcl_flowers/mapgen.lua
rename to mods/MAPGEN/mcl_mapgen_plants/init.lua