diff --git a/mods/ctf_inventory/give_inital_stuff.lua b/mods/ctf_inventory/give_initial_stuff.lua
similarity index 100%
rename from mods/ctf_inventory/give_inital_stuff.lua
rename to mods/ctf_inventory/give_initial_stuff.lua
diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index f075558..8123327 100644
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -98,27 +98,6 @@ default.cool_lava_flowing = function(pos)
 	minetest.sound_play("default_cool_lava", {pos = pos, gain = 0.25})
 end
 
-minetest.register_abm({
-	nodenames = {"default:lava_flowing"},
-	neighbors = {"group:water"},
-	interval = 1,
-	chance = 1,
-	action = function(...)
-		default.cool_lava_flowing(...)
-	end,
-})
-
-minetest.register_abm({
-	nodenames = {"default:lava_source"},
-	neighbors = {"group:water"},
-	interval = 1,
-	chance = 1,
-	action = function(...)
-		default.cool_lava_source(...)
-	end,
-})
-
-
 --
 -- Papyrus and cactus growing
 --
@@ -280,44 +259,3 @@ minetest.register_abm({
 		end
 	end
 })
-
-
---
--- Grass growing
---
-
-minetest.register_abm({
-	nodenames = {"default:dirt"},
-	interval = 2,
-	chance = 200,
-	action = function(pos, node)
-		local above = {x = pos.x, y = pos.y + 1, z = pos.z}
-		local name = minetest.get_node(above).name
-		local nodedef = minetest.registered_nodes[name]
-		if nodedef and (nodedef.sunlight_propagates or nodedef.paramtype == "light") and
-				nodedef.liquidtype == "none" and
-				(minetest.get_node_light(above) or 0) >= 13 then
-			if name == "default:snow" or name == "default:snowblock" then
-				minetest.set_node(pos, {name = "default:dirt_with_snow"})
-			else
-				minetest.set_node(pos, {name = "default:dirt_with_grass"})
-			end
-		end
-	end
-})
-
-minetest.register_abm({
-	nodenames = {"default:dirt_with_grass"},
-	interval = 2,
-	chance = 20,
-	action = function(pos, node)
-		local above = {x = pos.x, y = pos.y + 1, z = pos.z}
-		local name = minetest.get_node(above).name
-		local nodedef = minetest.registered_nodes[name]
-		if name ~= "ignore" and nodedef and not ((nodedef.sunlight_propagates or
-				nodedef.paramtype == "light") and
-				nodedef.liquidtype == "none") then
-			minetest.set_node(pos, {name = "default:dirt"})
-		end
-	end
-})
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 051af66..5d26273 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -317,32 +317,6 @@ end
 
 
 function default.register_mgv6_decorations()
-
-	-- Papyrus
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 8,
-		noise_params = {
-			offset = -0.3,
-			scale = 0.7,
-			spread = {x = 100, y = 100, z = 100},
-			seed = 354,
-			octaves = 3,
-			persist = 0.7
-		},
-		y_min = 1,
-		y_max = 1,
-		decoration = "default:papyrus",
-		height = 2,
-	        height_max = 4,
-		spawn_by = "default:water_source",
-		num_spawn_by = 1,
-	})
-
-	-- Cacti
-
 	minetest.register_decoration({
 		deco_type = "simple",
 		place_on = {"default:desert_sand"},
@@ -361,46 +335,6 @@ function default.register_mgv6_decorations()
 		height = 3,
 	        height_max = 4,
 	})
-
-	-- Grasses
-
-	for length = 1, 5 do
-		minetest.register_decoration({
-			deco_type = "simple",
-			place_on = {"default:dirt_with_grass"},
-			sidelen = 16,
-			noise_params = {
-				offset = 0,
-				scale = 0.007,
-				spread = {x = 100, y = 100, z = 100},
-				seed = 329,
-				octaves = 3,
-				persist = 0.6
-			},
-			y_min = 1,
-			y_max = 30,
-			decoration = "default:grass_"..length,
-		})
-	end
-
-	-- Dry shrubs
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:desert_sand", "default:dirt_with_snow"},
-		sidelen = 16,
-		noise_params = {
-			offset = 0,
-			scale = 0.035,
-			spread = {x = 100, y = 100, z = 100},
-			seed = 329,
-			octaves = 3,
-			persist = 0.6
-		},
-		y_min = 1,
-		y_max = 30,
-		decoration = "default:dry_shrub",
-	})
 end
 
 
@@ -411,207 +345,6 @@ end
 
 function default.register_decorations()
 
-	-- Flowers
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.02,
-			scale = 0.03,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 436,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = -31000,
-		y_max = 31000,
-		decoration = "flowers:rose",
-	})
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.02,
-			scale = 0.03,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 19822,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = 33,
-		y_max = 31000,
-		decoration = "flowers:tulip",
-	})
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.02,
-			scale = 0.03,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 1220999,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = -31000,
-		y_max = 31000,
-		decoration = "flowers:dandelion_yellow",
-	})
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.02,
-			scale = 0.03,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 36662,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = -31000,
-		y_max = 31000,
-		decoration = "flowers:geranium",
-	})
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.02,
-			scale = 0.03,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 1133,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = -31000,
-		y_max = 31000,
-		decoration = "flowers:viola",
-	})
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.02,
-			scale = 0.03,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 73133,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = -31000,
-		y_max = 31000,
-		decoration = "flowers:dandelion_white",
-	})
-
-	-- Grasses
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = 0.04,
-			scale = 0.04,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 66440,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = -31000,
-		y_max = 31000,
-		decoration = "default:grass_1",
-	})
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = 0.02,
-			scale = 0.06,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 66440,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = -31000,
-		y_max = 31000,
-		decoration = "default:grass_2",
-	})
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = 0,
-			scale = 0.08,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 66440,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = -31000,
-		y_max = 31000,
-		decoration = "default:grass_3",
-	})
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.02,
-			scale = 0.10,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 66440,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = -31000,
-		y_max = 31000,
-		decoration = "default:grass_4",
-	})
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dirt_with_grass"},
-		sidelen = 16,
-		noise_params = {
-			offset = -0.04,
-			scale = 0.12,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 66440,
-			octaves = 3,
-			persist = 0.6
-		},
-		biomes = {"default:grassland"},
-		y_min = -31000,
-		y_max = 31000,
-		decoration = "default:grass_5",
-	})
 end
 
 
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 9d7b36e..173be4a 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -670,95 +670,6 @@ minetest.register_node("default:papyrus", {
 	end,
 })
 
-minetest.register_node("default:dry_shrub", {
-	description = "Dry Shrub",
-	drawtype = "plantlike",
-	waving = 1,
-	visual_scale = 1.0,
-	tiles = {"default_dry_shrub.png"},
-	inventory_image = "default_dry_shrub.png",
-	wield_image = "default_dry_shrub.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	buildable_to = true,
-	groups = {snappy=3,flammable=3,attached_node=1},
-	sounds = default.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-	},
-})
-
-minetest.register_node("default:junglegrass", {
-	description = "Jungle Grass",
-	drawtype = "plantlike",
-	waving = 1,
-	visual_scale = 1.3,
-	tiles = {"default_junglegrass.png"},
-	inventory_image = "default_junglegrass.png",
-	wield_image = "default_junglegrass.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	buildable_to = true,
-	groups = {snappy=3,flammable=2,flora=1,attached_node=1},
-	sounds = default.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-	},
-})
-
-minetest.register_node("default:grass_1", {
-	description = "Grass",
-	drawtype = "plantlike",
-	waving = 1,
-	tiles = {"default_grass_1.png"},
-	-- Use texture of a taller grass stage in inventory
-	inventory_image = "default_grass_3.png",
-	wield_image = "default_grass_3.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	buildable_to = true,
-	groups = {snappy=3,flammable=3,flora=1,attached_node=1},
-	sounds = default.node_sound_leaves_defaults(),
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-	},
-
-	on_place = function(itemstack, placer, pointed_thing)
-		-- place a random grass node
-		local stack = ItemStack("default:grass_"..math.random(1,5))
-		local ret = minetest.item_place(stack, placer, pointed_thing)
-		return ItemStack("default:grass_1 "..itemstack:get_count()-(1-ret:get_count()))
-	end,
-})
-
-for i=2,5 do
-	minetest.register_node("default:grass_"..i, {
-		description = "Grass",
-		drawtype = "plantlike",
-		waving = 1,
-		tiles = {"default_grass_"..i..".png"},
-		inventory_image = "default_grass_"..i..".png",
-		wield_image = "default_grass_"..i..".png",
-		paramtype = "light",
-		sunlight_propagates = true,
-		walkable = false,
-		buildable_to = true,
-		drop = "default:grass_1",
-		groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
-		sounds = default.node_sound_leaves_defaults(),
-		selection_box = {
-			type = "fixed",
-			fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-		},
-	})
-end
-
 --
 -- Liquids
 --
diff --git a/mods/default/textures/default_dry_shrub.png b/mods/default/textures/default_dry_shrub.png
deleted file mode 100644
index e8a7f27..0000000
Binary files a/mods/default/textures/default_dry_shrub.png and /dev/null differ
diff --git a/mods/default/textures/default_grass_1.png b/mods/default/textures/default_grass_1.png
deleted file mode 100644
index 5052930..0000000
Binary files a/mods/default/textures/default_grass_1.png and /dev/null differ
diff --git a/mods/default/textures/default_grass_2.png b/mods/default/textures/default_grass_2.png
deleted file mode 100644
index 9d99a6a..0000000
Binary files a/mods/default/textures/default_grass_2.png and /dev/null differ
diff --git a/mods/default/textures/default_grass_3.png b/mods/default/textures/default_grass_3.png
deleted file mode 100644
index 4833df4..0000000
Binary files a/mods/default/textures/default_grass_3.png and /dev/null differ
diff --git a/mods/default/textures/default_grass_4.png b/mods/default/textures/default_grass_4.png
deleted file mode 100644
index 1496fb1..0000000
Binary files a/mods/default/textures/default_grass_4.png and /dev/null differ
diff --git a/mods/default/textures/default_grass_5.png b/mods/default/textures/default_grass_5.png
deleted file mode 100644
index a212535..0000000
Binary files a/mods/default/textures/default_grass_5.png and /dev/null differ
diff --git a/mods/default/textures/default_junglegrass.png b/mods/default/textures/default_junglegrass.png
deleted file mode 100644
index 25abb71..0000000
Binary files a/mods/default/textures/default_junglegrass.png and /dev/null differ