1 files changed, 1 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
index 81f901fc849..067d653ea40 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
@@ -128,9 +128,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
                 }
             } else if (equals("transactionlog", e)) {
                 for (Element subElem : XML.getChildren(e)) {
-                    if (equals("maxentries", subElem)) {
-                        deployLogger.log(Level.WARNING, "Element 'transactionlog.maxentries is deprecated and ignored in 'native' flush strategy. Use 'transactionlog.maxsize' to limit by size.");
-                    } else if (equals("maxsize", subElem)) {
+                    if (equals("maxsize", subElem)) {
                         fs.transactionLogMaxSize = asLong(subElem);
                     }
                 }
@@ -224,8 +222,6 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
                 c.maxSize = asLong(e);
             } else if (equals("maxsize-percent", e)) {
                 c.maxSizePercent = asDouble(e);
-            } else if (equals("maxentries", e)) {
-                deployLogger.log(Level.WARNING, "Element 'maxentries is deprecated and ignored. Will only limit by size.");
             } else if (equals("initialentries", e)) {
                 c.initialEntries = asLong(e);
             } else if (equals("compression", e)) {
@@ -250,15 +246,8 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
         for (Element e : XML.getChildren(spec)) {
             if (equals("maxfilesize", e)) {
                 s.logStore.maxFileSize = asLong(e);
-            } else if (equals("maxdiskbloatfactor", e)) {
-                deployLogger.log(Level.WARNING,
-                        "Element 'maxdiskbloatfactor is deprecated and ignored." +
-                        " The min value from flush.memory.xxx.diskbloatfactor is used instead");
             } else if (equals("minfilesizefactor", e)) {
                 s.logStore.minFileSizeFactor = asDouble(e);
-            } else if (equals("numthreads", e)) {
-                deployLogger.log(Level.WARNING, "Element 'numthreads is deprecated. Use feeding.concurrency instead.");
-                s.logStore.numThreads = asInt(e);
             } else if (equals("chunk", e)) {
                 s.logStore.chunk = new Tuning.SearchNode.Summary.Store.Component(true);
                 handleSummaryStoreComponent(deployLogger, e, s.logStore.chunk);