diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUpload.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUpload.java
index 7e1840b0c..f7ed0e0e9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUpload.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/N3MultiPartUpload.java
@@ -276,8 +276,7 @@ public class N3MultiPartUpload extends VitroHttpServlet {
                 }
                 if (postUploadSuccess) {
                     /* **** Save the models for all the files **** */
-                    String editorUri = EditN3Utils.getEditorUri(request,
-                            session, application);
+                    String editorUri = EditN3Utils.getEditorUri(request);
                     Lock lock = null;
                     try {
                         lock = jenaOntModel.getLock();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
index fb8971924..f6a87db5a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java
@@ -7,7 +7,6 @@ import java.io.StringReader;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -77,9 +76,7 @@ public class PrimitiveRdfEdit extends VitroAjaxController {
             return;
         }
 
-
-        ServletContext sc = getServletContext();
-        String editorUri = EditN3Utils.getEditorUri(vreq, vreq.getSession(false), sc);           
+        String editorUri = EditN3Utils.getEditorUri(vreq);           
         try {
             processChanges( additions, retractions, getWriteModel(vreq),getQueryModel(vreq), editorUri);
         } catch (Exception e) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditConfiguration.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditConfiguration.java
index 3cdf4ca12..149f3ed87 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditConfiguration.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditConfiguration.java
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ResourceFactory;
 
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.UserToIndIdentifierFactory;
 import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral;
@@ -256,7 +256,7 @@ public class EditConfiguration {
                 throw new Error("EditConfiguration.addSystemValues() needs a session");
 
             /* ********** Get URI of a logged in user ************** */
-            IdentifierBundle ids = ServletIdentifierBundleFactory.getIdBundleForRequest(request,request.getSession(),context);
+            IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(request);
             List<String> userUris = 
               UserToIndIdentifierFactory.getIndividualsForUser(ids);
                         
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3Utils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3Utils.java
index 42b0662f1..64efba566 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3Utils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3Utils.java
@@ -2,38 +2,23 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing;
 
-import java.util.Calendar;
-import java.util.Date;
-
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep;
 
 import org.apache.xerces.util.XMLChar;
 
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory;
+import edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep;
+
 public class EditN3Utils {
 
-    public static String getEditorUri(HttpServletRequest request, HttpSession session, ServletContext context){
+    public static String getEditorUri(HttpServletRequest request){
         String editorUri = "Unknown N3 Editor";
         boolean selfEditing = VitroRequestPrep.isSelfEditing(request);
         IdentifierBundle ids =
-            ServletIdentifierBundleFactory.getIdBundleForRequest(request,session,context);           
+        	RequestIdentifiers.getIdBundleForRequest(request);           
         
         if( selfEditing )
             editorUri = SelfEditingIdentifierFactory.getSelfEditingUri(ids);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
index e127b075d..f158e3546 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
@@ -20,14 +20,12 @@ import javax.servlet.http.HttpSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.hp.hpl.jena.query.DataSource;
 import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
 
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory.SelfEditing;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
 import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
 import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
 import edu.cornell.mannlib.vitro.webapp.beans.Portal;
@@ -45,7 +43,6 @@ import edu.cornell.mannlib.vitro.webapp.flags.FlagException;
 import edu.cornell.mannlib.vitro.webapp.flags.PortalFlag;
 import edu.cornell.mannlib.vitro.webapp.flags.RequestToAuthFlag;
 import edu.cornell.mannlib.vitro.webapp.flags.SunsetFlag;
-import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
 
 /**
  * This sets up several objects in the Request scope for each
@@ -429,12 +426,7 @@ public class VitroRequestPrep implements Filter {
 			return false;
 		}
 
-		ServletContext sc = session.getServletContext();
-		IdentifierBundle idBundle = ServletIdentifierBundleFactory.getIdBundleForRequest(request, session, sc);
-		if (idBundle == null) {
-			return false;
-		}
-		
+		IdentifierBundle idBundle = RequestIdentifiers.getIdBundleForRequest(request);
 		SelfEditing selfId = SelfEditingIdentifierFactory.getSelfEditingIdentifier(idBundle);
 		if (selfId == null) {
 			return false;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/PropertyEditLinks.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/PropertyEditLinks.java
index e58499c7c..65cb99ba7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/PropertyEditLinks.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/PropertyEditLinks.java
@@ -21,7 +21,7 @@ import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.rdf.model.StmtIterator;
 
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyList;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.RequestPolicyList;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
@@ -99,15 +99,7 @@ public class PropertyEditLinks extends TagSupport{
             }
         }              
         
-        IdentifierBundle ids = (IdentifierBundle)ServletIdentifierBundleFactory
-            .getIdBundleForRequest(pageContext.getRequest(), 
-                    pageContext.getSession(), 
-                    pageContext.getServletContext());
-        
-        if( ids == null ){
-            log.error("No IdentifierBundle objects for request");
-            return SKIP_BODY;
-        }
+		IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(pageContext.getRequest());
         
         Individual entity = (Individual)pageContext.getRequest().getAttribute("entity");           
         LinkStruct[] links = null;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/EditingPolicyHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/EditingPolicyHelper.java
index 5b716351f..fd91e4380 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/EditingPolicyHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/EditingPolicyHelper.java
@@ -7,9 +7,8 @@ import javax.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ServletIdentifierBundleFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyList;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.RequestPolicyList;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
@@ -46,12 +45,7 @@ public class EditingPolicyHelper {
     }
     
     private void setIds() {
-        ids = (IdentifierBundle)ServletIdentifierBundleFactory
-            .getIdBundleForRequest(vreq, vreq.getSession(), servletContext);
-        
-        if (ids == null) {
-            log.error("No IdentifierBundle objects for request");
-        }
+        ids = RequestIdentifiers.getIdBundleForRequest(vreq);
     }
    
     protected boolean isAuthorizedAction(RequestedAction action) {