diff --git a/src/main/java/no/nibio/vips/logic/authenticate/AuthenticationFilter.java b/src/main/java/no/nibio/vips/logic/authenticate/AuthenticationFilter.java
index 76ad91784fece34063773465153c4e552cd931dd..aeb950d2fe7be972e35fd45bd259a3b3b7e7ac52 100755
--- a/src/main/java/no/nibio/vips/logic/authenticate/AuthenticationFilter.java
+++ b/src/main/java/no/nibio/vips/logic/authenticate/AuthenticationFilter.java
@@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse;
 import no.nibio.vips.logic.controller.session.UserBean;
 import no.nibio.vips.logic.entity.VipsLogicUser;
 import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.util.ServletUtil;
 
 /**
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/CropCategoryController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/CropCategoryController.java
index 3789c3cecc3f3b00a0b3f6e6868738178f73d0ed..f174c13ffff5e39037ab91896b55535c2ac420b1 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/CropCategoryController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/CropCategoryController.java
@@ -20,7 +20,6 @@
 package no.nibio.vips.logic.controller.servlet;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,7 +35,6 @@ import no.nibio.vips.logic.entity.Organism;
 import no.nibio.vips.logic.entity.Organization;
 import no.nibio.vips.logic.entity.VipsLogicUser;
 import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.util.ServletUtil;
 import no.nibio.web.forms.FormUtil;
 import no.nibio.web.forms.FormValidation;
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java
index ddd0bf7896461a221d88e3aaf6f920d218528703..412e4c542116705eef74a5c646cf1404fa425ce5 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ForecastConfigurationController.java
@@ -46,7 +46,6 @@ import no.nibio.vips.logic.entity.VipsLogicRole;
 import no.nibio.vips.logic.entity.VipsLogicUser;
 import no.nibio.vips.logic.i18n.SessionLocaleUtil;
 import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.logic.util.SystemTime;
 import no.nibio.vips.util.ArrayUtil;
 import no.nibio.vips.util.ServletUtil;
@@ -57,7 +56,7 @@ import no.nibio.web.forms.FormValidator;
 
 /**
  * Handles form configuration actions
- * @copyright 2020 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2020-2022 <a href="http://www.nibio.no/">NIBIO</a>
  * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 public class ForecastConfigurationController extends HttpServlet {
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java
index b1987c845e02258db823c0eb4e8e14256706e3f5..5aefe7f7209efa0d039d80afcd8f1a21e9a0df19 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/MessageController.java
@@ -45,7 +45,6 @@ import no.nibio.vips.logic.entity.VipsLogicUser;
 import no.nibio.vips.logic.i18n.SessionLocaleUtil;
 import no.nibio.vips.logic.messaging.MessagingBean;
 import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.logic.util.SystemTime;
 import no.nibio.vips.util.ExceptionUtil;
 import no.nibio.vips.util.ServletUtil;
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java
index c49849aa6a2051c61a14e20cadbea3c72f8366e8..eb18dd3d621834b1f727f0ef5dde3f78e45458a5 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/ObservationController.java
@@ -57,7 +57,6 @@ import no.nibio.vips.logic.entity.VipsLogicUser;
 import no.nibio.vips.logic.i18n.SessionLocaleUtil;
 import no.nibio.vips.logic.messaging.MessagingBean;
 import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.logic.util.SystemTime;
 import no.nibio.vips.util.DateUtil;
 import no.nibio.vips.util.DateUtilException;
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
index 57d32334b41cfff34cbe8175e5bd4e3e52a1531d..0dee5a090466417918c6b7784775b501a1ad8ef3 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java
@@ -51,7 +51,6 @@ import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
-import javax.transaction.Transactional;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
@@ -77,7 +76,6 @@ import no.nibio.vips.logic.scheduling.model.ModelRunPreprocessorFactory;
 import no.nibio.vips.logic.scheduling.model.PreprocessorException;
 import no.nibio.vips.logic.util.GISEntityUtil;
 import no.nibio.vips.logic.util.RunModelException;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.logic.util.SystemTime;
 import no.nibio.vips.util.WeatherUtil;
 import no.nibio.web.forms.FormField;
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
index cc7997f767133461935a74f143769c3391fa298a..0e029a336cc18d971adeb02bf2a2bf1bcdeeff51 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/PointOfInterestBean.java
@@ -30,7 +30,6 @@ import de.micromata.opengis.kml.v_2_2_0.Point;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -53,13 +52,11 @@ import no.nibio.vips.logic.entity.VipsLogicUser;
 import no.nibio.vips.logic.entity.WeatherStationDataSource;
 import no.nibio.vips.logic.util.GISEntityUtil;
 import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
-import no.nibio.web.forms.FormField;
 
 
 /**
  * Handles transactions for POIs
- * @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2013-2022 <a href="http://www.nibio.no/">NIBIO</a>
  * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 @LocalBean
diff --git a/src/main/java/no/nibio/vips/logic/messaging/sms/SMSHandlingService.java b/src/main/java/no/nibio/vips/logic/messaging/sms/SMSHandlingService.java
index b85bcdf76c8cd64019a244608f9edbd7d05cb7c9..313db176ea10a12098f49797202227804f585f42 100755
--- a/src/main/java/no/nibio/vips/logic/messaging/sms/SMSHandlingService.java
+++ b/src/main/java/no/nibio/vips/logic/messaging/sms/SMSHandlingService.java
@@ -27,7 +27,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import no.nibio.vips.logic.controller.session.UserBean;
 import no.nibio.vips.logic.entity.VipsLogicUser;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 
 /**
  * @copyright 2016 <a href="http://www.nibio.no/">NIBIO</a>
diff --git a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
index 6a0df4f0e18f9639492996f350f03143ee3cd409..8287b9cd71d118233d7cbe58cdafacf023d85876 100755
--- a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
+++ b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
@@ -38,7 +38,6 @@ import no.nibio.vips.logic.controller.session.UserBean;
 import no.nibio.vips.logic.entity.VipsLogicRole;
 import no.nibio.vips.logic.entity.VipsLogicUser;
 import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.logic.util.SystemTime;
 import no.nibio.vips.util.ExceptionUtil;
 import no.nibio.vips.util.ServletUtil;
diff --git a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java
index a4d78ce6edde36b58eeedce51208d4fded43e36e..0153a80b9dc0de5211d0ec0c1e1fd6ceade2b124 100644
--- a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java
+++ b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleController.java
@@ -30,13 +30,11 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.ejb.EJB;
-import javax.ejb.EJBException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -48,7 +46,6 @@ import no.nibio.vips.logic.entity.VipsLogicRole;
 import no.nibio.vips.logic.entity.VipsLogicUser;
 import no.nibio.vips.logic.gis.CoordinateXYZ;
 import no.nibio.vips.logic.util.Globals;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.logic.util.SystemTime;
 import no.nibio.vips.util.ExceptionUtil;
 import no.nibio.vips.util.ServletUtil;
diff --git a/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java b/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java
index 14985497b24aa2cee00a56225310f10c58891101..791743c953700774ce16eaa957f282f7f7e89d16 100755
--- a/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java
+++ b/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java
@@ -49,7 +49,6 @@ import no.nibio.vips.logic.controller.session.ForecastBean;
 import no.nibio.vips.logic.entity.Organization;
 import no.nibio.vips.logic.entity.PointOfInterestWeatherStation;
 import no.nibio.vips.logic.util.RunModelException;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.logic.util.SystemTime;
 import no.nibio.vips.util.InvalidAggregationTypeException;
 import no.nibio.vips.util.ParseRESTParamUtil;
diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/DeliaRadicumFloralisModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/DeliaRadicumFloralisModelPreprocessor.java
index ccada9b3190ad0d67a615eb117466941b335e26b..31cdcd4bb2121733c71afa93f72205b683053e3d 100755
--- a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/DeliaRadicumFloralisModelPreprocessor.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/DeliaRadicumFloralisModelPreprocessor.java
@@ -34,13 +34,12 @@ import no.nibio.vips.logic.entity.Organism;
 import no.nibio.vips.logic.entity.PointOfInterest;
 import no.nibio.vips.logic.scheduling.model.ModelRunPreprocessor;
 import no.nibio.vips.logic.scheduling.model.PreprocessorException;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.logic.util.SystemTime;
 import no.nibio.vips.observation.Observation;
 import no.nibio.vips.util.WeatherUtil;
 
 /**
- * @copyright 2017 <a href="http://www.nibio.no/">NIBIO</a>
+ * @copyright 2017-2022 <a href="http://www.nibio.no/">NIBIO</a>
  * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
  */
 public class DeliaRadicumFloralisModelPreprocessor extends ModelRunPreprocessor{
diff --git a/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java b/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java
index ea71a49012d0bd07b15dd309853a343206de5409..d358d330c86a6535378a8f00eea8dd85eff0e181 100755
--- a/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java
+++ b/src/main/java/no/nibio/vips/logic/service/VIPSMobileService.java
@@ -63,7 +63,6 @@ import no.nibio.vips.logic.entity.vipsmobile.VIPSMobileForecast;
 import no.nibio.vips.logic.entity.vipsmobile.VIPSMobileMessage;
 import no.nibio.vips.logic.entity.vipsmobile.VIPSMobilePresentation;
 import no.nibio.vips.logic.i18n.SessionLocaleUtil;
-import no.nibio.vips.logic.util.SessionControllerGetter;
 import no.nibio.vips.logic.util.SystemTime;
 import no.nibio.vips.util.WeatherUtil;
 import org.jboss.resteasy.spi.HttpRequest;
diff --git a/src/main/java/no/nibio/vips/logic/util/SessionControllerGetter.java b/src/main/java/no/nibio/vips/logic/util/SessionControllerGetter.java
deleted file mode 100755
index 51129a619791b6c49cd067d054b031def095cbd4..0000000000000000000000000000000000000000
--- a/src/main/java/no/nibio/vips/logic/util/SessionControllerGetter.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
- * 
- * This file is part of VIPSLogic.
- * VIPSLogic is free software: you can redistribute it and/or modify
- * it under the terms of the NIBIO Open Source License as published by 
- * NIBIO, either version 1 of the License, or (at your option) any
- * later version.
- * 
- * VIPSLogic is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * NIBIO Open Source License for more details.
- * 
- * You should have received a copy of the NIBIO Open Source License
- * along with VIPSLogic.  If not, see <http://www.nibio.no/licenses/>.
- * 
- */
-
-package no.nibio.vips.logic.util;
-
-import no.nibio.vips.logic.controller.session.SchedulingBean;
-import no.nibio.vips.logic.controller.session.ForecastBean;
-import no.nibio.vips.logic.controller.session.UserBean;
-import no.nibio.vips.logic.controller.session.PointOfInterestBean;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import no.nibio.vips.logic.controller.session.MessageBean;
-import no.nibio.vips.logic.controller.session.ObservationBean;
-import no.nibio.vips.logic.controller.session.OrganismBean;
-import no.nibio.vips.logic.messaging.MessagingBean;
-import no.nibio.vips.logic.modules.applefruitmoth.AppleFruitMothBean;
-
-/**
- * @copyright 2013-2014 <a href="http://www.nibio.no/">NIBIO</a>
- * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
- */
-public class SessionControllerGetter {
-    
-    private static final String JNDI_PATH = "java:global/VIPSLogic-1.0-SNAPSHOT/";
-/*
-    public static PointOfInterestBean getPointOfInterestBean()
-    {
-        try
-        {
-            InitialContext ic = new InitialContext();
-            PointOfInterestBean retVal = (PointOfInterestBean) ic.lookup(SessionControllerGetter.getJndiPath(PointOfInterestBean.class));
-
-            return retVal;
-        }catch(NamingException ne)
-        {
-            System.out.println("Could not find " + PointOfInterestBean.class.getSimpleName());
-            return null;
-        }
-    }
-    
-    public static UserBean getUserBean()
-    {
-        try
-        {
-            InitialContext ic = new InitialContext();
-            UserBean retVal = (UserBean) ic.lookup(SessionControllerGetter.getJndiPath(UserBean.class));
-
-            return retVal;
-        }catch(NamingException ne)
-        {
-            System.out.println("Could not find " + UserBean.class.getSimpleName());
-            return null;
-        }
-    }
-    
-    public static SchedulingBean getSchedulingBean()
-    {
-        try
-        {
-            InitialContext ic = new InitialContext();
-            SchedulingBean retVal = (SchedulingBean) ic.lookup(SessionControllerGetter.getJndiPath(SchedulingBean.class));
-
-            return retVal;
-        }catch(NamingException ne)
-        {
-            System.out.println("Could not find " + SchedulingBean.class.getSimpleName());
-            return null;
-        }
-    }
-    
-    public static ForecastBean getForecastBean(){
-        try
-        {
-            InitialContext ic = new InitialContext();
-            ForecastBean retVal = (ForecastBean) ic.lookup(SessionControllerGetter.getJndiPath(ForecastBean.class));
-
-            return retVal;
-        }catch(NamingException ne)
-        {
-            System.out.println("Could not find " + ForecastBean.class.getSimpleName());
-            return null;
-        }
-    }
-    
-    public static OrganismBean getOrganismBean(){
-        try
-        {
-            InitialContext ic = new InitialContext();
-            OrganismBean retVal = (OrganismBean) ic.lookup(SessionControllerGetter.getJndiPath(OrganismBean.class));
-
-            return retVal;
-        }catch(NamingException ne)
-        {
-            System.out.println("Could not find " + OrganismBean.class.getSimpleName());
-            return null;
-        }
-    }
-    
-    public static MessageBean getMessageBean(){
-        try
-        {
-            InitialContext ic = new InitialContext();
-            MessageBean retVal = (MessageBean) ic.lookup(SessionControllerGetter.getJndiPath(MessageBean.class));
-
-            return retVal;
-        }catch(NamingException ne)
-        {
-            System.out.println("Could not find " + MessageBean.class.getSimpleName());
-            return null;
-        }
-    }
-    
-    public static MessagingBean getMessagingBean(){
-        try
-        {
-            InitialContext ic = new InitialContext();
-            MessagingBean retVal = (MessagingBean) ic.lookup(SessionControllerGetter.getJndiPath(MessagingBean.class));
-            return retVal;
-        }
-        catch(NamingException ne)
-        {
-            System.out.println("Could not find " + MessagingBean.class.getSimpleName());
-            return null;
-        }
-    }
-    
-    public static ObservationBean getObservationBean()
-    {
-        try
-        {
-            InitialContext ic = new InitialContext();
-            ObservationBean retVal = (ObservationBean) ic.lookup(SessionControllerGetter.getJndiPath(ObservationBean.class));
-
-            return retVal;
-        }catch(NamingException ne)
-        {
-            System.out.println("Could not find " + ObservationBean.class.getSimpleName());
-            return null;
-        }
-    }
-    
-    public static AppleFruitMothBean getAppleFruitMothBean()
-    {
-        try
-        {
-            InitialContext ic = new InitialContext();
-            AppleFruitMothBean retVal = (AppleFruitMothBean) ic.lookup(SessionControllerGetter.getJndiPath(AppleFruitMothBean.class));
-
-            return retVal;
-        }catch(NamingException ne)
-        {
-            System.out.println("Could not find " + AppleFruitMothBean.class.getSimpleName());
-            return null;
-        }
-    }
-    
-    public static String getJndiPath(Class obj)
-    {
-        String retVal = SessionControllerGetter.JNDI_PATH + obj.getSimpleName();
-        //System.out.println("JNDI-path=" + retVal);
-        return retVal;
-    }
-*/
-}