diff --git a/configdefinitions/src/vespa/CMakeLists.txt b/configdefinitions/src/vespa/CMakeLists.txt
index 81e587fcace..0ab12932880 100644
--- a/configdefinitions/src/vespa/CMakeLists.txt
+++ b/configdefinitions/src/vespa/CMakeLists.txt
@@ -6,8 +6,6 @@ vespa_add_library(configdefinitions
 )
 vespa_generate_config(configdefinitions application-id.def)
 install_config_definition(application-id.def cloud.config.application-id.def)
-vespa_generate_config(configdefinitions athenz-provider-service.def)
-install_config_definition(athenz-provider-service.def vespa.hosted.athenz.instanceproviderservice.config.athenz-provider-service.def)
 vespa_generate_config(configdefinitions attributes.def)
 install_config_definition(attributes.def vespa.config.search.attributes.def)
 vespa_generate_config(configdefinitions cluster-info.def)
diff --git a/configdefinitions/src/vespa/athenz-provider-service.def b/configdefinitions/src/vespa/athenz-provider-service.def
deleted file mode 100644
index 5ee9be323e8..00000000000
--- a/configdefinitions/src/vespa/athenz-provider-service.def
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=vespa.hosted.athenz.instanceproviderservice.config
-
-# Athenz domain
-domain                                    string
-
-# Athenz service name
-serviceName                               string
-
-# Secret name of private Key
-secretName                                string
-
-# Secret version
-secretVersion                             int
-
-# Tempory resources
-sisSecretName                             string default=""
-sisSecretVersion                          int default=0
-sisUrl                                    string default = ""
-
-# Secret name of CA certificate
-caCertSecretName                          string
-
-# Certificate DNS suffix
-certDnsSuffix                             string default=""
-
-# Athenz ZTS server url
-ztsUrl                                    string default=""
-
-# Path to Athenz CA JKS trust store
-athenzCaTrustStore                        string default=""
-
-# Period between certificate updates
-updatePeriodDays                          int  default=1
-
-# Tenant Service id
-tenantService                             string default=vespa.vespa.tenant
diff --git a/configserver/src/main/resources/configserver-app/services.xml b/configserver/src/main/resources/configserver-app/services.xml
index fb6516ce6cf..d71840a95c2 100644
--- a/configserver/src/main/resources/configserver-app/services.xml
+++ b/configserver/src/main/resources/configserver-app/services.xml
@@ -45,13 +45,11 @@
     </components>
 
     <preprocess:include file='config-models.xml' required='false' />
-    <preprocess:include file='routing-status.xml' required='false' />
     <preprocess:include file='model-integration.xml' required='true' />
 
     <component id="com.yahoo.vespa.configserver.flags.ConfigServerFlagSource" bundle="configserver-flags"/>
     <component id="com.yahoo.vespa.configserver.flags.db.FlagsDbImpl" bundle="configserver-flags"/>
 
-    <preprocess:include file='metrics-packets.xml' required='false' />
     <component id="com.yahoo.vespa.service.slobrok.SlobrokMonitorManagerImpl" bundle="service-monitor" />
     <component id="com.yahoo.vespa.service.health.HealthMonitorManager" bundle="service-monitor" />
     <component id="com.yahoo.vespa.service.manager.UnionMonitorManager" bundle="service-monitor" />
@@ -153,13 +151,9 @@
       <preprocess:include file='http-server.xml' required='false' />
     </http>
 
-    <preprocess:include file='athenz-identity-provider.xml' required='false' />
-
     <preprocess:include file='configserver-config.xml' required='false' />
 
     <preprocess:include file='configserver-components.xml' required='false' />
 
-    <preprocess:include file='zookeeper-server-config.xml' required='false' />
-
   </container>
 </services>