diff --git a/mods/unified_inventory/waypoints.lua b/mods/unified_inventory/waypoints.lua
deleted file mode 100644
index e23ef4b2..00000000
--- a/mods/unified_inventory/waypoints.lua
+++ /dev/null
@@ -1,247 +0,0 @@
-local S = minetest.get_translator("unified_inventory")
-local F = minetest.formspec_escape
-
-local hud_colors = {
-	{"#FFFFFF", 0xFFFFFF, S("White")},
-	{"#DBBB00", 0xf1d32c, S("Yellow")},
-	{"#DD0000", 0xDD0000, S("Red")},
-	{"#2cf136", 0x2cf136, S("Green")},
-	{"#2c4df1", 0x2c4df1, S("Blue")},
-}
-
-local hud_colors_max = #hud_colors
-
--- Stores temporary player data (persists until player leaves)
-local waypoints_temp = {}
-
-unified_inventory.register_page("waypoints", {
-	get_formspec = function(player)
-		local player_name = player:get_player_name()
-
-		-- build a "fake" temp entry if the server took too long
-		-- during sign-on and returned an empty entry
-		if not waypoints_temp[player_name] then waypoints_temp[player_name] = {hud = 1} end
-
-		local waypoints = datastorage.get(player_name, "waypoints")
-		local formspec = "background[0,4.5;8,4;ui_main_inventory.png]" ..
-			"image[0,0;1,1;ui_waypoints_icon.png]" ..
-			"label[1,0;" .. F(S("Waypoints")) .. "]"
-
-		-- Tabs buttons:
-		for i = 1, 5, 1 do
-			formspec = formspec ..
-				"image_button[0.0," .. 0.2 + i * 0.7 .. ";.8,.8;" ..
-				(i == waypoints.selected and "ui_blue_icon_background.png^" or "") ..
-				"ui_" .. i .. "_icon.png;" ..
-				"select_waypoint" .. i .. ";]" ..
-				"tooltip[select_waypoint" .. i .. ";"
-					.. S("Select Waypoint #@1", i).."]"
-		end
-
-		local i = waypoints.selected or 1
-		local waypoint = waypoints[i] or {}
-		local temp = waypoints_temp[player_name][i] or {}
-		local default_name = S("Waypoint @1", i)
-
-		-- Main buttons:
-		formspec = formspec ..
-			"image_button[4.5,3.7;.8,.8;"..
-			"ui_waypoint_set_icon.png;"..
-			"set_waypoint"..i..";]"..
-			"tooltip[set_waypoint" .. i .. ";"
-				.. F(S("Set waypoint to current location")).."]"
-
-		formspec = formspec ..
-			"image_button[5.2,3.7;.8,.8;"..
-			(waypoint.active and "ui_on_icon.png" or "ui_off_icon.png")..";"..
-			"toggle_waypoint"..i..";]"..
-			"tooltip[toggle_waypoint" .. i .. ";"
-				.. F(S("Make waypoint @1",
-					waypoint.active and S("invisible") or S("visible"))).."]"
-
-		formspec = formspec ..
-			"image_button[5.9,3.7;.8,.8;"..
-			(waypoint.display_pos and "ui_green_icon_background.png" or "ui_red_icon_background.png").."^ui_xyz_icon.png;"..
-			"toggle_display_pos" .. i .. ";]"..
-			"tooltip[toggle_display_pos" .. i .. ";"
-				.. F(S("@1 display of waypoint coordinates",
-					waypoint.display_pos and S("Disable") or S("Enable"))) .."]"
-
-		formspec = formspec ..
-			"image_button[6.6,3.7;.8,.8;"..
-			"ui_circular_arrows_icon.png;"..
-			"toggle_color"..i..";]"..
-			"tooltip[toggle_color" .. i .. ";"
-				.. F(S("Change color of waypoint display")).."]"
-
-		formspec = formspec ..
-			"image_button[7.3,3.7;.8,.8;"..
-			"ui_pencil_icon.png;"..
-			"rename_waypoint"..i..";]"..
-			"tooltip[rename_waypoint" .. i .. ";"
-				.. F(S("Edit waypoint name")).."]"
-
-		-- Waypoint's info:
-		if waypoint.active then
-			formspec = formspec .. 	"label[1,0.8;"..F(S("Waypoint active")).."]"
-		else
-			formspec = formspec .. 	"label[1,0.8;"..F(S("Waypoint inactive")).."]"
-		end
-
-		if temp.edit then
-			formspec = formspec ..
-				"field[1.3,3.2;6,.8;rename_box" .. i .. ";;"
-				..(waypoint.name or default_name).."]" ..
-				"image_button[7.3,2.9;.8,.8;"..
-				"ui_ok_icon.png;"..
-				"confirm_rename"..i.. ";]"..
-				"tooltip[confirm_rename" .. i .. ";"
-					.. F(S("Finish editing")).."]"
-		end
-
-		formspec = formspec .. "label[1,1.3;"..F(S("World position"))..": " ..
-			minetest.pos_to_string(waypoint.world_pos or vector.new()) .. "]" ..
-			"label[1,1.8;"..F(S("Name"))..": ".. (waypoint.name or default_name) .. "]" ..
-			"label[1,2.3;"..F(S("HUD text color"))..": " ..
-			hud_colors[waypoint.color or 1][3] .. "]"
-
-		return {formspec=formspec}
-	end,
-})
-
-unified_inventory.register_button("waypoints", {
-	type = "image",
-	image = "ui_waypoints_icon.png",
-	tooltip = S("Waypoints"),
-	hide_lite=true
-})
-
-local function update_hud(player, waypoints, temp, i)
-	local waypoint = waypoints[i]
-	if not waypoint then return end
-	temp[i] = temp[i] or {}
-	temp = temp[i]
-	local pos = waypoint.world_pos or vector.new()
-	local name
-	if waypoint.display_pos then
-		name = minetest.pos_to_string(pos)
-		if waypoint.name then
-			name = name..", "..waypoint.name
-		end
-	else
-		name = waypoint.name or "Waypoint "..i
-	end
-	if temp.hud then
-		player:hud_remove(temp.hud)
-	end
-	if waypoint.active then
-		temp.hud = player:hud_add({
-			hud_elem_type = "waypoint",
-			number = hud_colors[waypoint.color or 1][2] ,
-			name = name,
-			text = "m",
-			world_pos = pos
-		})
-	else
-		temp.hud = nil
-	end
-end
-
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	if formname ~= "" then return end
-
-	local player_name = player:get_player_name()
-	local update_formspec = false
-	local need_update_hud = false
-	local hit = false
-
-	local waypoints = datastorage.get(player_name, "waypoints")
-	local temp = waypoints_temp[player_name]
-	for i = 1, 5, 1 do
-		if fields["select_waypoint"..i] then
-			hit = true
-			waypoints.selected = i
-			update_formspec = true
-		end
-
-		if fields["toggle_waypoint"..i] then
-			hit = true
-			waypoints[i] = waypoints[i] or {}
-			waypoints[i].active = not (waypoints[i].active)
-			need_update_hud = true
-			update_formspec = true
-		end
-
-		if fields["set_waypoint"..i] then
-			hit = true
-			local pos = player:get_pos()
-			pos.x = math.floor(pos.x)
-			pos.y = math.floor(pos.y)
-			pos.z = math.floor(pos.z)
-			waypoints[i] = waypoints[i] or {}
-			waypoints[i].world_pos = pos
-			need_update_hud = true
-			update_formspec = true
-		end
-
-		if fields["rename_waypoint"..i] then
-			hit = true
-			temp[i] = temp[i] or {}
-			temp[i].edit = true
-			update_formspec = true
-		end
-
-		if fields["toggle_display_pos"..i] then
-			hit = true
-			waypoints[i] = waypoints[i] or {}
-			waypoints[i].display_pos = not waypoints[i].display_pos
-			need_update_hud = true
-			update_formspec = true
-		end
-
-		if fields["toggle_color"..i] then
-			hit = true
-			waypoints[i] = waypoints[i] or {}
-			local color = waypoints[i].color or 1
-			color = color + 1
-			if color > hud_colors_max then
-				color = 1
-			end
-			waypoints[i].color = color
-			need_update_hud = true
-			update_formspec = true
-		end
-
-		if fields["confirm_rename"..i] then
-			hit = true
-			waypoints[i] = waypoints[i] or {}
-			temp[i].edit = false
-			waypoints[i].name = fields["rename_box"..i]
-			need_update_hud = true
-			update_formspec = true
-		end
-		if need_update_hud then
-			update_hud(player, waypoints, temp, i)
-		end
-		if update_formspec then
-			unified_inventory.set_inventory_formspec(player, "waypoints")
-		end
-		if hit then return end
-	end
-end)
-
-
-minetest.register_on_joinplayer(function(player)
-	local player_name = player:get_player_name()
-	local waypoints = datastorage.get(player_name, "waypoints")
-	local temp = {}
-	waypoints_temp[player_name] = temp
-	for i = 1, 5 do
-		update_hud(player, waypoints, temp, i)
-	end
-end)
-
-minetest.register_on_leaveplayer(function(player)
-	waypoints_temp[player:get_player_name()] = nil
-end)
-