diff --git a/mods/ctf/ctf_map/maps b/mods/ctf/ctf_map/maps
index b5fe93b..e3eacf7 160000
--- a/mods/ctf/ctf_map/maps
+++ b/mods/ctf/ctf_map/maps
@@ -1 +1 @@
-Subproject commit b5fe93bef674a8102887a6ace4642bcab17480f6
+Subproject commit e3eacf766a45910174560966211f15abf1e19c8e
diff --git a/mods/mtg/default/aliases.lua b/mods/mtg/default/aliases.lua
index fddfe30..7ed63ac 100644
--- a/mods/mtg/default/aliases.lua
+++ b/mods/mtg/default/aliases.lua
@@ -39,7 +39,6 @@ minetest.register_alias("locked_chest", "default:chest_locked")
 minetest.register_alias("cobble", "default:cobble")
 minetest.register_alias("mossycobble", "default:mossycobble")
 minetest.register_alias("steelblock", "default:steelblock")
-minetest.register_alias("sapling", "default:sapling")
 
 minetest.register_alias("STPick", "default:pick_stone")
 minetest.register_alias("SteelPick", "default:pick_steel")
diff --git a/mods/mtg/default/crafting.lua b/mods/mtg/default/crafting.lua
index 381d078..6cf135d 100644
--- a/mods/mtg/default/crafting.lua
+++ b/mods/mtg/default/crafting.lua
@@ -162,13 +162,6 @@ minetest.register_craft({
 })
 
 
--- Support use of group:sapling, includes default:sapling which has the same burn time
-minetest.register_craft({
-	type = "fuel",
-	recipe = "group:sapling",
-	burntime = 5,
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "default:bush_sapling",
diff --git a/mods/mtg/default/craftitems.lua b/mods/mtg/default/craftitems.lua
index ed25655..2b25f93 100644
--- a/mods/mtg/default/craftitems.lua
+++ b/mods/mtg/default/craftitems.lua
@@ -86,8 +86,3 @@ minetest.register_craftitem("default:obsidian_shard", {
 	description = "Obsidian Shard",
 	inventory_image = "default_obsidian_shard.png",
 })
-
-minetest.register_craftitem("default:flint", {
-	description = "Flint",
-	inventory_image = "default_flint.png"
-})
diff --git a/mods/mtg/default/nodes.lua b/mods/mtg/default/nodes.lua
index d16ca3e..eead166 100644
--- a/mods/mtg/default/nodes.lua
+++ b/mods/mtg/default/nodes.lua
@@ -546,19 +546,11 @@ minetest.register_node("default:silver_sand", {
 	sounds = default.node_sound_sand_defaults(),
 })
 
-
 minetest.register_node("default:gravel", {
 	description = "Gravel",
 	tiles = {"default_gravel.png"},
 	groups = {crumbly = 2},
 	sounds = default.node_sound_gravel_defaults(),
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {'default:flint'}, rarity = 16},
-			{items = {'default:gravel'}}
-		}
-	}
 })
 
 minetest.register_node("default:clay", {
@@ -671,21 +663,6 @@ minetest.register_node("default:leaves", {
 	paramtype = "light",
 	is_ground_content = false,
 	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{
-				-- player will get sapling with 1/20 chance
-				items = {'default:sapling'},
-				rarity = 20,
-			},
-			{
-				-- player will get leaves only if he get no saplings,
-				-- this is because max_items is 1
-				items = {'default:leaves'},
-			}
-		}
-	},
 	sounds = default.node_sound_leaves_defaults(),
 
 	after_place_node = default.after_place_leaves,
@@ -723,13 +700,6 @@ minetest.register_node("default:jungleleaves", {
 	paramtype = "light",
 	is_ground_content = false,
 	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {'default:junglesapling'}, rarity = 20},
-			{items = {'default:jungleleaves'}}
-		}
-	},
 	sounds = default.node_sound_leaves_defaults(),
 
 	after_place_node = default.after_place_leaves,
@@ -766,13 +736,6 @@ minetest.register_node("default:pine_needles",{
 	paramtype = "light",
 	is_ground_content = false,
 	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"default:pine_sapling"}, rarity = 20},
-			{items = {"default:pine_needles"}}
-		}
-	},
 	sounds = default.node_sound_leaves_defaults(),
 
 	after_place_node = default.after_place_leaves,
@@ -810,13 +773,6 @@ minetest.register_node("default:acacia_leaves", {
 	paramtype = "light",
 	is_ground_content = false,
 	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"default:acacia_sapling"}, rarity = 20},
-			{items = {"default:acacia_leaves"}}
-		}
-	},
 	sounds = default.node_sound_leaves_defaults(),
 
 	after_place_node = default.after_place_leaves,
@@ -852,13 +808,6 @@ minetest.register_node("default:aspen_leaves", {
 	paramtype = "light",
 	is_ground_content = false,
 	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"default:aspen_sapling"}, rarity = 20},
-			{items = {"default:aspen_leaves"}}
-		}
-	},
 	sounds = default.node_sound_leaves_defaults(),
 
 	after_place_node = default.after_place_leaves,
@@ -1324,13 +1273,6 @@ minetest.register_node("default:bush_leaves", {
 	tiles = {"default_leaves_simple.png"},
 	paramtype = "light",
 	groups = {snappy = 3, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"default:bush_sapling"}, rarity = 5},
-			{items = {"default:bush_leaves"}}
-		}
-	},
 	sounds = default.node_sound_leaves_defaults(),
 
 	after_place_node = default.after_place_leaves,
@@ -1359,13 +1301,6 @@ minetest.register_node("default:blueberry_bush_leaves", {
 	tiles = {"default_blueberry_bush_leaves.png"},
 	paramtype = "light",
 	groups = {snappy = 3, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"default:blueberry_bush_sapling"}, rarity = 5},
-			{items = {"default:blueberry_bush_leaves"}}
-		}
-	},
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -1393,13 +1328,6 @@ minetest.register_node("default:acacia_bush_leaves", {
 	tiles = {"default_acacia_leaves_simple.png"},
 	paramtype = "light",
 	groups = {snappy = 3, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"default:acacia_bush_sapling"}, rarity = 5},
-			{items = {"default:acacia_bush_leaves"}}
-		}
-	},
 	sounds = default.node_sound_leaves_defaults(),
 
 	after_place_node = default.after_place_leaves,
@@ -1429,13 +1357,6 @@ minetest.register_node("default:pine_bush_needles", {
 	tiles = {"default_pine_needles.png"},
 	paramtype = "light",
 	groups = {snappy = 3, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"default:pine_bush_sapling"}, rarity = 5},
-			{items = {"default:pine_bush_needles"}}
-		}
-	},
 	sounds = default.node_sound_leaves_defaults(),
 
 	after_place_node = default.after_place_leaves,