diff --git a/mods/ctf/ctf_classes/medic.lua b/mods/ctf/ctf_classes/medic.lua
index 5bb2287..de07c13 100644
--- a/mods/ctf/ctf_classes/medic.lua
+++ b/mods/ctf/ctf_classes/medic.lua
@@ -150,7 +150,6 @@ local function isdiggable(name)
 		name:find("glass" ) or name:find("ice"  ) or
 		name:find("snow"  )
 	)
-	or name:find("stairs:")
 end
 
 local function paxel_stop(pname, reason)
@@ -166,7 +165,7 @@ end
 local function remove_pillar(pos, pname)
 	local name = minetest.get_node(pos).name
 
-	if name:find("default") or name:find("stairs") and isdiggable(name) then
+	if name:find("default") and isdiggable(name) then
 		local player = minetest.get_player_by_name(pname)
 
 		minetest.dig_node(pos)
diff --git a/mods/ctf/ctf_leave_message/init.lua b/mods/ctf/ctf_leave_message/init.lua
deleted file mode 100644
index c2b185d..0000000
--- a/mods/ctf/ctf_leave_message/init.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-function minetest.send_leave_message(player_name, timed_out)
-	local player = ctf.player(player_name)
-	local tcolor = ctf_colors.get_color(player).css
-
-	local announcement = "*** " ..  minetest.colorize(tcolor, player_name) .. " left the game."
-	if timed_out then
-		announcement = announcement .. " (timed out)"
-	end
-	minetest.chat_send_all(announcement)
-end
diff --git a/mods/ctf/ctf_leave_message/mod.conf b/mods/ctf/ctf_leave_message/mod.conf
deleted file mode 100644
index 87ca448..0000000
--- a/mods/ctf/ctf_leave_message/mod.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-name = ctf_leave_message
-depends = ctf, ctf_colors
-description = Colorizes leaving messages
diff --git a/mods/ctf/ctf_map/ctf_map_core/maps b/mods/ctf/ctf_map/ctf_map_core/maps
index 6afcf12..fa7fa3e 160000
--- a/mods/ctf/ctf_map/ctf_map_core/maps
+++ b/mods/ctf/ctf_map/ctf_map_core/maps
@@ -1 +1 @@
-Subproject commit 6afcf12e1ca22873fc4066b242f57b8398131745
+Subproject commit fa7fa3e8f80dd82d6e98766581269817325e546b