BACKLOG-5334 : cleaned geolocation eval code