diff --git a/src/conf/cryptooperationsconfigwidget.h b/src/conf/cryptooperationsconfigwidget.h
index 3d3ab5732..99e849f49 100644
--- a/src/conf/cryptooperationsconfigwidget.h
+++ b/src/conf/cryptooperationsconfigwidget.h
@@ -1,68 +1,66 @@
 /*
     cryptooperationsconfigwidget.h
 
     This file is part of kleopatra, the KDE key manager
     SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB
 
     SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #pragma once
 
 #include "labelledwidget.h"
 
 #include <QWidget>
 
 #include <utils/pimpl_ptr.h>
 
 class QCheckBox;
 class QComboBox;
 class QBoxLayout;
 class QPushButton;
 
 namespace Kleo
 {
 class FileOperationsPreferences;
 class Settings;
 
 namespace Config
 {
 
 class CryptoOperationsConfigWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit CryptoOperationsConfigWidget(QWidget *parent = nullptr, Qt::WindowFlags f = {});
     ~CryptoOperationsConfigWidget() override;
 
 public Q_SLOTS:
     void load();
     void save();
     void defaults();
 
 Q_SIGNALS:
     void changed();
 
 private:
     void setupGui();
-    void setupProfileGui(QBoxLayout *layout);
-    void applyProfile(const QString &profile);
 
     void load(const Kleo::FileOperationsPreferences &filePrefs,
               const Kleo::Settings &settings);
 
 private:
     QCheckBox *mPGPFileExtCB = nullptr;
     QCheckBox *mAutoDecryptVerifyCB = nullptr;
     QCheckBox *mAutoExtractArchivesCB = nullptr;
     QCheckBox *mASCIIArmorCB = nullptr;
     QCheckBox *mTmpDirCB = nullptr;
     QCheckBox *mSymmetricOnlyCB = nullptr;
     Kleo::LabelledWidget<QComboBox> mChecksumDefinitionCB;
     Kleo::LabelledWidget<QComboBox> mArchiveDefinitionCB;
     QPushButton *mApplyBtn = nullptr;
 };
 
 }
 }
 
diff --git a/src/crypto/decryptverifytask.h b/src/crypto/decryptverifytask.h
index a34cd6c7d..a2661834e 100644
--- a/src/crypto/decryptverifytask.h
+++ b/src/crypto/decryptverifytask.h
@@ -1,261 +1,258 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     decryptverifytask.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
 */
 
 #pragma once
 
 #include "task.h"
 
 #include <utils/types.h>
 
 #include <gpgme++/verificationresult.h>
 
 #include <memory>
 
 namespace KMime
 {
 namespace Types
 {
 class Mailbox;
 }
 }
 namespace GpgME
 {
 class DecryptionResult;
 class VerificationResult;
 class Key;
 class Signature;
 }
 
 namespace Kleo
 {
 class Input;
 class Output;
 class AuditLogEntry;
 }
 
 namespace Kleo
 {
 namespace Crypto
 {
 
 class DecryptVerifyResult;
 
 class AbstractDecryptVerifyTask : public Task
 {
     Q_OBJECT
 public:
     explicit AbstractDecryptVerifyTask(QObject *parent = nullptr);
     ~AbstractDecryptVerifyTask() override;
     virtual void autodetectProtocolFromInput() = 0;
 
     KMime::Types::Mailbox informativeSender() const;
     void setInformativeSender(const KMime::Types::Mailbox &senders);
 
     virtual QString inputLabel() const = 0;
     virtual QString outputLabel() const = 0;
 
 protected:
     std::shared_ptr<DecryptVerifyResult> fromDecryptResult(const GpgME::DecryptionResult &dr, const QByteArray &plaintext, const AuditLogEntry &auditLog);
     std::shared_ptr<DecryptVerifyResult> fromDecryptResult(const GpgME::Error &err, const QString &details, const AuditLogEntry &auditLog);
     std::shared_ptr<DecryptVerifyResult> fromDecryptVerifyResult(const GpgME::DecryptionResult &dr, const GpgME::VerificationResult &vr, const QByteArray &plaintext, const QString &fileName, const AuditLogEntry &auditLog);
     std::shared_ptr<DecryptVerifyResult> fromDecryptVerifyResult(const GpgME::Error &err, const QString &what, const AuditLogEntry &auditLog);
     std::shared_ptr<DecryptVerifyResult> fromVerifyOpaqueResult(const GpgME::VerificationResult &vr, const QByteArray &plaintext, const AuditLogEntry &auditLog);
     std::shared_ptr<DecryptVerifyResult> fromVerifyOpaqueResult(const GpgME::Error &err, const QString &details, const AuditLogEntry &auditLog);
     std::shared_ptr<DecryptVerifyResult> fromVerifyDetachedResult(const GpgME::VerificationResult &vr, const AuditLogEntry &auditLog);
     std::shared_ptr<DecryptVerifyResult> fromVerifyDetachedResult(const GpgME::Error &err, const QString &details, const AuditLogEntry &auditLog);
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
 };
 
 class DecryptTask : public AbstractDecryptVerifyTask
 {
     Q_OBJECT
 public:
     explicit DecryptTask(QObject *parent = nullptr);
     ~DecryptTask() override;
 
     void setInput(const std::shared_ptr<Input> &input);
     void setOutput(const std::shared_ptr<Output> &output);
 
     void setProtocol(GpgME::Protocol prot);
     void autodetectProtocolFromInput() override;
 
     QString label() const override;
 
     GpgME::Protocol protocol() const override;
 
     QString inputLabel() const override;
     QString outputLabel() const override;
 
 public Q_SLOTS:
     void cancel() override;
 
 private:
     void doStart() override;
     unsigned long long inputSize() const override;
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
     Q_PRIVATE_SLOT(d, void slotResult(GpgME::DecryptionResult, QByteArray))
 };
 
 class VerifyDetachedTask : public AbstractDecryptVerifyTask
 {
     Q_OBJECT
 public:
     explicit VerifyDetachedTask(QObject *parent = nullptr);
     ~VerifyDetachedTask() override;
 
     void setInput(const std::shared_ptr<Input> &input);
     void setSignedData(const std::shared_ptr<Input> &signedData);
 
     void setProtocol(GpgME::Protocol prot);
     void autodetectProtocolFromInput() override;
 
     QString label() const override;
 
     GpgME::Protocol protocol() const override;
 
     QString inputLabel() const override;
     QString outputLabel() const override;
 
 public Q_SLOTS:
     void cancel() override;
 
 private:
     void doStart() override;
     unsigned long long inputSize() const override;
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
     Q_PRIVATE_SLOT(d, void slotResult(GpgME::VerificationResult))
 };
 
 class VerifyOpaqueTask : public AbstractDecryptVerifyTask
 {
     Q_OBJECT
 public:
     explicit VerifyOpaqueTask(QObject *parent = nullptr);
     ~VerifyOpaqueTask() override;
 
     void setInput(const std::shared_ptr<Input> &input);
     void setOutput(const std::shared_ptr<Output> &output);
 
     void setProtocol(GpgME::Protocol prot);
     void autodetectProtocolFromInput()override;
 
     QString label() const override;
     GpgME::Protocol protocol() const override;
 
     void setExtractArchive(bool extract);
     void setOutputDirectory(const QString &directory);
 
     QString inputLabel() const override;
     QString outputLabel() const override;
 
 public Q_SLOTS:
     void cancel() override;
 
 private:
     void doStart() override;
     unsigned long long inputSize() const override;
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
     Q_PRIVATE_SLOT(d, void slotResult(GpgME::VerificationResult, QByteArray))
 };
 
 class DecryptVerifyTask : public AbstractDecryptVerifyTask
 {
     Q_OBJECT
 public:
     explicit DecryptVerifyTask(QObject *parent = nullptr);
     ~DecryptVerifyTask() override;
 
     void setInput(const std::shared_ptr<Input> &input);
     void setOutput(const std::shared_ptr<Output> &output);
 
     void setProtocol(GpgME::Protocol prot);
     void autodetectProtocolFromInput() override;
 
     QString label() const override;
 
     GpgME::Protocol protocol() const override;
 
     void setIgnoreMDCError(bool value);
     void setExtractArchive(bool extract);
     void setOutputDirectory(const QString &directory);
 
     QString inputLabel() const override;
     QString outputLabel() const override;
 
 public Q_SLOTS:
     void cancel() override;
 
 private:
     void doStart() override;
     unsigned long long inputSize() const override;
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
     Q_PRIVATE_SLOT(d, void slotResult(GpgME::DecryptionResult, GpgME::VerificationResult, QByteArray))
 };
 
 class DecryptVerifyResult : public Task::Result
 {
     friend class ::Kleo::Crypto::AbstractDecryptVerifyTask;
 public:
     class SenderInfo;
 
     QString overview() const override;
     QString details() const override;
     GpgME::Error error() const override;
     QString errorString() const override;
     VisualCode code() const override;
     AuditLogEntry auditLog() const override;
     QPointer<Task> parentTask() const override;
 
     GpgME::VerificationResult verificationResult() const;
     GpgME::DecryptionResult decryptionResult() const;
     QString fileName() const;
 
-private:
-    static QString keyToString(const GpgME::Key &key);
-
 private:
     DecryptVerifyResult();
     DecryptVerifyResult(const DecryptVerifyResult &);
     DecryptVerifyResult &operator=(const DecryptVerifyResult &other);
 
     DecryptVerifyResult(DecryptVerifyOperation op,
                         const GpgME::VerificationResult &vr,
                         const GpgME::DecryptionResult &dr,
                         const QByteArray &stuff,
                         const QString &fileName,
                         const GpgME::Error &error,
                         const QString &errString,
                         const QString &inputLabel,
                         const QString &outputLabel,
                         const AuditLogEntry &auditLog,
                         Task *parentTask,
                         const KMime::Types::Mailbox &informativeSender);
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
 };
 }
 }
 
diff --git a/src/newcertificatewizard/newcertificatewizard.h b/src/newcertificatewizard/newcertificatewizard.h
index b3c8b8391..8e87d2c6d 100644
--- a/src/newcertificatewizard/newcertificatewizard.h
+++ b/src/newcertificatewizard/newcertificatewizard.h
@@ -1,61 +1,60 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     newcertificatewizard/newcertificatewizard.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
 */
 
 #pragma once
 
 #include <QWizard>
 
 #include <utils/pimpl_ptr.h>
 
 #include <gpgme++/global.h>
 
 class QDir;
 
 namespace Kleo
 {
 
 namespace NewCertificateUi
 {
 class WizardPage;
 }
 
 class NewCertificateWizard : public QWizard
 {
     Q_OBJECT
 public:
     explicit NewCertificateWizard(QWidget *parent = nullptr);
     ~NewCertificateWizard() override;
 
     void setProtocol(GpgME::Protocol protocol);
     GpgME::Protocol protocol() const;
 
     enum Pages {
         EnterDetailsPageId,
         KeyCreationPageId,
         ResultPageId,
 
         NumPages
     };
 
 protected:
     void showEvent(QShowEvent *event) override;
 
 private:
-    void resetProtocol();
     void restartAtEnterDetailsPage();
     QDir tmpDir() const;
 
 private:
     class Private;
     kdtools::pimpl_ptr<Private> d;
     friend class ::Kleo::NewCertificateUi::WizardPage;
 };
 
 }