diff --git a/mods/default/legacy.lua b/mods/default/legacy.lua
index 76fcc8e..9d71d16 100644
--- a/mods/default/legacy.lua
+++ b/mods/default/legacy.lua
@@ -18,7 +18,6 @@ end
 -- Liquids
 WATER_ALPHA = minetest.registered_nodes["default:water_source"].alpha
 WATER_VISC = minetest.registered_nodes["default:water_source"].liquid_viscosity
-LAVA_VISC = minetest.registered_nodes["default:lava_source"].liquid_viscosity
 LIGHT_MAX = default.LIGHT_MAX
 
 -- Formspecs
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index f813c99..5beb065 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -9,7 +9,7 @@ minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
 minetest.register_alias("mapgen_sand", "default:sand")
 minetest.register_alias("mapgen_water_source", "default:water_source")
 minetest.register_alias("mapgen_river_water_source", "default:river_water_source")
-minetest.register_alias("mapgen_lava_source", "default:lava_source")
+minetest.register_alias("mapgen_lava_source", "air")
 minetest.register_alias("mapgen_gravel", "default:gravel")
 minetest.register_alias("mapgen_desert_stone", "default:desert_stone")
 minetest.register_alias("mapgen_desert_sand", "default:desert_sand")
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 292f8bc..a5c8737 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -965,7 +965,7 @@ minetest.register_node("default:river_water_flowing", {
 
 
 
-minetest.register_node("default:lava_source", {
+--[[minetest.register_node("default:lava_source", {
 	description = "Lava Source",
 	inventory_image = minetest.inventorycube("default_lava.png"),
 	drawtype = "liquid",
@@ -1057,7 +1057,7 @@ minetest.register_node("default:lava_flowing", {
 	damage_per_second = 4 * 2,
 	post_effect_color = {a=192, r=255, g=64, b=0},
 	groups = {lava=3, liquid=2, hot=3, igniter=1, not_in_creative_inventory=1},
-})
+})]]
 
 --
 -- Tools / "Advanced" crafting / Non-"natural"
diff --git a/mods/fire/README.txt b/mods/fire/README.txt
deleted file mode 100644
index fdbce15..0000000
--- a/mods/fire/README.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Minetest 0.4 mod: fire
-======================
-
-License of source code:
------------------------
-Copyright (C) 2012 Perttu Ahola (celeron55) <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-http://www.gnu.org/licenses/lgpl-2.1.html
-
-License of media (textures and sounds)
---------------------------------------
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
-http://creativecommons.org/licenses/by-sa/3.0/
-
-Authors of media files
------------------------
-Everything not listed in here:
-Copyright (C) 2012 Perttu Ahola (celeron55) <celeron55@gmail.com>
-
-fire_small.ogg sampled from:
-  http://www.freesound.org/people/dobroide/sounds/4211/
-
-fire_large.ogg sampled from:
-  http://www.freesound.org/people/Dynamicell/sounds/17548/
-
-fire_basic_flame_animated.png:
-  Muadtralk
diff --git a/mods/fire/init.lua b/mods/fire/init.lua
deleted file mode 100644
index 20b1dd2..0000000
--- a/mods/fire/init.lua
+++ /dev/null
@@ -1,189 +0,0 @@
--- minetest/fire/init.lua
-
-fire = {}
-
-minetest.register_node("fire:basic_flame", {
-	description = "Fire",
-	drawtype = "firelike",
-	tiles = {{
-		name="fire_basic_flame_animated.png",
-		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1},
-	}},
-	inventory_image = "fire_basic_flame.png",
-	light_source = 14,
-	groups = {igniter=2,dig_immediate=3},
-	drop = '',
-	walkable = false,
-	buildable_to = true,
-	damage_per_second = 4,
-
-	on_construct = function(pos)
-		minetest.after(0, fire.on_flame_add_at, pos)
-	end,
-
-	on_destruct = function(pos)
-		minetest.after(0, fire.on_flame_remove_at, pos)
-	end,
-
-	-- unaffected by explosions
-	on_blast = function() end,
-})
-
-fire.D = 6
--- key: position hash of low corner of area
--- value: {handle=sound handle, name=sound name}
-fire.sounds = {}
-
-function fire.get_area_p0p1(pos)
-	local p0 = {
-		x=math.floor(pos.x/fire.D)*fire.D,
-		y=math.floor(pos.y/fire.D)*fire.D,
-		z=math.floor(pos.z/fire.D)*fire.D,
-	}
-	local p1 = {
-		x=p0.x+fire.D-1,
-		y=p0.y+fire.D-1,
-		z=p0.z+fire.D-1
-	}
-	return p0, p1
-end
-
-function fire.update_sounds_around(pos)
-	local p0, p1 = fire.get_area_p0p1(pos)
-	local cp = {x=(p0.x+p1.x)/2, y=(p0.y+p1.y)/2, z=(p0.z+p1.z)/2}
-	local flames_p = minetest.find_nodes_in_area(p0, p1, {"fire:basic_flame"})
-	--print("number of flames at "..minetest.pos_to_string(p0).."/"
-	--		..minetest.pos_to_string(p1)..": "..#flames_p)
-	local should_have_sound = (#flames_p > 0)
-	local wanted_sound = nil
-	if #flames_p >= 9 then
-		wanted_sound = {name="fire_large", gain=1.5}
-	elseif #flames_p > 0 then
-		wanted_sound = {name="fire_small", gain=1.5}
-	end
-	local p0_hash = minetest.hash_node_position(p0)
-	local sound = fire.sounds[p0_hash]
-	if not sound then
-		if should_have_sound then
-			fire.sounds[p0_hash] = {
-				handle = minetest.sound_play(wanted_sound, {pos=cp, max_hear_distance = 16, loop=true}),
-				name = wanted_sound.name,
-			}
-		end
-	else
-		if not wanted_sound then
-			minetest.sound_stop(sound.handle)
-			fire.sounds[p0_hash] = nil
-		elseif sound.name ~= wanted_sound.name then
-			minetest.sound_stop(sound.handle)
-			fire.sounds[p0_hash] = {
-				handle = minetest.sound_play(wanted_sound, {pos=cp, max_hear_distance = 16, loop=true}),
-				name = wanted_sound.name,
-			}
-		end
-	end
-end
-
-function fire.on_flame_add_at(pos)
-	fire.update_sounds_around(pos)
-end
-
-function fire.on_flame_remove_at(pos)
-	fire.update_sounds_around(pos)
-end
-
-function fire.find_pos_for_flame_around(pos)
-	return minetest.find_node_near(pos, 1, {"air"})
-end
-
-function fire.flame_should_extinguish(pos)
-	if minetest.setting_getbool("disable_fire") then return true end
-	--return minetest.find_node_near(pos, 1, {"group:puts_out_fire"})
-	local p0 = {x=pos.x-2, y=pos.y, z=pos.z-2}
-	local p1 = {x=pos.x+2, y=pos.y, z=pos.z+2}
-	local ps = minetest.find_nodes_in_area(p0, p1, {"group:puts_out_fire"})
-	return (#ps ~= 0)
-end
-
--- Ignite neighboring nodes
-minetest.register_abm({
-	nodenames = {"group:flammable"},
-	neighbors = {"group:igniter"},
-	interval = 5,
-	chance = 2,
-	action = function(p0, node, _, _)
-		-- If there is water or stuff like that around flame, don't ignite
-		if fire.flame_should_extinguish(p0) then
-			return
-		end
-		local p = fire.find_pos_for_flame_around(p0)
-		if p then
-			minetest.set_node(p, {name="fire:basic_flame"})
-		end
-	end,
-})
-
--- Rarely ignite things from far
-minetest.register_abm({
-	nodenames = {"group:igniter"},
-	neighbors = {"air"},
-	interval = 5,
-	chance = 10,
-	action = function(p0, node, _, _)
-		local reg = minetest.registered_nodes[node.name]
-		if not reg or not reg.groups.igniter or reg.groups.igniter < 2 then
-			return
-		end
-		local d = reg.groups.igniter
-		local p = minetest.find_node_near(p0, d, {"group:flammable"})
-		if p then
-			-- If there is water or stuff like that around flame, don't ignite
-			if fire.flame_should_extinguish(p) then
-				return
-			end
-			local p2 = fire.find_pos_for_flame_around(p)
-			if p2 then
-				minetest.set_node(p2, {name="fire:basic_flame"})
-			end
-		end
-	end,
-})
-
--- Remove flammable nodes and flame
-minetest.register_abm({
-	nodenames = {"fire:basic_flame"},
-	interval = 3,
-	chance = 2,
-	action = function(p0, node, _, _)
-		-- If there is water or stuff like that around flame, remove flame
-		if fire.flame_should_extinguish(p0) then
-			minetest.remove_node(p0)
-			return
-		end
-		-- Make the following things rarer
-		if math.random(1,3) == 1 then
-			return
-		end
-		-- If there are no flammable nodes around flame, remove flame
-		if not minetest.find_node_near(p0, 1, {"group:flammable"}) then
-			minetest.remove_node(p0)
-			return
-		end
-		if math.random(1,4) == 1 then
-			-- remove a flammable node around flame
-			local p = minetest.find_node_near(p0, 1, {"group:flammable"})
-			if p then
-				-- If there is water or stuff like that around flame, don't remove
-				if fire.flame_should_extinguish(p0) then
-					return
-				end
-				minetest.remove_node(p)
-				nodeupdate(p)
-			end
-		else
-			-- remove flame
-			minetest.remove_node(p0)
-		end
-	end,
-})
-
diff --git a/mods/fire/sounds/fire_large.ogg b/mods/fire/sounds/fire_large.ogg
deleted file mode 100644
index fe78e62..0000000
Binary files a/mods/fire/sounds/fire_large.ogg and /dev/null differ
diff --git a/mods/fire/sounds/fire_small.ogg b/mods/fire/sounds/fire_small.ogg
deleted file mode 100644
index 5aac595..0000000
Binary files a/mods/fire/sounds/fire_small.ogg and /dev/null differ
diff --git a/mods/fire/textures/fire_basic_flame.png b/mods/fire/textures/fire_basic_flame.png
deleted file mode 100644
index 1da0702..0000000
Binary files a/mods/fire/textures/fire_basic_flame.png and /dev/null differ
diff --git a/mods/fire/textures/fire_basic_flame_animated.png b/mods/fire/textures/fire_basic_flame_animated.png
deleted file mode 100644
index 1cdd9fd..0000000
Binary files a/mods/fire/textures/fire_basic_flame_animated.png and /dev/null differ