diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 24900498f..7904cda31 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -235,6 +235,15 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
+  <filter>
+     <filter-name>WebappDaoFactorySDBPrep</filter-name>
+     <filter-class>edu.cornell.mannlib.vitro.webapp.filters.WebappDaoFactorySDBPrep</filter-class>
+  </filter>
+  <filter-mapping>
+     <filter-name>WebappDaoFactorySDBPrep</filter-name>
+     <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
   <filter>
     <filter-name>VitroRequestPrep</filter-name>
     <filter-class>edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep</filter-class>
@@ -246,6 +255,16 @@
     <dispatcher>forward</dispatcher>
   </filter-mapping>
 
+  <filter>
+    <filter-name>PageRoutingFilter</filter-name>
+    <filter-class>edu.cornell.mannlib.vitro.webapp.filters.PageRoutingFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>PageRoutingFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>request</dispatcher>
+  </filter-mapping>
+
   <!--  Spring setup ****************************************************  -->
 <!--
   <context-param>
@@ -604,33 +623,6 @@
     <url-pattern>/individualTypeOp</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>Tabs2TypesOperationController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.Tabs2TypesOperationController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Tabs2TypesOperationController</servlet-name>
-    <url-pattern>/tabs2TypesOp</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>TabIndividualRelationOperationController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.TabIndividualRelationOperationController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>TabIndividualRelationOperationController</servlet-name>
-    <url-pattern>/tabIndividualRelationOp</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>TabHierarchyOperationController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.TabHierarchyOperationController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>TabHierarchyOperationController</servlet-name>
-    <url-pattern>/doTabHierarchyOperation</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>DatapropEditController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.DatapropEditController</servlet-class>
@@ -650,15 +642,6 @@
     <url-pattern>/keywordEdit</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>TabEditController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.TabEditController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>TabEditController</servlet-name>
-    <url-pattern>/tabEdit</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>UserEditController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.UserEditController</servlet-class>
@@ -713,15 +696,6 @@
     <url-pattern>/datatype_retry</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>AllTabsForPortalListingController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.AllTabsForPortalListingController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>AllTabsForPortalListingController</servlet-name>
-    <url-pattern>/listTabs</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>AllClassGroupsListingController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.AllClassGroupsListingController</servlet-class>
@@ -993,27 +967,6 @@
     <url-pattern>/dataservice</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>TabEntitiesController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.TabEntitiesController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>TabEntitiesController</servlet-name>
-    <url-pattern>/TabEntitiesController</url-pattern>
-  </servlet-mapping>
-
-  <!--  NOTICE: index.jsp is mapped to TabController so that we 
-            can have the urls that use to be in the system still work even 
-              though we no longer use index.jsp           -->
-    <servlet>
-      <servlet-name>TabController</servlet-name>
-      <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.TabController</servlet-class>
-    </servlet>
-    <servlet-mapping>
-      <servlet-name>TabController</servlet-name>
-      <url-pattern>/index.jsp</url-pattern>
-    </servlet-mapping>
-
   <servlet>
     <servlet-name>DashboardPropertyListController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.DashboardPropertyListController</servlet-class>
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
index 875b5bc36..ef0d78210 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
@@ -96,15 +96,21 @@ public class UpdateKnowledgeBase implements ServletContextListener {
 			settings.setDefaultNamespace(wadf.getDefaultNamespace());
 				
 			settings.setOntModelSelector(oms);
-			OntModel oldTBoxModel = loadModelFromDirectory(ctx.getRealPath(OLD_TBOX_MODEL_DIR));
-			settings.setOldTBoxModel(oldTBoxModel);
-			OntModel newTBoxModel = loadModelFromDirectory(ctx.getRealPath(NEW_TBOX_MODEL_DIR));
-			settings.setNewTBoxModel(newTBoxModel);
-			OntModel oldTBoxAnnotationsModel = loadModelFromDirectory(ctx.getRealPath(OLD_TBOX_ANNOTATIONS_DIR));
-			settings.setOldTBoxAnnotationsModel(oldTBoxAnnotationsModel);
-			OntModel newTBoxAnnotationsModel = loadModelFromDirectory(ctx.getRealPath(NEW_TBOX_ANNOTATIONS_DIR));
-			settings.setNewTBoxAnnotationsModel(newTBoxAnnotationsModel);
-			
+			try {
+				OntModel oldTBoxModel = loadModelFromDirectory(ctx.getRealPath(OLD_TBOX_MODEL_DIR));
+				settings.setOldTBoxModel(oldTBoxModel);
+				OntModel newTBoxModel = loadModelFromDirectory(ctx.getRealPath(NEW_TBOX_MODEL_DIR));
+				settings.setNewTBoxModel(newTBoxModel);
+				OntModel oldTBoxAnnotationsModel = loadModelFromDirectory(ctx.getRealPath(OLD_TBOX_ANNOTATIONS_DIR));
+				settings.setOldTBoxAnnotationsModel(oldTBoxAnnotationsModel);
+				OntModel newTBoxAnnotationsModel = loadModelFromDirectory(ctx.getRealPath(NEW_TBOX_ANNOTATIONS_DIR));
+				settings.setNewTBoxAnnotationsModel(newTBoxAnnotationsModel);
+			} catch (ModelDirectoryNotFoundException e) {
+				log.info("Knowledge base update directories not found.  " +
+						 "No update will be performed.");
+				return;
+			}
+				
 			try {
 				
 			  KnowledgeBaseUpdater ontologyUpdater = new KnowledgeBaseUpdater(settings);
@@ -211,7 +217,7 @@ public class UpdateKnowledgeBase implements ServletContextListener {
 		OntModel om = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
 		File directory = new File(directoryPath);
 		if (!directory.isDirectory()) {
-			throw new RuntimeException(directoryPath + " must be a directory " +
+			throw new ModelDirectoryNotFoundException(directoryPath + " must be a directory " +
 					"containing RDF files.");
 		}
 		File[] rdfFiles = directory.listFiles();
@@ -251,4 +257,10 @@ public class UpdateKnowledgeBase implements ServletContextListener {
 		return ctx.getRealPath(ASK_EMPTY_QUERY_FILE);
 	
     }
+	
+	private class ModelDirectoryNotFoundException extends RuntimeException {
+		public ModelDirectoryNotFoundException(String msg) {
+			super(msg);
+		}
+	}
 }