diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java
index 3567dba65..e641d7c22 100644
--- a/htroot/yacy/search.java
+++ b/htroot/yacy/search.java
@@ -225,7 +225,6 @@ public final class search {
                     abstractSet,
                     new RowHandleSet(WordReferenceRow.urlEntryRow.primaryKeyLength, WordReferenceRow.urlEntryRow.objectOrder, 0),
                     abstractSet,
-                    null,
                     modifier,
                     maxdist,
                     prefer,
@@ -291,7 +290,6 @@ public final class search {
                     queryhashes,
                     excludehashes,
                     allHashes,
-                    null,
                     modifier,
                     maxdist,
                     prefer,
diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java
index c2b9103f3..e43682135 100644
--- a/htroot/yacysearch.java
+++ b/htroot/yacysearch.java
@@ -499,21 +499,6 @@ public class yacysearch {
                 }
             }
 
-            String tenant = null;
-            if ( post.containsKey("tenant") ) {
-                tenant = post.get("tenant");
-                if ( tenant != null && tenant.isEmpty() ) {
-                    tenant = null;
-                }
-                if ( tenant != null ) {
-                    if ( urlmask == null ) {
-                        urlmask = ".*" + tenant + ".*";
-                    } else {
-                        urlmask = ".*" + tenant + urlmask;
-                    }
-                }
-            }
-
             final int site = querystring.indexOf("site:", 0);
             String sitehash = null;
             String sitehost = null;
@@ -746,7 +731,6 @@ public class yacysearch {
                     Word.words2hashesHandles(query[0]),
                     Word.words2hashesHandles(query[1]),
                     Word.words2hashesHandles(query[2]),
-                    tenant,
                     modifier.toString().trim(),
                     maxDistance,
                     prefermask,
diff --git a/source/net/yacy/cora/services/federated/solr/connector/ShardSolrConnector.java b/source/net/yacy/cora/services/federated/solr/connector/ShardSolrConnector.java
index 7903ce55c..04e272b39 100644
--- a/source/net/yacy/cora/services/federated/solr/connector/ShardSolrConnector.java
+++ b/source/net/yacy/cora/services/federated/solr/connector/ShardSolrConnector.java
@@ -32,7 +32,6 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 
 import net.yacy.cora.protocol.Domains;
-import net.yacy.cora.services.federated.solr.connector.ShardSelection.Method;
 
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
diff --git a/source/net/yacy/search/query/QueryParams.java b/source/net/yacy/search/query/QueryParams.java
index f8f80a1cd..7aeb26224 100644
--- a/source/net/yacy/search/query/QueryParams.java
+++ b/source/net/yacy/search/query/QueryParams.java
@@ -132,7 +132,6 @@ public final class QueryParams {
     public final String sitehash; // this is a domain hash, 6 bytes long or null
     public final Set<String> siteexcludes; // set of domain hashes that are excluded if not included by sitehash
     public final String authorhash;
-    public final String tenant;
     public final Modifier modifier;
     public Seed remotepeer;
     public final long starttime, maxtime, timeout; // the time when the query started, how long it should take and the time when the timeout is reached (milliseconds)
@@ -178,7 +177,6 @@ public final class QueryParams {
     		this.query_all_hashes = Word.words2hashesHandles(cq[2]);
     	}
     	this.ranking = ranking;
-    	this.tenant = null;
     	this.modifier = new Modifier("");
         this.maxDistance = Integer.MAX_VALUE;
         this.urlMask = catchall_pattern;
@@ -223,7 +221,6 @@ public final class QueryParams {
         final HandleSet queryHashes,
         final HandleSet excludeHashes,
         final HandleSet fullqueryHashes,
-        final String tenant,
         final String modifier,
         final int maxDistance, final String prefer, final ContentDomain contentdom,
         final String language,
@@ -252,7 +249,6 @@ public final class QueryParams {
         this.query_include_hashes = queryHashes;
         this.query_exclude_hashes = excludeHashes;
         this.query_all_hashes = fullqueryHashes;
-        this.tenant = (tenant != null && tenant.isEmpty()) ? null : tenant;
         this.modifier = new Modifier(modifier == null ? "" : modifier);
         this.ranking = ranking;
         this.maxDistance = maxDistance;