diff --git a/mods/CORE/flowlib/init.lua b/mods/CORE/flowlib/init.lua
index fe13a8d50..fa1b61631 100644
--- a/mods/CORE/flowlib/init.lua
+++ b/mods/CORE/flowlib/init.lua
@@ -278,7 +278,6 @@ local function get_liquid_height(pos_origin, pos_offset)
 	local corner_heights = get_liquid_corner_heights(pos_origin)
 	if corner_heights == nil then return end
 	-- order: -+ ++ +- --
-	minetest.debug("offsets: ", pos_offset.x, pos_offset.z)
 	if pos_offset.x + pos_offset.z > 0 then
 		-- first triangle
 		pos_offset = {x=0.5, y=0, z=0.5} - pos_offset
@@ -294,7 +293,6 @@ local function get_liquid_height(pos_origin, pos_offset)
 		local height_x = corner_heights[3].y
 		local height_z = corner_heights[1].y
 		local height = height_centre + (height_x - height_centre) * pos_offset.x + (height_z - height_centre) * pos_offset.z
-		minetest.debug(height_centre, height_x, height_z, pos_offset.x, pos_offset.z, height)
 		return height + pos_origin.y
 	end
 end
@@ -306,7 +304,6 @@ local function liquid_at_exact(pos, pos_offset)
 	end
 	local liq_height = get_liquid_height(pos_origin, pos_offset)
 	if liq_height  == nil then return nil end
-	minetest.debug("lae", d, pos_offset.y, pos_origin.y, liq_height)
 	if liq_height > (pos_offset.y + pos_origin.y) then
 		return minetest.get_node(pos_origin).name
 	else
diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
index de0ad2797..065d21770 100644
--- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua
+++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
@@ -154,7 +154,6 @@ mcl_weather.skycolor = {
 			local has_weather = (mcl_worlds.has_weather(pos) and (mcl_weather.state == "snow" or mcl_weather.state =="rain" or mcl_weather.state == "thunder") and mcl_weather.has_snow(pos)) or ((mcl_weather.state =="rain" or mcl_weather.state == "thunder") and mcl_weather.has_rain(pos))
 			local name = player:get_player_name()
 			local head_liquid = mcl_playerinfo[name].head_submerged_in
-			minetest.debug("Skycolor update:", head_liquid)
 			if head_liquid and minetest.get_item_group(head_liquid, "water") > 0 then
 				local biome_index = minetest.get_biome_data(player:get_pos()).biome
 				local biome_name = minetest.get_biome_name(biome_index)
diff --git a/mods/PLAYER/mcl_playerinfo/init.lua b/mods/PLAYER/mcl_playerinfo/init.lua
index df82a86e8..0a3d70c93 100644
--- a/mods/PLAYER/mcl_playerinfo/init.lua
+++ b/mods/PLAYER/mcl_playerinfo/init.lua
@@ -62,18 +62,13 @@ local function get_player_nodes(player)
 
 	part_pos = get_playerpart_pos("head", player_pos, collisionbox, eye_height)
 	infotable.node_head = node_ok(part_pos).name
-	minetest.debug("head in water:", flowlib.liquid_at_exact(part_pos))
+	minetest.debug("player " .. player:get_player_name() .. " has head submerged in:", flowlib.liquid_at_exact(part_pos))
 	infotable.head_submerged_in = flowlib.liquid_at_exact(part_pos)
 
-	part_pos = get_playerpart_pos("head_top", player_pos, collisionbox, eye_height)
-	infotable.node_head_top = node_ok(part_pos).name
 
-	part_pos = get_playerpart_pos("feet", player_pos, collisionbox, eye_height)
 
 	local lch = flowlib.get_liquid_corner_heights(part_pos)
 	local lh = flowlib.get_liquid_height(vector.round(part_pos), part_pos - vector.round(part_pos))
-	--infotable.debug_markers = mcl_playerinfo[player:get_player_name()].debug_markers
-	--minetest.debug("Debug markers: ", infotable.debug_markers)
 	if lch then
 		minetest.debug("current liquid corner heights: ", "-+", lch[1].y , "++", lch[2].y , "+-", lch[3].y , "--", lch[4].y)
 	end
@@ -83,15 +78,19 @@ local function get_player_nodes(player)
 		end
 	end
 	for i=1,4 do
-		--if infotable.debug_markers[i] ~= nil then infotable.debug_markers[i]:remove() end
 		if lch then
 			minetest.add_entity(vector.add(vector.round(part_pos), vector.divide(lch[i], 1)), "mcl_playerinfo:debug_marker")
 		end
 		if lh then
 			minetest.add_entity({x=part_pos.x, y=lh, z=part_pos.z}, "mcl_playerinfo:debug_marker")
 		end
+		minetest.add_entity(part_pos, "mcl_playerinfo:debug_marker")
 	end
 
+	part_pos = get_playerpart_pos("head_top", player_pos, collisionbox, eye_height)
+	infotable.node_head_top = node_ok(part_pos).name
+
+	part_pos = get_playerpart_pos("feet", player_pos, collisionbox, eye_height)
 	infotable.node_feet = node_ok(part_pos).name
 
 	part_pos = get_playerpart_pos("stand_below", player_pos, collisionbox, eye_height)
@@ -125,7 +124,6 @@ minetest.register_globalstep(function(dtime)
 	for _,player in pairs(minetest.get_connected_players()) do
 
 		local name = player:get_player_name()
-		minetest.debug("mcl_playerinfo", name)
 		mcl_playerinfo[name] = get_player_nodes(player)
 	end
 
@@ -147,8 +145,6 @@ minetest.register_on_joinplayer(function(player)
 		ndef_stand_below = "",
 		ndef_head_top = "",
 	}
-	mcl_playerinfo[name].debug_markers = {}
-	minetest.debug("Player info cleared")
 
 end)