diff --git a/autotests/unit/file/CMakeLists.txt b/autotests/unit/file/CMakeLists.txt
--- a/autotests/unit/file/CMakeLists.txt
+++ b/autotests/unit/file/CMakeLists.txt
@@ -5,16 +5,6 @@
   )
 endif()
 
-set (metadatamovertest_SOURCES
-    metadatamovertest.cpp
-)
-
-qt5_add_dbus_adaptor(metadatamovertest_SOURCES
-    ${CMAKE_SOURCE_DIR}/src/file/org.kde.BalooWatcherApplication.xml
-    metadatamovertest.h MetadataMoverTestDBusSpy)
-
-ecm_add_test(${metadatamovertest_SOURCES} TEST_NAME metadatamovertest LINK_LIBRARIES Qt5::Test baloofilecommon KF5::Baloo)
-
 MACRO(BALOO_FILE_AUTO_TESTS)
   FOREACH(_testname ${ARGN})
     ecm_add_test(${_testname}.cpp TEST_NAME ${_testname} LINK_LIBRARIES Qt5::Test baloofilecommon KF5::Baloo)
@@ -28,6 +18,7 @@
     regularexpcachebenchmark
     filtereddiriteratortest
     unindexedfileiteratortest
+    metadatamovertest
     fileinfotest
 )
 
diff --git a/autotests/unit/file/filewatchtest.cpp b/autotests/unit/file/filewatchtest.cpp
--- a/autotests/unit/file/filewatchtest.cpp
+++ b/autotests/unit/file/filewatchtest.cpp
@@ -23,7 +23,6 @@
 #include "database.h"
 #include "fileindexerconfig.h"
 #include "pendingfilequeue.h"
-#include "mainhub.h"
 #include "../lib/xattrdetector.h"
 #include "../lib/baloo_xattr_p.h"
 
@@ -38,37 +37,7 @@
     Q_OBJECT
 private Q_SLOTS:
 
-    void init()
-    {
-        m_tempDir = new QTemporaryDir();
-        m_db = new Database(m_tempDir->path());
-        m_db->open(Database::CreateDatabase);
-        m_dbusInterface = new MainHub(m_db, &m_config, false);
-    }
-
     void testFileCreation();
-
-    void cleanupTestCase()
-    {
-        delete m_dbusInterface;
-        m_dbusInterface = nullptr;
-
-        delete m_db;
-        m_db = nullptr;
-
-        delete m_tempDir;
-        m_tempDir = nullptr;
-    }
-
-private:
-
-    FileIndexerConfig m_config;
-
-    Database* m_db;
-
-    QTemporaryDir* m_tempDir;
-
-    Baloo::MainHub *m_dbusInterface;
 };
 
 }
@@ -108,7 +77,7 @@
 
     FileIndexerConfig config;
 
-    FileWatch fileWatch(&db, &config, m_dbusInterface);
+    FileWatch fileWatch(&db, &config);
     fileWatch.m_pendingFileQueue->setMaximumTimeout(0);
     fileWatch.m_pendingFileQueue->setMinimumTimeout(0);
     fileWatch.m_pendingFileQueue->setTrackingTime(0);
diff --git a/autotests/unit/file/metadatamovertest.h b/autotests/unit/file/metadatamovertest.h
deleted file mode 100644
--- a/autotests/unit/file/metadatamovertest.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file is part of the KDE Baloo Project
- * Copyright (C) 2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#if !defined METADATAMOVERTEST_H_
-#define METADATAMOVERTEST_H_
-
-#include <QObject>
-#include <QStringList>
-#include <QString>
-
-class MetadataMoverTestDBusSpy : public QObject
-{
-    Q_OBJECT
-public:
-
-    MetadataMoverTestDBusSpy(QObject* parent = nullptr);
-
-Q_SIGNALS:
-
-    void fileMetaDataChanged(QStringList fileList);
-
-    void renamedFilesSignal(const QString &from, const QString &to, const QStringList &listFiles);
-
-public Q_SLOTS:
-
-    void slotFileMetaDataChanged(QStringList fileList);
-
-    void renamedFiles(const QString &from, const QString &to, const QStringList &listFiles);
-
-};
-
-#endif
diff --git a/autotests/unit/file/metadatamovertest.cpp b/autotests/unit/file/metadatamovertest.cpp
--- a/autotests/unit/file/metadatamovertest.cpp
+++ b/autotests/unit/file/metadatamovertest.cpp
@@ -18,22 +18,18 @@
  *
  */
 
-#include "metadatamovertest.h"
 #include "metadatamover.h"
-#include "baloowatcherapplicationadaptor.h"
 
 #include "database.h"
 #include "transaction.h"
 #include "document.h"
 #include "basicindexingjob.h"
-#include "mainhub.h"
 
 #include <QSignalSpy>
 #include <QTemporaryDir>
 #include <QTest>
 #include <QDir>
 #include <qtemporaryfile.h>
-#include <QDBusConnection>
 
 using namespace Baloo;
 
@@ -56,10 +52,7 @@
 private:
     quint64 insertUrl(const QString& url);
 
-    FileIndexerConfig m_config;
-
     Database* m_db;
-
     QTemporaryDir* m_tempDir;
 };
 
@@ -99,10 +92,6 @@
 
 void MetadataMoverTest::testRemoveFile()
 {
-    MetadataMoverTestDBusSpy dbusSignalSpy;
-    QSignalSpy renamedFilesSignalSpy(&dbusSignalSpy, &MetadataMoverTestDBusSpy::renamedFilesSignal);
-    QSignalSpy fileChangedSpy(&dbusSignalSpy, &MetadataMoverTestDBusSpy::fileMetaDataChanged);
-
     QTemporaryFile file;
     file.open();
     QString url = file.fileName();
@@ -113,25 +102,10 @@
         QVERIFY(tr.hasDocument(fid));
     }
 
-    renamedFilesSignalSpy.wait(100);
-    fileChangedSpy.wait(100);
-
-    QCOMPARE(renamedFilesSignalSpy.count(), 0);
-    QCOMPARE(fileChangedSpy.count(), 0);
-
     MetadataMover mover(m_db, this);
-
-    mover.registerBalooWatcher(QStringLiteral("org.kde.baloo.metadatamovertest/org/kde/BalooWatcherApplication"));
-
     file.remove();
     mover.removeFileMetadata(url);
 
-    renamedFilesSignalSpy.wait(100);
-    fileChangedSpy.wait(100);
-
-    QCOMPARE(renamedFilesSignalSpy.count(), 0);
-    QCOMPARE(fileChangedSpy.count(), 0);
-
     {
         Transaction tr(m_db, Transaction::ReadOnly);
         QVERIFY(!tr.hasDocument(fid));
@@ -153,10 +127,6 @@
 
 void MetadataMoverTest::testRenameFile()
 {
-    MetadataMoverTestDBusSpy dbusSignalSpy;
-    QSignalSpy renamedFilesSignalSpy(&dbusSignalSpy, &MetadataMoverTestDBusSpy::renamedFilesSignal);
-    QSignalSpy fileChangedSpy(&dbusSignalSpy, &MetadataMoverTestDBusSpy::fileMetaDataChanged);
-
     QTemporaryDir dir;
 
     QString url = dir.path() + "/file";
@@ -168,26 +138,11 @@
         QVERIFY(tr.hasDocument(fid));
     }
 
-    renamedFilesSignalSpy.wait(100);
-    fileChangedSpy.wait(100);
-
-    QCOMPARE(renamedFilesSignalSpy.count(), 0);
-    QCOMPARE(fileChangedSpy.count(), 0);
-
     MetadataMover mover(m_db, this);
-
-    mover.registerBalooWatcher(QStringLiteral("org.kde.baloo.metadatamovertest/org/kde/BalooWatcherApplication"));
-
     QString url2 = dir.path() + "/file2";
     QFile::rename(url, url2);
     mover.moveFileMetadata(QFile::encodeName(url), QFile::encodeName(url2));
 
-    renamedFilesSignalSpy.wait(100);
-    fileChangedSpy.wait(100);
-
-    QCOMPARE(renamedFilesSignalSpy.count(), 1);
-    QCOMPARE(fileChangedSpy.count(), 0);
-
     {
         Transaction tr(m_db, Transaction::ReadOnly);
         QVERIFY(tr.hasDocument(fid));
@@ -197,10 +152,6 @@
 
 void MetadataMoverTest::testMoveFile()
 {
-    MetadataMoverTestDBusSpy dbusSignalSpy;
-    QSignalSpy renamedFilesSignalSpy(&dbusSignalSpy, &MetadataMoverTestDBusSpy::renamedFilesSignal);
-    QSignalSpy fileChangedSpy(&dbusSignalSpy, &MetadataMoverTestDBusSpy::fileMetaDataChanged);
-
     QTemporaryDir dir;
     QDir().mkpath(dir.path() + "/a/b/c");
 
@@ -213,26 +164,11 @@
         QVERIFY(tr.hasDocument(fid));
     }
 
-    renamedFilesSignalSpy.wait(100);
-    fileChangedSpy.wait(100);
-
-    QCOMPARE(renamedFilesSignalSpy.count(), 0);
-    QCOMPARE(fileChangedSpy.count(), 0);
-
     MetadataMover mover(m_db, this);
-
-    mover.registerBalooWatcher(QStringLiteral("org.kde.baloo.metadatamovertest/org/kde/BalooWatcherApplication"));
-
     QString url2 = dir.path() + "/file2";
     QFile::rename(url, url2);
     mover.moveFileMetadata(QFile::encodeName(url), QFile::encodeName(url2));
 
-    renamedFilesSignalSpy.wait(100);
-    fileChangedSpy.wait(100);
-
-    QCOMPARE(renamedFilesSignalSpy.count(), 1);
-    QCOMPARE(fileChangedSpy.count(), 0);
-
     {
         Transaction tr(m_db, Transaction::ReadOnly);
         QVERIFY(tr.hasDocument(fid));
@@ -242,10 +178,6 @@
 
 void MetadataMoverTest::testMoveFolder()
 {
-    MetadataMoverTestDBusSpy dbusSignalSpy;
-    QSignalSpy renamedFilesSignalSpy(&dbusSignalSpy, &MetadataMoverTestDBusSpy::renamedFilesSignal);
-    QSignalSpy fileChangedSpy(&dbusSignalSpy, &MetadataMoverTestDBusSpy::fileMetaDataChanged);
-
     QTemporaryDir dir;
 
     QString folder = dir.path() + "/folder";
@@ -262,26 +194,11 @@
         QVERIFY(tr.hasDocument(fid));
     }
 
-    renamedFilesSignalSpy.wait(100);
-    fileChangedSpy.wait(100);
-
-    QCOMPARE(renamedFilesSignalSpy.count(), 0);
-    QCOMPARE(fileChangedSpy.count(), 0);
-
     QString newFolderUrl = dir.path() + "/dir";
     QFile::rename(folder, newFolderUrl);
     MetadataMover mover(m_db, this);
-
-    mover.registerBalooWatcher(QStringLiteral("org.kde.baloo.metadatamovertest/org/kde/BalooWatcherApplication"));
-
     mover.moveFileMetadata(QFile::encodeName(folder), QFile::encodeName(newFolderUrl));
 
-    renamedFilesSignalSpy.wait(100);
-    fileChangedSpy.wait(100);
-
-    QCOMPARE(renamedFilesSignalSpy.count(), 1);
-    QCOMPARE(fileChangedSpy.count(), 0);
-
     {
         Transaction tr(m_db, Transaction::ReadOnly);
         QVERIFY(tr.hasDocument(did));
@@ -291,32 +208,6 @@
     }
 }
 
-
-
-MetadataMoverTestDBusSpy::MetadataMoverTestDBusSpy(QObject *parent) : QObject(parent)
-{
-    QDBusConnection con = QDBusConnection::sessionBus();
-
-    con.connect(QString(), QStringLiteral("/files"), QStringLiteral("org.kde"),
-                QStringLiteral("changed"), this, SLOT(slotFileMetaDataChanged(QStringList)));
-
-
-    auto mDbusAdaptor = new BalooWatcherApplicationAdaptor(this);
-
-    QCOMPARE(con.registerService(QStringLiteral("org.kde.baloo.metadatamovertest")), true);
-    QCOMPARE(con.registerObject(QStringLiteral("/org/kde/BalooWatcherApplication"), mDbusAdaptor, QDBusConnection::ExportAllContents), true);
-}
-
-void MetadataMoverTestDBusSpy::slotFileMetaDataChanged(QStringList fileList)
-{
-    Q_EMIT fileMetaDataChanged(fileList);
-}
-
-void MetadataMoverTestDBusSpy::renamedFiles(const QString &from, const QString &to, const QStringList &listFiles)
-{
-    Q_EMIT renamedFilesSignal(from, to, listFiles);
-}
-
 QTEST_GUILESS_MAIN(MetadataMoverTest)
 
 #include "metadatamovertest.moc"
diff --git a/src/engine/transaction.h b/src/engine/transaction.h
--- a/src/engine/transaction.h
+++ b/src/engine/transaction.h
@@ -64,7 +64,6 @@
      * \p path into an id.
      */
     quint64 documentId(const QByteArray& path) const;
-    QVector<quint64> childrenDocumentId(quint64 parentId) const;
     QByteArray documentData(quint64 id) const;
 
     DocumentTimeDB::TimeInfo documentTimeInfo(quint64 id) const;
diff --git a/src/engine/transaction.cpp b/src/engine/transaction.cpp
--- a/src/engine/transaction.cpp
+++ b/src/engine/transaction.cpp
@@ -141,13 +141,6 @@
     return parentId;
 }
 
-QVector<quint64> Transaction::childrenDocumentId(quint64 parentId) const
-{
-    DocumentUrlDB docUrlDB(m_dbis.idTreeDbi, m_dbis.idFilenameDbi, m_txn);
-
-    return docUrlDB.getChildren(parentId);
-}
-
 DocumentTimeDB::TimeInfo Transaction::documentTimeInfo(quint64 id) const
 {
     Q_ASSERT(m_txn);
diff --git a/src/file/CMakeLists.txt b/src/file/CMakeLists.txt
--- a/src/file/CMakeLists.txt
+++ b/src/file/CMakeLists.txt
@@ -47,6 +47,7 @@
 
 ecm_qt_declare_logging_category(file_static_lib_SRCS HEADER baloodebug.h IDENTIFIER BALOO CATEGORY_NAME org.kde.baloo)
 
+# KF6 TODO - remove BalooWatcherApplication
 qt5_add_dbus_interface(file_static_lib_SRCS org.kde.BalooWatcherApplication.xml baloowatcherapplication_interface)
 kconfig_add_kcfg_files(file_static_lib_SRCS ../lib/baloosettings.kcfgc GENERATE_MOC)
 
diff --git a/src/file/filewatch.h b/src/file/filewatch.h
--- a/src/file/filewatch.h
+++ b/src/file/filewatch.h
@@ -31,14 +31,13 @@
 class FileIndexerConfig;
 class PendingFileQueue;
 class FileWatchTest;
-class MainHub;
 
 class FileWatch : public QObject
 {
     Q_OBJECT
 
 public:
-    FileWatch(Database* db, FileIndexerConfig* config, Baloo::MainHub *dbusInterface, QObject* parent = nullptr);
+    FileWatch(Database* db, FileIndexerConfig* config, QObject* parent = nullptr);
     ~FileWatch();
 
 public Q_SLOTS:
@@ -51,8 +50,6 @@
 
     void watchIndexedFolders();
 
-    void registerBalooWatcher(const QString &service);
-
 Q_SIGNALS:
     void indexNewFile(const QString& string);
     void indexModifiedFile(const QString& string);
diff --git a/src/file/filewatch.cpp b/src/file/filewatch.cpp
--- a/src/file/filewatch.cpp
+++ b/src/file/filewatch.cpp
@@ -36,7 +36,7 @@
 
 using namespace Baloo;
 
-FileWatch::FileWatch(Database* db, FileIndexerConfig* config, Baloo::MainHub *dbusInterface, QObject* parent)
+FileWatch::FileWatch(Database* db, FileIndexerConfig* config, QObject* parent)
     : QObject(parent)
     , m_db(db)
     , m_config(config)
@@ -82,15 +82,6 @@
     }
 }
 
-void FileWatch::registerBalooWatcher(const QString &service)
-{
-    if (!m_metadataMover) {
-        return;
-    }
-
-    m_metadataMover->registerBalooWatcher(service);
-}
-
 // FIXME: listen to Create for folders!
 void FileWatch::watchFolder(const QString& path)
 {
diff --git a/src/file/mainhub.h b/src/file/mainhub.h
--- a/src/file/mainhub.h
+++ b/src/file/mainhub.h
@@ -41,6 +41,7 @@
 public Q_SLOTS:
     Q_SCRIPTABLE void quit() const;
     Q_SCRIPTABLE void updateConfig();
+    // TODO KF6 - remove
     Q_SCRIPTABLE void registerBalooWatcher(const QString &service);
 
 private:
diff --git a/src/file/mainhub.cpp b/src/file/mainhub.cpp
--- a/src/file/mainhub.cpp
+++ b/src/file/mainhub.cpp
@@ -77,7 +77,6 @@
     m_fileIndexScheduler.updateConfig();
 }
 
-void MainHub::registerBalooWatcher(const QString &service)
+void MainHub::registerBalooWatcher(const QString &)
 {
-    m_fileWatcher.registerBalooWatcher(service);
 }
diff --git a/src/file/metadatamover.h b/src/file/metadatamover.h
--- a/src/file/metadatamover.h
+++ b/src/file/metadatamover.h
@@ -21,22 +21,6 @@
 #define BALOO_METADATA_MOVER_H_
 
 #include <QObject>
-#include <QDBusServiceWatcher>
-#include <QMap>
-
-class OrgKdeBalooWatcherApplicationInterface;
-
-namespace org
-{
-
-namespace kde
-{
-
-typedef ::OrgKdeBalooWatcherApplicationInterface BalooWatcherApplication;
-
-}
-
-}
 
 namespace Baloo
 {
@@ -52,14 +36,10 @@
     MetadataMover(Database* db, QObject* parent = nullptr);
     ~MetadataMover();
 
-    bool hasWatcher() const;
-
 public Q_SLOTS:
     void moveFileMetadata(const QString& from, const QString& to);
     void removeFileMetadata(const QString& file);
 
-    void registerBalooWatcher(const QString &service);
-
 Q_SIGNALS:
     /**
      * Emitted for files (and folders) that have been moved but
@@ -72,10 +52,6 @@
 
     void fileRemoved(const QString& path);
 
-private Q_SLOTS:
-
-    void watcherServiceUnregistered(const QString &serviceName);
-
 private:
     /**
      * Remove the metadata for file \p url
@@ -88,12 +64,6 @@
      */
     void updateMetadata(Transaction* tr, const QString& from, const QString& to);
 
-    void notifyWatchers(const QString &from, const QString &to, const QList<QString> &filesList);
-
-    QMap<QString, org::kde::BalooWatcherApplication*> m_watcherApplications;
-
-    QDBusServiceWatcher m_serviceWatcher;
-
     Database* m_db;
 };
 }
diff --git a/src/file/metadatamover.cpp b/src/file/metadatamover.cpp
--- a/src/file/metadatamover.cpp
+++ b/src/file/metadatamover.cpp
@@ -22,48 +22,23 @@
 #include "transaction.h"
 #include "basicindexingjob.h"
 #include "idutils.h"
-#include "mainhub.h"
 #include "baloodebug.h"
 
-#include "baloowatcherapplication_interface.h"
-
 #include <QFile>
-#include <QDBusConnection>
 
 using namespace Baloo;
 
 MetadataMover::MetadataMover(Database* db, QObject* parent)
     : QObject(parent)
     , m_db(db)
 {
-    m_serviceWatcher.setConnection(QDBusConnection::sessionBus());
-    m_serviceWatcher.setWatchMode(QDBusServiceWatcher::WatchForUnregistration);
-
-    connect(&m_serviceWatcher, &QDBusServiceWatcher::serviceUnregistered,
-            this, &MetadataMover::watcherServiceUnregistered);
 }
 
 
 MetadataMover::~MetadataMover()
 {
 }
 
-bool MetadataMover::hasWatcher() const
-{
-    return !m_watcherApplications.isEmpty();
-}
-
-
-static void buildRecursiveList(quint64 parentId, QList<QString> &fileList, Transaction &tr)
-{
-    fileList.push_back(QFile::decodeName(tr.documentUrl(parentId)));
-
-    const auto childrenIds = tr.childrenDocumentId(parentId);
-
-    for (const auto oneChildren : childrenIds) {
-        buildRecursiveList(oneChildren, fileList, tr);
-    }
-}
 
 void MetadataMover::moveFileMetadata(const QString& from, const QString& to)
 {
@@ -73,27 +48,14 @@
 
     Transaction tr(m_db, Transaction::ReadWrite);
 
-    quint64 id = tr.documentId(QFile::encodeName(from));
-    QList<QString> filesList;
-    qCDebug(BALOO) << "MetadataMover::moveFileMetadata" << (hasWatcher() ? "has watcher" : "has no watcher");
-    qCDebug(BALOO) << "MetadataMover::moveFileMetadata" << "id" << id;
-    if (id && hasWatcher()) {
-        buildRecursiveList(id, filesList, tr);
-    }
-
     // We do NOT get deleted messages for overwritten files! Thus, we
     // have to remove all metadata for overwritten files first.
     removeMetadata(&tr, to);
 
     // and finally update the old statements
     updateMetadata(&tr, from, to);
 
     tr.commit();
-
-    if (hasWatcher()) {
-        qCDebug(BALOO) << "MetadataMover::moveFileMetadata" << "notifyWatchers" << filesList;
-        notifyWatchers(from, to, filesList);
-    }
 }
 
 void MetadataMover::removeFileMetadata(const QString& file)
@@ -105,23 +67,6 @@
     tr.commit();
 }
 
-void MetadataMover::registerBalooWatcher(const QString &service)
-{
-    int firstSlash = service.indexOf('/');
-    if (firstSlash == -1) {
-        return;
-    }
-
-    QString dbusServiceName = service.left(firstSlash);
-    QString dbusPath = service.mid(firstSlash);
-
-    m_serviceWatcher.addWatchedService(dbusServiceName);
-
-    m_watcherApplications.insert(dbusServiceName, new org::kde::BalooWatcherApplication(dbusServiceName, dbusPath, QDBusConnection::sessionBus(), this));
-
-    qCDebug(BALOO) << "MetadataMover::registerBalooWatcher" << service << dbusServiceName << dbusPath;
-}
-
 void MetadataMover::removeMetadata(Transaction* tr, const QString& url)
 {
     Q_ASSERT(!url.isEmpty());
@@ -174,24 +119,3 @@
     // 1. file moves to the same device - id is preserved
     // 2. file moves to a different device - id is not preserved
 }
-
-void MetadataMover::notifyWatchers(const QString &from, const QString &to, const QList<QString> &filesList)
-{
-    for (org::kde::BalooWatcherApplication *watcherApplication : qAsConst(m_watcherApplications)) {
-        qCDebug(BALOO) << "MetadataMover::notifyWatchers" << watcherApplication->service() << watcherApplication->objectName() << watcherApplication->path();
-        watcherApplication->renamedFiles(from, to, filesList);
-    }
-}
-
-void MetadataMover::watcherServiceUnregistered(const QString &serviceName)
-{
-    auto itService = m_watcherApplications.find(serviceName);
-    if (itService == m_watcherApplications.end()) {
-        return;
-    }
-
-    qCDebug(BALOO) << "MetadataMover::watcherServiceUnregistered" << itService.key();
-
-    delete itService.value();
-    m_watcherApplications.erase(itService);
-}