diff --git a/src/crypto/gui/resolverecipientspage.h b/src/crypto/gui/resolverecipientspage.h
index fc63f7c2b..2be229586 100644
--- a/src/crypto/gui/resolverecipientspage.h
+++ b/src/crypto/gui/resolverecipientspage.h
@@ -1,111 +1,105 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     crypto/gui/resolverecipientspage.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef __KLEOPATRA_CRYPTO_GUI_RESOLVERECIPIENTSPAGE_H__
 #define __KLEOPATRA_CRYPTO_GUI_RESOLVERECIPIENTSPAGE_H__
 
 #include <crypto/gui/wizardpage.h>
 
 #include <utils/pimpl_ptr.h>
 
 #include <gpgme++/global.h>
 
 #include <memory>
 #include <vector>
 
 namespace GpgME
 {
 class Key;
 }
 
 namespace KMime
 {
 namespace Types
 {
 class Mailbox;
 }
 }
 
 namespace Kleo
 {
 namespace Crypto
 {
 
 class RecipientPreferences;
 
 namespace Gui
 {
 
 class ResolveRecipientsPage : public WizardPage
 {
     Q_OBJECT
 public:
     explicit ResolveRecipientsPage(QWidget *parent = nullptr);
     ~ResolveRecipientsPage() override;
 
     bool isComplete() const override;
 
     /**
      * The protocol selected by the user (which is chosen by
      * the user in case none was preset)
      */
     GpgME::Protocol selectedProtocol() const;
 
     /**
      * the protocol set before the dialog is shown. Defaults to
      * GpgME::UnknownProtocol */
     GpgME::Protocol presetProtocol() const;
     void setPresetProtocol(GpgME::Protocol protocol);
 
     bool multipleProtocolsAllowed() const;
     void setMultipleProtocolsAllowed(bool allowed);
 
-    bool symmetricEncryptionSelected() const;
-    void setSymmetricEncryptionSelected(bool enabled);
-
-    bool symmetricEncryptionSelectable() const;
-    void setSymmetricEncryptionSelectable(bool selectable);
-
     /** if true, the user is allowed to remove/add recipients via the UI.
      * Defaults to @p false.
      */
     bool recipientsUserMutable() const;
     void setRecipientsUserMutable(bool isMutable);
 
     void setAdditionalRecipientsInfo(const std::vector<GpgME::Key> &recipients);
 
     void setRecipients(const std::vector<KMime::Types::Mailbox> &recipients, const std::vector<KMime::Types::Mailbox> &encryptToSelfRecipients);
     std::vector<GpgME::Key> resolvedCertificates() const;
 
     std::shared_ptr<RecipientPreferences> recipientPreferences() const;
     void setRecipientPreferences(const std::shared_ptr<RecipientPreferences> &prefs);
 
 Q_SIGNALS:
     void selectedProtocolChanged();
 
 private:
     void onNext() override;
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
     Q_PRIVATE_SLOT(d, void selectionChanged())
     Q_PRIVATE_SLOT(d, void protocolSelected(int))
     Q_PRIVATE_SLOT(d, void addRecipient())
     Q_PRIVATE_SLOT(d, void removeSelectedEntries())
     Q_PRIVATE_SLOT(d, void completeChangedInternal())
     class ListWidget;
     class ItemWidget;
 };
 
 }
 }
 }
 
 #endif // __KLEOPATRA_CRYPTO_GUI_RESOLVERECIPIENTSPAGE_H__
diff --git a/src/crypto/gui/signencryptwizard.h b/src/crypto/gui/signencryptwizard.h
index b64131b62..0c3918ff8 100644
--- a/src/crypto/gui/signencryptwizard.h
+++ b/src/crypto/gui/signencryptwizard.h
@@ -1,143 +1,140 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     crypto/gui/signencryptwizard.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef __KLEOPATRA_CRYPTO_GUI_SIGNENCRYPTWIZARD_H__
 #define __KLEOPATRA_CRYPTO_GUI_SIGNENCRYPTWIZARD_H__
 
 #include <crypto/gui/wizard.h>
 
 #include <crypto/gui/signerresolvepage.h>
 
 #include <utils/pimpl_ptr.h>
 
 #include <gpgme++/global.h>
 #include <kmime/kmime_header_parsing.h>
 
 #include <memory>
 #include <vector>
 
 namespace GpgME
 {
 class Key;
 }
 
 class QFileInfo;
 template <typename T> class QList;
 typedef QList<QFileInfo> QFileInfoList;
 
 namespace Kleo
 {
 namespace Crypto
 {
 
 class Task;
 class TaskCollection;
 
 namespace Gui
 {
 
 class ObjectsPage;
 class ResolveRecipientsPage;
 class ResultPage;
 class SignerResolvePage;
 
 class SignEncryptWizard : public Wizard
 {
     Q_OBJECT
 public:
     explicit SignEncryptWizard(QWidget *parent = nullptr, Qt::WindowFlags f = {});
     ~SignEncryptWizard() override;
 
     enum Page {
         ResolveSignerPage = 0,
         ObjectsPage,
         ResolveRecipientsPage,
         ResultPage
     };
 
     void setCommitPage(Page);
 
     GpgME::Protocol presetProtocol() const;
     void setPresetProtocol(GpgME::Protocol proto);
 
     GpgME::Protocol selectedProtocol() const;
 
     /// SignOrEncryptFiles mode subinterface
     //@{
 
     QFileInfoList resolvedFiles() const;
     void setFiles(const QStringList &files);
 
     bool signingSelected() const;
     void setSigningSelected(bool selected);
 
     bool encryptionSelected() const;
     void setEncryptionSelected(bool selected);
 
     bool isSigningUserMutable() const;
     void setSigningUserMutable(bool isMutable);
 
     bool isEncryptionUserMutable() const;
     void setEncryptionUserMutable(bool isMutable);
 
     bool isMultipleProtocolsAllowed() const;
     void setMultipleProtocolsAllowed(bool allowed);
 
     //@}
 
     void setRecipients(const std::vector<KMime::Types::Mailbox> &recipients, const std::vector<KMime::Types::Mailbox> &encryptoToSelfRecipients);
 
     /** if true, the user is allowed to remove/add recipients via the UI.
      * Defaults to @p false.
      */
     bool recipientsUserMutable() const;
     void setRecipientsUserMutable(bool isMutable);
 
     void setSignersAndCandidates(const std::vector<KMime::Types::Mailbox> &signers, const std::vector< std::vector<GpgME::Key> > &keys);
 
     void setTaskCollection(const std::shared_ptr<TaskCollection> &tasks);
 
     std::vector<GpgME::Key> resolvedCertificates() const;
     std::vector<GpgME::Key> resolvedSigners() const;
 
     bool isAsciiArmorEnabled() const;
     void setAsciiArmorEnabled(bool enabled);
 
-    bool removeUnencryptedFile() const;
-    void setRemoveUnencryptedFile(bool remove);
-
     bool keepResultPageOpenWhenDone() const;
     void setKeepResultPageOpenWhenDone(bool keep);
 
     void onNext(int currentId) override;
 
 Q_SIGNALS:
     void signersResolved();
     void objectsResolved();
     void recipientsResolved();
 
 protected:
     Gui::SignerResolvePage *signerResolvePage();
     const Gui::SignerResolvePage *signerResolvePage() const;
     Gui::ObjectsPage *objectsPage();
     Gui::ResultPage *resultPage();
     Gui::ResolveRecipientsPage *resolveRecipientsPage();
 
     void setSignerResolvePageValidator(const std::shared_ptr<SignerResolvePage::Validator> &validator);
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
 };
 
 }
 }
 }
 
 #endif /* __KLEOPATRA_CRYPTO_GUI_SIGNENCRYPTWIZARD_H__ */
diff --git a/src/utils/headerview.h b/src/utils/headerview.h
index 6af4e93ba..890bac255 100644
--- a/src/utils/headerview.h
+++ b/src/utils/headerview.h
@@ -1,49 +1,47 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     utils/headerview.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2008 Klarälvdalens Datakonsult AB
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef __KLEOPATRA_UTILS_HEADERVIEW_H__
 #define __KLEOPATRA_UTILS_HEADERVIEW_H__
 
 #include <QHeaderView>
 
 #include <utils/pimpl_ptr.h>
 
 #include <vector>
 
 namespace Kleo
 {
 
 class HeaderView : public QHeaderView
 {
     Q_OBJECT
 public:
     explicit HeaderView(Qt::Orientation o, QWidget *parent = nullptr);
     ~HeaderView();
 
     void setSectionSizes(const std::vector<int> &sizes);
     std::vector<int> sectionSizes() const;
 
     void setSectionResizeMode(unsigned int logicalIndex, ResizeMode mode);
-    ResizeMode sectionResizeMode(unsigned int logicalIndex) const;
 private:
     //@{
     /*! Defined, but not implemented, to catch at least some usage errors */
     void setResizeMode(int, ResizeMode);
-    ResizeMode resizeMode() const;
     //@}
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
     Q_PRIVATE_SLOT(d, void _klhv_slotSectionCountChanged(int, int))
     Q_PRIVATE_SLOT(d, void _klhv_slotSectionResized(int, int, int))
 };
 
 }
 
 #endif /* __KLEOPATRA_UTILS_HEADERVIEW_H__ */
diff --git a/src/view/searchbar.h b/src/view/searchbar.h
index db5766ae6..423491a25 100644
--- a/src/view/searchbar.h
+++ b/src/view/searchbar.h
@@ -1,61 +1,60 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     view/searchbar.h
 
     This file is part of Kleopatra, the KDE keymanager
     SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB
 
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #ifndef __KLEOPATRA_VIEW_SEARCHBAR_H__
 #define __KLEOPATRA_VIEW_SEARCHBAR_H__
 
 #include <QWidget>
 
 #include <utils/pimpl_ptr.h>
 
 #include <memory>
 
 class QLineEdit;
 
 namespace Kleo
 {
 
 class KeyFilter;
 
 class SearchBar : public QWidget
 {
     Q_OBJECT
 public:
     explicit SearchBar(QWidget *parent = nullptr, Qt::WindowFlags f = {});
     ~SearchBar();
 
-    QString stringFilter() const;
     const std::shared_ptr<KeyFilter> &keyFilter() const;
 
     QLineEdit *lineEdit() const;
 
     void updateClickMessage(const QString &shortcutStr);
 
 public Q_SLOTS:
     void setStringFilter(const QString &text);
     void setKeyFilter(const std::shared_ptr<Kleo::KeyFilter> &filter);
 
     void setChangeStringFilterEnabled(bool enable);
     void setChangeKeyFilterEnabled(bool enable);
 
 Q_SIGNALS:
     void stringFilterChanged(const QString &text);
     void keyFilterChanged(const std::shared_ptr<Kleo::KeyFilter> &filter);
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
     Q_PRIVATE_SLOT(d, void slotKeyFilterChanged(int))
     Q_PRIVATE_SLOT(d, void listNotCertifiedKeys())
     Q_PRIVATE_SLOT(d, void showOrHideCertifyButton())
 };
 
 }
 
 #endif // __KLEOPATRA_VIEW_SEARCHBAR_H__