diff --git a/src/main/java/org/nrg/xnat/configuration/ReactorConfig.java b/src/main/java/org/nrg/xnat/configuration/ReactorConfig.java
index 13f555e7f76d825d7d1b446899c8b3d2ab1d1273..c12fc08069f565a2d44f740c470d00be1501c780 100755
--- a/src/main/java/org/nrg/xnat/configuration/ReactorConfig.java
+++ b/src/main/java/org/nrg/xnat/configuration/ReactorConfig.java
@@ -2,15 +2,11 @@ package org.nrg.xnat.configuration;
 
 import org.nrg.framework.services.NrgEventService;
 import org.nrg.xft.event.listeners.XftItemEventListener;
-import org.nrg.xnat.event.conf.EventPackages;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import reactor.Environment;
 import reactor.bus.EventBus;
 
-import java.util.Arrays;
-import java.util.HashSet;
-
 /**
  * The Class ReactorConfig.
  */
diff --git a/src/main/java/org/nrg/xnat/restlet/guard/XnatSecureGuard.java b/src/main/java/org/nrg/xnat/restlet/guard/XnatSecureGuard.java
index ebbcdb058197cf1b11397530c8c5d4b86d1a0ec8..189541b3760b8ff21e25645575fc6f6dbb3bdf52 100644
--- a/src/main/java/org/nrg/xnat/restlet/guard/XnatSecureGuard.java
+++ b/src/main/java/org/nrg/xnat/restlet/guard/XnatSecureGuard.java
@@ -102,23 +102,14 @@ public class XnatSecureGuard extends Filter {
             }
             return true;
         } else {
-			UserI user;
 			final ChallengeResponse challengeResponse = request.getChallengeResponse();
 			if (challengeResponse != null) {
-				user = authenticateBasic(challengeResponse);
+				UserI user = authenticateBasic(challengeResponse);
 				if (user != null) {
 					return true;
 				}
-			}
-			else if (!XDAT.getSiteConfigPreferences().getRequireLogin()) {
-				try {
-					user=Users.getGuest();
-					if (user!=null) {
-						return true;
-					}
-				} catch (Exception e) {
-					logger.error("",e);
-				}
+			} else {
+				return !XDAT.getSiteConfigPreferences().getRequireLogin();
 			}
 		}
 		return false;
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/SecureResource.java b/src/main/java/org/nrg/xnat/restlet/resources/SecureResource.java
index 49409e2b6c9bd502e79481dec9ed93de1723ae4e..094b753f770b35b4593405951e25a76fc8aef1d8 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/SecureResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/SecureResource.java
@@ -151,8 +151,7 @@ public abstract class SecureResource extends Resource {
         user = XDAT.getUserDetails();
         if(user==null && !XDAT.getSiteConfigPreferences().getRequireLogin()){
             try {
-                user = Users.getGuest();
-                XDAT.setUserDetails(user);
+                XDAT.setGuestUserDetails();
             } catch (Exception e) {
                 logger.error("",e);
             }
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/PublicProjectView.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/PublicProjectView.java
index ea63bfe240a917111acdc82f8442b961ccc81917..540372e0219db3db8e17ca2e377e0323384c4e3a 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/PublicProjectView.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/PublicProjectView.java
@@ -10,42 +10,39 @@
  */
 package org.nrg.xnat.turbine.modules.screens;
 
-import java.util.ArrayList;
-
 import org.apache.turbine.modules.screens.VelocityScreen;
 import org.apache.turbine.util.RunData;
 import org.apache.velocity.context.Context;
+import org.nrg.xdat.XDAT;
 import org.nrg.xdat.om.XnatProjectdata;
 import org.nrg.xdat.security.SecurityManager;
 import org.nrg.xdat.security.helpers.Permissions;
-import org.nrg.xdat.security.helpers.Users;
-import org.nrg.xdat.turbine.utils.TurbineUtils;
 import org.nrg.xft.security.UserI;
 
-public class PublicProjectView extends VelocityScreen {
+import java.util.ArrayList;
+import java.util.List;
 
-    /* (non-Javadoc)
-     * @see org.apache.turbine.modules.screens.VelocityScreen#doBuildTemplate(org.apache.turbine.util.RunData, org.apache.velocity.context.Context)
+@SuppressWarnings("unused")
+public class PublicProjectView extends VelocityScreen {
+    /**
+     * {@inheritDoc}
      */
     @Override
     protected void doBuildTemplate(RunData data, Context context) throws Exception {
-        UserI user = TurbineUtils.getUser(data);
-        
-        if (user==null){
-        	user=Users.getGuest();
-            TurbineUtils.setUser(data, user);
-        } 
-        ArrayList allProjects = new ArrayList();
-        
-        for(XnatProjectdata p :XnatProjectdata.getAllXnatProjectdatas(user, false)){
-            if (Permissions.can(user,p.getItem(), SecurityManager.ACTIVATE)){
+        UserI user = XDAT.getUserDetails();
+
+        if (user == null) {
+            XDAT.setGuestUserDetails();
+        }
+
+        final List<XnatProjectdata> allProjects = new ArrayList<>();
+
+        for (XnatProjectdata p : XnatProjectdata.getAllXnatProjectdatas(user, false)) {
+            if (Permissions.can(user, p.getItem(), SecurityManager.ACTIVATE)) {
                 allProjects.add(p);
             }
         }
-        
+
         context.put("projects", allProjects);
-        
     }
-
-
 }