diff --git a/nodes.lua b/nodes.lua
index 201b241..d8e4212 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -17,7 +17,6 @@ minetest.register_node(":default:cloud", {
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_defaults(),
 	on_drop = maptools.drop_msg
-	end,
 })
 
 -- Nodes
@@ -33,7 +32,6 @@ minetest.register_node("maptools:black", {
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_stone_defaults(),
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:white", {
@@ -46,7 +44,6 @@ minetest.register_node("maptools:white", {
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_stone_defaults(),
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:playerclip", {
@@ -61,7 +58,6 @@ minetest.register_node("maptools:playerclip", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:fake_walkable", {
@@ -83,7 +79,6 @@ minetest.register_node("maptools:fake_walkable", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:fullclip", {
@@ -97,7 +92,6 @@ minetest.register_node("maptools:fullclip", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:fake_walkable_pointable", {
@@ -118,7 +112,6 @@ minetest.register_node("maptools:fake_walkable_pointable", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:ignore_like", {
@@ -132,7 +125,6 @@ minetest.register_node("maptools:ignore_like", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:ignore_like_no_clip", {
@@ -147,7 +139,6 @@ minetest.register_node("maptools:ignore_like_no_clip", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 
@@ -163,7 +154,6 @@ minetest.register_node("maptools:ignore_like_no_point", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:ignore_like_no_clip_no_point", {
@@ -179,7 +169,6 @@ minetest.register_node("maptools:ignore_like_no_clip_no_point", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:fullclip_face", {
@@ -199,7 +188,6 @@ minetest.register_node("maptools:fullclip_face", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative, fall_damage_add_percent=-100},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:playerclip_bottom", {
@@ -219,7 +207,6 @@ minetest.register_node("maptools:playerclip_bottom", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative, fall_damage_add_percent=-100},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:playerclip_top", {
@@ -239,7 +226,6 @@ minetest.register_node("maptools:playerclip_top", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative, fall_damage_add_percent=-100},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 for pusher_num=1,10,1 do
@@ -260,7 +246,6 @@ minetest.register_node("maptools:pusher_" .. pusher_num, {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative, fall_damage_add_percent=-100, bouncy=pusher_num*100},
 	on_drop = maptools.drop_msg
-	end,
 })
 end
 
@@ -278,7 +263,6 @@ minetest.register_node("maptools:lightbulb", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:nobuild", {
@@ -293,10 +277,7 @@ minetest.register_node("maptools:nobuild", {
 	sunlight_propagates = true,
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = function(itemstack, dropper, pos)
-		maptools.msg(dropper)
-		return
-	end,
+	on_drop = maptools.drop_msg
 })
 
 minetest.register_node("maptools:nointeract", {
@@ -311,7 +292,6 @@ minetest.register_node("maptools:nointeract", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:climb", {
@@ -328,7 +308,6 @@ minetest.register_node("maptools:climb", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 for damage_num=1,5,1 do
@@ -346,7 +325,6 @@ minetest.register_node("maptools:damage_" .. damage_num, {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 end
 
@@ -364,7 +342,6 @@ minetest.register_node("maptools:kill", {
 	drop = "",
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:smoke", {
@@ -379,7 +356,6 @@ minetest.register_node("maptools:smoke", {
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	post_effect_color = {a=192, r=96, g=96, b=96},
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:ladder", {
@@ -401,7 +377,6 @@ minetest.register_node("maptools:ladder", {
 	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_wood_defaults(),
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:permanent_fire", {
@@ -422,7 +397,6 @@ minetest.register_node("maptools:permanent_fire", {
 	walkable = false,
 	damage_per_second = 4,
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:fake_fire", {
@@ -442,7 +416,6 @@ minetest.register_node("maptools:fake_fire", {
 	sunlight_propagates = true,
 	walkable = false,
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:igniter", {
@@ -459,7 +432,6 @@ minetest.register_node("maptools:igniter", {
 	pointable = false,
 	walkable = false,
 	on_drop = maptools.drop_msg
-	end,
 })
 
 minetest.register_node("maptools:superapple", {
@@ -481,5 +453,4 @@ minetest.register_node("maptools:superapple", {
 	on_use = minetest.item_eat(20),
 	sounds = default.node_sound_defaults(),
 	on_drop = maptools.drop_msg
-	end,
 })