diff --git a/package/gluon-hoodselector/luasrc/usr/lib/lua/hoodselector/util.lua b/package/gluon-hoodselector/luasrc/usr/lib/lua/hoodselector/util.lua
index 1050146b..d3af04cd 100644
--- a/package/gluon-hoodselector/luasrc/usr/lib/lua/hoodselector/util.lua
+++ b/package/gluon-hoodselector/luasrc/usr/lib/lua/hoodselector/util.lua
@@ -1,5 +1,6 @@
 local unistd = require('posix.unistd')
 local util = require 'gluon.util'
+local math_polygon = require('math-polygon')
 local json = require 'jsonc'
 local uci = require('simple-uci').cursor()
 local site = require 'gluon.site'
@@ -46,75 +47,20 @@ function M.get_geolocation()
 	}
 end
 
--- Source with pseudocode: https://de.wikipedia.org/wiki/Punkt-in-Polygon-Test_nach_Jordan
--- see also https://en.wikipedia.org/wiki/Point_in_polygon
--- parameters: points A = (x_a,y_a), B = (x_b,y_b), C = (x_c,y_c)
--- return value: −1 if the ray from A to the right bisects the edge [BC] (the lower vortex of [BC]
--- is not seen as part of [BC]);
---                0 if A is on [BC];
---                +1 else
-function M.cross_prod_test(x_a,y_a,x_b,y_b,x_c,y_c)
-	if y_a == y_b and y_b == y_c then
-		if (x_b <= x_a and x_a <= x_c) or (x_c <= x_a and x_a <= x_b) then
-			return 0
-		end
-		return 1
-	end
-	if not ((y_a == y_b) and (x_a == x_b)) then
-		if y_b > y_c then
-			-- swap b and c
-			local h = x_b
-			x_b = x_c
-			x_c = h
-			h = y_b
-			y_b = y_c
-			y_c = h
-		end
-		if (y_a <= y_b) or (y_a > y_c) then
-			return 1
-		end
-		local delta = (x_b-x_a) * (y_c-y_a) - (y_b-y_a) * (x_c-x_a)
-		if delta > 0 then
-			return 1
-		elseif delta < 0 then
-			return -1
-		end
-	end
-	return 0
-end
-
--- Source with pseudocode: https://de.wikipedia.org/wiki/Punkt-in-Polygon-Test_nach_Jordan
--- see also: https://en.wikipedia.org/wiki/Point_in_polygon
--- let P be a 2D Polygon and Q a 2D Point
--- return value:  +1 if Q within P;
---                −1 if Q outside of P;
---                0 if Q on an edge of P
-function M.point_in_polygon(poly, point)
-	local t = -1
-	for i=1,#poly-1 do
-		t = t * M.cross_prod_test(point.lon,point.lat,poly[i].lon,poly[i].lat,poly[i+1].lon,poly[i+1].lat)
-		if t == 0 then break end
-	end
-	return t
-end
-
 -- Return domain from the domain list based on geo position or nil if no geo based domain could be
--- determined. First check if an area has > 2 points and is hence a polygon. Else assume it is a
--- rectangular box defined by two points (south-west and north-east). Furthermore keep record of
--- how many nested shapes we are in, e.g. a polyon with holes.
+-- determined.
 function M.get_domain_by_geo(jdomains,geo)
 	for _, domain in pairs(jdomains) do
 		if domain.domain_code ~= site.default_domain() then
+			-- Keep record of how many nested shapes we are in, e.g. a polyon with holes.
 			local nesting = 1
 			for _, area in pairs(domain.domain.hoodselector.shapes) do
-				if #area > 2 then
-					if (M.point_in_polygon(area,geo) == 1) then
-						nesting = nesting * (-1)
-					end
-				else
-					if ( geo.lat >= area[1].lat and geo.lat < area[2].lat and geo.lon >= area[1].lon and geo.lon < area[2].lon ) then
-						nesting = nesting * (-1)
-					end
+				-- Convert rectangle, defined by to points, into polygon
+				if #area = 2 then
+					area = math_polygon.two_point_rec_to_poly(area)
+				end
+				if (math_polygon.point_in_polygon(area,geo) == 1) then
+					nesting = nesting * (-1)
 				end
 			end
 			if nesting == -1 then return domain end
@@ -134,20 +80,4 @@ function M.set_domain_config(domain)
 	return false
 end
 
-function M.restart_services()
-	local proc_tbl = {
-		"fastd",
-		"tunneldigger",
-		"network",
-		"gluon-respondd",
-	}
-
-	for _, proc in ipairs(proc_tbl) do
-		if unistd.access("/etc/init.d/"..proc, "x") == 0 then
-			print(proc.." restarting ...")
-			os.execute("/etc/init.d/"..proc.." restart")
-		end
-	end
-end
-
 return M