diff --git a/mods/CORE/flowlib/init.lua b/mods/CORE/flowlib/init.lua
index 006981b89..2d26f7418 100644
--- a/mods/CORE/flowlib/init.lua
+++ b/mods/CORE/flowlib/init.lua
@@ -258,7 +258,6 @@ local function get_liquid_height(pos, pos_offset)
 	else
 		pos_origin = pos
 	end
-	minetest.debug("pos_origin:", pos_origin)
 	local corner_heights = get_liquid_corner_heights(pos_origin)
 	if corner_heights == nil then return end
 	-- order: -+ ++ +- --
@@ -266,7 +265,6 @@ local function get_liquid_height(pos, pos_offset)
 	local height_centre, height_x, height_z
 	if pos_offset.x + pos_offset.z > 0 then
 		-- first triangle
-		minetest.debug(dump(pos_offset))
 		pos_offset = vector.subtract({x=0.5, y=0, z=0.5}, pos_offset)
 		height_centre = corner_heights[2]
 		height_x = corner_heights[1]
diff --git a/mods/ENVIRONMENT/mcl_weather/rain.lua b/mods/ENVIRONMENT/mcl_weather/rain.lua
index 00dc2f6eb..a6845538d 100644
--- a/mods/ENVIRONMENT/mcl_weather/rain.lua
+++ b/mods/ENVIRONMENT/mcl_weather/rain.lua
@@ -175,7 +175,7 @@ function mcl_weather.rain.make_weather()
 
 	for _, player in pairs(get_connected_players()) do
 		local pos=player:get_pos()
-		if mcl_weather.is_underwater(player) or not mcl_weather.has_rain(pos) then
+		if mcl_player.is_head_in_water(player) or not mcl_weather.has_rain(pos) then
 			mcl_weather.rain.remove_sound(player)
 			mcl_weather.remove_spawners_player(player)
 			if mcl_worlds.has_weather(pos) then
diff --git a/mods/ENVIRONMENT/mcl_weather/skycolor.lua b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
index 065d21770..e35d55997 100644
--- a/mods/ENVIRONMENT/mcl_weather/skycolor.lua
+++ b/mods/ENVIRONMENT/mcl_weather/skycolor.lua
@@ -154,6 +154,7 @@ 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("updating sky color for liquid:", 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/ENVIRONMENT/mcl_weather/weather_core.lua b/mods/ENVIRONMENT/mcl_weather/weather_core.lua
index 32d8db4df..8849e2fd9 100644
--- a/mods/ENVIRONMENT/mcl_weather/weather_core.lua
+++ b/mods/ENVIRONMENT/mcl_weather/weather_core.lua
@@ -108,21 +108,6 @@ function mcl_weather.is_outdoor(pos)
 	return false
 end
 
--- checks if player is undewater. This is needed in order to
--- turn off weather particles generation.
-function mcl_weather.is_underwater(player)
-	local ppos = player:get_pos()
-	local offset = player:get_eye_offset()
-	local player_eye_pos = {x = ppos.x + offset.x,
-				y = ppos.y + offset.y + 1.5,
-				z = ppos.z + offset.z}
-	local node_level = minetest.get_node_level(player_eye_pos)
-	if node_level == 8 or node_level == 7 then
-		return true
-	end
-	return false
-end
-
 local t, wci = 0, mcl_weather.check_interval
 
 minetest.register_globalstep(function(dtime)
diff --git a/mods/PLAYER/mcl_playerinfo/init.lua b/mods/PLAYER/mcl_playerinfo/init.lua
index f4b53db3d..c237727db 100644
--- a/mods/PLAYER/mcl_playerinfo/init.lua
+++ b/mods/PLAYER/mcl_playerinfo/init.lua
@@ -91,7 +91,7 @@ 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
 	infotable.head_submerged_in = get_head_submerged_node(part_pos)
-	minetest.debug("player " .. player:get_player_name() .. " has head submerged in:", infotable.head_submerged_in)
+	minetest.debug("Head in:", infotable.head_submerged_in)
 
 	part_pos = get_playerpart_pos("head_top", player_pos, collisionbox, eye_height)
 	infotable.node_head_top = node_ok(part_pos).name
@@ -105,13 +105,6 @@ local function get_player_nodes(player)
 	return infotable
 end
 
-minetest.register_entity("mcl_playerinfo:debug_marker", { initial_properties = {
-	visual = "sprite",
-	textures = {"mcl_crimson_warped_fence_top.png"},
-	pointable = false,
-	visual_size = {x = 0.1, y = 0.1, z = 0.1},
-}})
-
 
 minetest.register_globalstep(function(dtime)