diff --git a/src/main/java/org/openelisglobal/common/controller/BaseController.java b/src/main/java/org/openelisglobal/common/controller/BaseController.java
index a810ca1c0..73ca5b322 100644
--- a/src/main/java/org/openelisglobal/common/controller/BaseController.java
+++ b/src/main/java/org/openelisglobal/common/controller/BaseController.java
@@ -17,7 +17,6 @@
 import org.openelisglobal.common.util.SystemConfiguration;
 import org.openelisglobal.internationalization.MessageUtil;
 import org.openelisglobal.login.dao.UserModuleService;
-import org.openelisglobal.login.valueholder.UserSessionData;
 import org.openelisglobal.view.PageBuilderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/src/main/java/org/openelisglobal/common/userId/SysUserId.java b/src/main/java/org/openelisglobal/common/userId/SysUserId.java
index 329b0841a..68c859a92 100644
--- a/src/main/java/org/openelisglobal/common/userId/SysUserId.java
+++ b/src/main/java/org/openelisglobal/common/userId/SysUserId.java
@@ -1,7 +1,6 @@
 package org.openelisglobal.common.userId;
 
 import javax.servlet.http.HttpServletRequest;
-
 import org.openelisglobal.common.action.IActionConstants;
 import org.openelisglobal.login.valueholder.UserSessionData;
 import org.springframework.stereotype.Component;
@@ -18,5 +17,5 @@ protected String getSysUserId(HttpServletRequest request) {
         }
         return String.valueOf(usd.getSystemUserId());
     }
-    
+
 }
diff --git a/src/main/java/org/openelisglobal/notifications/rest/NotificationRestController.java b/src/main/java/org/openelisglobal/notifications/rest/NotificationRestController.java
index 03d3dc7ba..98cd73683 100644
--- a/src/main/java/org/openelisglobal/notifications/rest/NotificationRestController.java
+++ b/src/main/java/org/openelisglobal/notifications/rest/NotificationRestController.java
@@ -11,7 +11,6 @@
 import org.apache.http.HttpResponse;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.openelisglobal.common.userId.SysUserId;
-import org.openelisglobal.login.valueholder.UserSessionData;
 import org.openelisglobal.notifications.dao.NotificationDAO;
 import org.openelisglobal.notifications.dao.NotificationSubscriptionDAO;
 import org.openelisglobal.notifications.entity.Notification;
diff --git a/src/main/java/org/openelisglobal/program/controller/cytology/CytologyController.java b/src/main/java/org/openelisglobal/program/controller/cytology/CytologyController.java
index 291f202e1..73836b4c3 100644
--- a/src/main/java/org/openelisglobal/program/controller/cytology/CytologyController.java
+++ b/src/main/java/org/openelisglobal/program/controller/cytology/CytologyController.java
@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
-
 import org.openelisglobal.common.userId.SysUserId;
 import org.openelisglobal.program.bean.CytologyDashBoardCount;
 import org.openelisglobal.program.service.cytology.CytologyDisplayService;
diff --git a/src/main/java/org/openelisglobal/program/controller/immunohistochemistry/ImmunohistochemistryController.java b/src/main/java/org/openelisglobal/program/controller/immunohistochemistry/ImmunohistochemistryController.java
index 2d6a6bf28..9a1a0a69b 100644
--- a/src/main/java/org/openelisglobal/program/controller/immunohistochemistry/ImmunohistochemistryController.java
+++ b/src/main/java/org/openelisglobal/program/controller/immunohistochemistry/ImmunohistochemistryController.java
@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
-
 import org.openelisglobal.common.userId.SysUserId;
 import org.openelisglobal.program.bean.ImmunohistochemistryDashBoardCount;
 import org.openelisglobal.program.service.ImmunohistochemistryDisplayService;
diff --git a/src/main/java/org/openelisglobal/program/controller/pathology/PathologyController.java b/src/main/java/org/openelisglobal/program/controller/pathology/PathologyController.java
index b129fa617..61f38481f 100644
--- a/src/main/java/org/openelisglobal/program/controller/pathology/PathologyController.java
+++ b/src/main/java/org/openelisglobal/program/controller/pathology/PathologyController.java
@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
-
 import org.openelisglobal.common.userId.SysUserId;
 import org.openelisglobal.program.bean.PathologyDashBoardCount;
 import org.openelisglobal.program.service.PathologyDisplayService;
diff --git a/src/main/java/org/openelisglobal/qaevent/controller/rest/NonConformingEventsCorrectionActionRestController.java b/src/main/java/org/openelisglobal/qaevent/controller/rest/NonConformingEventsCorrectionActionRestController.java
index 9d6fba84d..4ea01c9d4 100644
--- a/src/main/java/org/openelisglobal/qaevent/controller/rest/NonConformingEventsCorrectionActionRestController.java
+++ b/src/main/java/org/openelisglobal/qaevent/controller/rest/NonConformingEventsCorrectionActionRestController.java
@@ -9,7 +9,6 @@
 import org.apache.commons.validator.GenericValidator;
 import org.openelisglobal.common.services.DisplayListService;
 import org.openelisglobal.common.userId.SysUserId;
-import org.openelisglobal.login.valueholder.UserSessionData;
 import org.openelisglobal.patient.action.bean.PatientSearch;
 import org.openelisglobal.qaevent.form.NonConformingEventForm;
 import org.openelisglobal.qaevent.service.NCEventService;
diff --git a/src/main/java/org/openelisglobal/qaevent/controller/rest/ReportNonConformEventsRestController.java b/src/main/java/org/openelisglobal/qaevent/controller/rest/ReportNonConformEventsRestController.java
index 85886980e..89f5a2a8b 100644
--- a/src/main/java/org/openelisglobal/qaevent/controller/rest/ReportNonConformEventsRestController.java
+++ b/src/main/java/org/openelisglobal/qaevent/controller/rest/ReportNonConformEventsRestController.java
@@ -11,7 +11,6 @@
 import org.openelisglobal.common.services.RequesterService;
 import org.openelisglobal.common.userId.SysUserId;
 import org.openelisglobal.common.util.DateUtil;
-import org.openelisglobal.login.valueholder.UserSessionData;
 import org.openelisglobal.qaevent.form.NonConformingEventForm;
 import org.openelisglobal.qaevent.service.NceCategoryService;
 import org.openelisglobal.qaevent.valueholder.NcEvent;
@@ -34,7 +33,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class ReportNonConformEventsRestController extends SysUserId{
+public class ReportNonConformEventsRestController extends SysUserId {
 
     private final SampleService sampleService;
     private final SampleItemService sampleItemService;
diff --git a/src/main/java/org/openelisglobal/qaevent/controller/rest/ViewNonConformEventsRestController.java b/src/main/java/org/openelisglobal/qaevent/controller/rest/ViewNonConformEventsRestController.java
index 8ab86dda9..d2f4a5177 100644
--- a/src/main/java/org/openelisglobal/qaevent/controller/rest/ViewNonConformEventsRestController.java
+++ b/src/main/java/org/openelisglobal/qaevent/controller/rest/ViewNonConformEventsRestController.java
@@ -8,7 +8,6 @@
 import org.openelisglobal.common.services.DisplayListService;
 import org.openelisglobal.common.userId.SysUserId;
 import org.openelisglobal.common.util.DateUtil;
-import org.openelisglobal.login.valueholder.UserSessionData;
 import org.openelisglobal.qaevent.form.NonConformingEventForm;
 import org.openelisglobal.qaevent.service.NCEventService;
 import org.openelisglobal.qaevent.service.NceCategoryService;
@@ -30,7 +29,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class ViewNonConformEventsRestController extends SysUserId{
+public class ViewNonConformEventsRestController extends SysUserId {
 
     @Autowired
     private NCEventService ncEventService;