diff --git a/.etckeeper b/.etckeeper
index 8bab7684..96f70f9d 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -329,11 +329,9 @@ maybe chmod 0644 'ca-certificates.conf'
 maybe chmod 0755 'ca-certificates/update.d'
 maybe chmod 0755 'calendar'
 maybe chmod 0775 'check_mk'
-maybe chmod 0640 'check_mk/cmk-update-agent.cfg'
 maybe chmod 0640 'check_mk/docker.cfg'
 maybe chmod 0640 'check_mk/logwatch.cfg'
 maybe chmod 0640 'check_mk/mk_inventory.cfg'
-maybe chmod 0640 'check_mk/mk_mongodb.cfg'
 maybe chmod 0640 'check_mk/mk_redis.cfg'
 maybe chmod 0644 'check_mk/mysql.local.cfg'
 maybe chmod 0644 'check_mk/super-server.cfg'
@@ -3942,8 +3940,6 @@ maybe chmod 0755 'ppp/ip-down.d/postfix'
 maybe chmod 0755 'ppp/ip-up.d'
 maybe chmod 0755 'ppp/ip-up.d/clamav-freshclam-ifupdown'
 maybe chmod 0755 'ppp/ip-up.d/postfix'
-maybe chmod 0775 'prelink.conf.d'
-maybe chmod 0644 'prelink.conf.d/cmk-update-agent.conf'
 maybe chmod 0644 'profile'
 maybe chmod 0755 'profile.d'
 maybe chmod 0644 'profile.d/Z99-cloud-locale-test.sh'
diff --git a/check_mk/cmk-update-agent.cfg b/check_mk/cmk-update-agent.cfg
deleted file mode 100644
index 1dea3256..00000000
--- a/check_mk/cmk-update-agent.cfg
+++ /dev/null
@@ -1,31 +0,0 @@
-# Created by Check_MK Agent Bakery.
-# This file is managed via WATO, do not edit manually or you
-# lose your changes next time when you update the agent.
-
-{'activated': True,
- 'certificates': [],
- 'ignore_update_url': True,
- 'interval': 3600,
- 'protocol': 'http',
- 'proxy': None,
- 'server': '192.168.0.99',
- 'signature_keys': ['-----BEGIN CERTIFICATE-----\n'
-                    'MIIC2DCCAcACAQEwDQYJKoZIhvcNAQEFBQAwMTEcMBoGA1UECgwTQ2hlY2tfTUsg\n'
-                    'U2l0ZSByZWFsbTERMA8GA1UEAwwIY21rYWRtaW4wIBcNMjAwODIxMDk0NjE0WhgP\n'
-                    'MjA1MDA4MTQwOTQ2MTRaMDExHDAaBgNVBAoME0NoZWNrX01LIFNpdGUgcmVhbG0x\n'
-                    'ETAPBgNVBAMMCGNta2FkbWluMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC\n'
-                    'AQEAvBdk25ubecYpjBvPTuon1X9ZC5VQXbLkCZqMvKazygF/JwTluENnwZlDo4xn\n'
-                    'CIYcVTg7AP6D2dbX7+jrhlp5TuMyISKR5CuQX4gOwIrOVrufHdI7Bv19LwrFhKjZ\n'
-                    'Z0i1nycBgZBIlc5RN2fN25pLhMzqQppPHrKBNVEf/ARWjz4iQ4DmwAS+iqnFmw4x\n'
-                    'BYF0bSA25Cc+T/krptICidmoPJ2YbW8J0S/VBo1LUQ1pavGLgQ0X4cnZ98w86I+I\n'
-                    'izqOh9fl1BVdJm4j1l8qk87IkEDXLlnm4umUyLG8WBCFrG/Dnfjf0Akk+YQxhrZ8\n'
-                    '028Sl4ZHJiCHXeyF7BAMl2S+kwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA6j4uL\n'
-                    'qItEiNZp9RWO+Woon6Nj+zerIjz+ObYC86QLO8mwTSN2oQymssfXXy/iAfSoRsqK\n'
-                    'dZ6R/Jgc0iWukEnXTsEdWwHE8jGzwXncI6K7hJ+Yb4eaqlPIcAArodVAs6NwQ+BO\n'
-                    'Su6oKMuuKRZdeF2u7OxZTAG3uuNmFYwK0s32QthUYmqhDD9kuZCHSNfPjIg8Na1H\n'
-                    'sbmssgGLWZYZU3l4uFjT++F70u/GuQPx1ajE4E/Wjg1n4U4d3FnMIi77ZIS/Bb/R\n'
-                    'aQr14hY/weN8PXc8rs0+qwdYKfGg1+mxye62obUQt4I6EuAc1Sv5XnNwIefEDxVN\n'
-                    'wFWG11DIXR5sSb78\n'
-                    '-----END CERTIFICATE-----\n'],
- 'site': 'realm',
- 'use_proxy_env': False}
diff --git a/check_mk/mk_mongodb.cfg b/check_mk/mk_mongodb.cfg
deleted file mode 100644
index fe3c15de..00000000
--- a/check_mk/mk_mongodb.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Created by Check_MK Agent Bakery.
-# This file is managed via WATO, do not edit manually or you
-# lose your changes next time when you update the agent.
-
-[MONGODB]
diff --git a/prelink.conf.d/cmk-update-agent.conf b/prelink.conf.d/cmk-update-agent.conf
deleted file mode 100644
index d24ebf54..00000000
--- a/prelink.conf.d/cmk-update-agent.conf
+++ /dev/null
@@ -1 +0,0 @@
--b cmk-update-agent