diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index f3046e27..aa62d193 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -251,15 +251,6 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-  <filter>
-    <filter-name>Portal Picker Filter</filter-name>
-    <filter-class>edu.cornell.mannlib.vitro.webapp.filters.PortalPickerFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>Portal Picker Filter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
   <filter>
     <filter-name>WebappDaoFactorySDBPrep</filter-name>
     <filter-class>edu.cornell.mannlib.vitro.webapp.filters.WebappDaoFactorySDBPrep</filter-class>
@@ -847,15 +838,6 @@
     <url-pattern>/addRestriction</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>PortalsListingController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.PortalsListingController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>PortalsListingController</servlet-name>
-    <url-pattern>/listPortals</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>UsersListingController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.UsersListingController</servlet-class>
diff --git a/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
index 8b3f5b66..9d9b309e 100644
--- a/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
+++ b/productMods/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
@@ -8,15 +8,8 @@
         <h3>Site Configuration</h3>
 
         <ul>
-            <#if siteConfig.urls.portals??>
-                <#if siteConfig.urls.siteInfo??>
-                    <li><a href="${siteConfig.urls.siteInfo}">Current portal information</a></li>
-                </#if>
-                <li><a href="${siteConfig.urls.portals}">List all portals</a></li>
-            <#else>
-                <#if siteConfig.urls.siteInfo??>
-                    <li><a href="${siteConfig.urls.siteInfo}">Site information</a></li>
-                </#if>
+            <#if siteConfig.urls.siteInfo??>
+                <li><a href="${siteConfig.urls.siteInfo}">Site information</a></li>
             </#if>
 
             <#if siteConfig.urls.menuN3Editor??>
@@ -35,4 +28,4 @@
             
         </ul>
     </div>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java
index 896c592b..dd63756e 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/EntityPublicationCountRequestHandler.java
@@ -17,7 +17,6 @@ import com.google.gson.Gson;
 import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.rdf.model.Model;
 
-import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
@@ -250,7 +249,6 @@ public class EntityPublicationCountRequestHandler implements
 	private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq,
 																   String entityURI) {
 
-        Portal portal = vreq.getPortal();
         String standaloneTemplate = "entityComparisonOnPublicationsStandalone.ftl";
 		
         String organizationLabel = EntityComparisonUtilityFunctions
@@ -258,7 +256,6 @@ public class EntityPublicationCountRequestHandler implements
         														   entityURI);
         
         Map<String, Object> body = new HashMap<String, Object>();
-        body.put("portalBean", portal);
         body.put("title", organizationLabel + " - Temporal Graph Visualization");
         body.put("organizationURI", entityURI);
         body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java
index 6e2d55ea..4ec78bb8 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalGrantVisualizationRequestHandler.java
@@ -16,7 +16,6 @@ import org.apache.commons.logging.Log;
 import com.google.gson.Gson;
 import com.hp.hpl.jena.query.Dataset;
 
-import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
@@ -282,14 +281,12 @@ public class TemporalGrantVisualizationRequestHandler implements
 	private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq,
 			   String entityURI) {
 
-		Portal portal = vreq.getPortal();
 		String standaloneTemplate = "entityComparisonOnGrantsStandalone.ftl";
 		
 		String organizationLabel = EntityComparisonUtilityFunctions.getEntityLabelFromDAO(vreq,
 											  entityURI);
 		
 		Map<String, Object> body = new HashMap<String, Object>();
-		body.put("portalBean", portal);
 		body.put("title", organizationLabel + " - Temporal Graph Visualization");
 		body.put("organizationURI", entityURI);
 		body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java
index 13a6095c..2bc21564 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitycomparison/cached/TemporalPublicationVisualizationRequestHandler.java
@@ -16,7 +16,6 @@ import org.apache.commons.logging.Log;
 import com.google.gson.Gson;
 import com.hp.hpl.jena.query.Dataset;
 
-import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
@@ -273,7 +272,6 @@ public class TemporalPublicationVisualizationRequestHandler implements
 	private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq,
 																   String entityURI) {
 
-        Portal portal = vreq.getPortal();
         String standaloneTemplate = "entityComparisonOnPublicationsStandalone.ftl";
 		
         String organizationLabel = EntityComparisonUtilityFunctions
@@ -281,7 +279,6 @@ public class TemporalPublicationVisualizationRequestHandler implements
         														   entityURI);
         
         Map<String, Object> body = new HashMap<String, Object>();
-        body.put("portalBean", portal);
         body.put("title", organizationLabel + " - Temporal Graph Visualization");
         body.put("organizationURI", entityURI);
         body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java
index 964a40a2..f1abdcd5 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/entitygrantcount/EntityGrantCountRequestHandler.java
@@ -17,7 +17,6 @@ import com.google.gson.Gson;
 import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.rdf.model.Model;
 
-import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
@@ -249,14 +248,12 @@ public class EntityGrantCountRequestHandler implements
 	private TemplateResponseValues prepareStandaloneMarkupResponse(VitroRequest vreq,
 			   String entityURI) {
 
-		Portal portal = vreq.getPortal();
 		String standaloneTemplate = "entityComparisonOnGrantsStandalone.ftl";
 		
 		String organizationLabel = EntityComparisonUtilityFunctions.getEntityLabelFromDAO(vreq,
 											  entityURI);
 		
 		Map<String, Object> body = new HashMap<String, Object>();
-		body.put("portalBean", portal);
 		body.put("title", organizationLabel + " - Temporal Graph Visualization");
 		body.put("organizationURI", entityURI);
 		body.put("organizationLocalName", UtilityFunctions.getIndividualLocalName(entityURI, vreq));
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java
index 3ab4deee..7ebcaffe 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java
@@ -13,19 +13,18 @@ import org.apache.commons.logging.Log;
 
 import com.hp.hpl.jena.query.Dataset;
 
-import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants;
 import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.DataVisualizationController;
+import edu.cornell.mannlib.vitro.webapp.controller.visualization.freemarker.VisualizationFrameworkConstants;
 import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Activity;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.Individual;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.valueobjects.SparklineData;
+import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.UtilityFunctions;
 import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.VisualizationRequestHandler;
-import edu.cornell.mannlib.vitro.webapp.visualization.freemarker.visutils.QueryRunner;
 
 
 /**
@@ -244,13 +243,10 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
 	 */
 	private TemplateResponseValues prepareStandaloneResponse(VitroRequest vreq,
 			SparklineData valueObjectContainer) {
-
-        Portal portal = vreq.getPortal();
         
         String standaloneTemplate = "personGrantCountStandaloneActivator.ftl";
 
         Map<String, Object> body = new HashMap<String, Object>();
-        body.put("portalBean", portal);
         body.put("title", "Individual Grant Count visualization");
         body.put("sparklineVO", valueObjectContainer);
 
@@ -271,13 +267,9 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
 			SparklineData valueObjectContainer, 
 			boolean shouldVIVOrenderVis) {
 
-        Portal portal = vreq.getPortal();
-
-
         String dynamicTemplate = "personGrantCountDynamicActivator.ftl";
 
         Map<String, Object> body = new HashMap<String, Object>();
-        body.put("portalBean", portal);
         body.put("sparklineVO", valueObjectContainer);
         body.put("shouldVIVOrenderVis", shouldVIVOrenderVis);
         
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java
index 0e028363..b6c6e27d 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personlevel/PersonLevelRequestHandler.java
@@ -11,7 +11,6 @@ import org.apache.commons.logging.Log;
 import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.rdf.model.Model;
 
-import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
@@ -230,7 +229,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
 		
 		Map<String, Object> body = new HashMap<String, Object>();
 		
-        Portal portal = vitroRequest.getPortal();
         String	standaloneTemplate = "coAuthorPersonLevel.ftl";
         
         body.put("egoURIParam", egoURI);
@@ -253,7 +251,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
 		body.put("egoPubSparklineVO", egoPubSparklineVO);
 		body.put("uniqueCoauthorsSparklineVO", uniqueCoauthorsSparklineVO);
 
-		body.put("portalBean", portal);
 		body.put("title",  title + "Person Level Visualization");
 
 		return new TemplateResponseValues(standaloneTemplate, body);
@@ -268,8 +265,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
 					VitroRequest vitroRequest) {
 		
 		Map<String, Object> body = new HashMap<String, Object>();
-
-		Portal portal = vitroRequest.getPortal();
         
         body.put("egoURIParam", egoURI);
         
@@ -291,7 +286,6 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
 		body.put("egoGrantSparklineVO", egoGrantSparklineVO);
 		body.put("uniqueCoInvestigatorsSparklineVO", uniqueCopisSparklineVO);        	
 
-		body.put("portalBean", portal);
 		body.put("title",  title + "Person Level Visualization");
 
 		return new TemplateResponseValues(standaloneTemplate, body);
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java
index d6182cb0..ec8a7b07 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/personpubcount/PersonPublicationCountRequestHandler.java
@@ -13,7 +13,6 @@ import org.apache.commons.logging.Log;
 
 import com.hp.hpl.jena.query.Dataset;
 
-import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
@@ -253,12 +252,9 @@ VisualizationRequestHandler {
 	private TemplateResponseValues prepareStandaloneResponse(VitroRequest vreq,
 			SparklineData valueObjectContainer) {
 
-		Portal portal = vreq.getPortal();
-
 		String standaloneTemplate = "personPublicationCountStandaloneActivator.ftl";
 
 		Map<String, Object> body = new HashMap<String, Object>();
-		body.put("portalBean", portal);
 		body.put("title", "Individual Publication Count visualization");
 		body.put("sparklineVO", valueObjectContainer);
 
@@ -278,12 +274,9 @@ VisualizationRequestHandler {
 	private TemplateResponseValues prepareDynamicResponse(VitroRequest vreq,
 			SparklineData valueObjectContainer, boolean shouldVIVOrenderVis) {
 
-		Portal portal = vreq.getPortal();
-
 		String dynamicTemplate = "personPublicationCountDynamicActivator.ftl";
 
 		Map<String, Object> body = new HashMap<String, Object>();
-		body.put("portalBean", portal);
 		body.put("sparklineVO", valueObjectContainer);
 		body.put("shouldVIVOrenderVis", shouldVIVOrenderVis);
 
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java
index 3a235a44..ece95482 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/visutils/UtilityFunctions.java
@@ -19,7 +19,6 @@ import org.joda.time.format.DateTimeFormatter;
 import com.google.gson.Gson;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
@@ -132,10 +131,7 @@ public class UtilityFunctions {
     													   String errorMessage, 
     													   VitroRequest vitroRequest) {
 
-        Portal portal = vitroRequest.getPortal();
-
         Map<String, Object> body = new HashMap<String, Object>();
-        body.put("portalBean", portal);
         body.put("error", errorMessage);
         body.put("title", errorPageTitle);
         
diff --git a/themes/vivo-basic/templates/menu.ftl b/themes/vivo-basic/templates/menu.ftl
index c98b7816..b665f0e2 100644
--- a/themes/vivo-basic/templates/menu.ftl
+++ b/themes/vivo-basic/templates/menu.ftl
@@ -17,16 +17,6 @@
         <div id="searchBlock">
             <form id="searchForm" action="${urls.search}" >
                 <label for="search">Search </label>
-
-                <#if user.showFlag1SearchField>
-                    <select id="search-form-modifier" name="flag1" class="form-item" >
-                        <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
-                        <option value="${portalId}">${siteTagline!}</option>
-                    </select>
-                <#else>
-                    <input type="hidden" name="flag1" value="${portalId}" />
-                </#if>
-
                 <input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" />
                 <input class="search-form-submit" name="submit" type="submit"  value="Search" />
             </form>