diff --git a/src/plugins/ios/iosdevice.cpp b/src/plugins/ios/iosdevice.cpp
index 53d956fa76a..74c749099ef 100644
--- a/src/plugins/ios/iosdevice.cpp
+++ b/src/plugins/ios/iosdevice.cpp
@@ -538,16 +538,6 @@ void IosDeviceManager::updateAvailableDevices(const QStringList &devices)
     }
 }
 
-IosDevice::ConstPtr IosKitAspect::device(Kit *kit)
-{
-    if (!kit)
-        return IosDevice::ConstPtr();
-    IDevice::ConstPtr dev = DeviceKitAspect::device(kit);
-    IosDevice::ConstPtr res = dev.dynamicCast<const IosDevice>();
-    return res;
-}
-
-
 // Factory
 
 IosDeviceFactory::IosDeviceFactory()
diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h
index afd2cbecfce..c8d02287333 100644
--- a/src/plugins/ios/iosdevice.h
+++ b/src/plugins/ios/iosdevice.h
@@ -36,9 +36,6 @@
 #include <QStringList>
 #include <QTimer>
 
-namespace ProjectExplorer{
-class Kit;
-}
 namespace Ios {
 class IosConfigurations;
 
@@ -61,7 +58,6 @@ public:
     void fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
     QString uniqueDeviceID() const;
-    IosDevice(const QString &uid);
     QString osVersion() const;
     Utils::Port nextPort() const;
     bool canAutoDetectPorts() const override;
@@ -74,6 +70,8 @@ protected:
     friend class Ios::Internal::IosDeviceManager;
     IosDevice();
     IosDevice(const IosDevice &other);
+    IosDevice(const QString &uid);
+
     Dict m_extraInfo;
     bool m_ignoreDevice = false;
     mutable quint16 m_lastPort;
@@ -88,7 +86,8 @@ public:
     bool canRestore(const QVariantMap &map) const override;
 };
 
-class IosDeviceManager : public QObject {
+class IosDeviceManager : public QObject
+{
     Q_OBJECT
 public:
     using TranslationMap = QHash<QString, QString>;
@@ -112,10 +111,5 @@ private:
     QStringList m_userModeDeviceIds;
 };
 
-namespace IosKitAspect {
-IosDevice::ConstPtr device(ProjectExplorer::Kit *);
-}
-
 } // namespace Internal
-
 } // namespace Ios
diff --git a/src/plugins/ios/iossimulator.cpp b/src/plugins/ios/iossimulator.cpp
index 7033d59f785..9873a647e52 100644
--- a/src/plugins/ios/iossimulator.cpp
+++ b/src/plugins/ios/iossimulator.cpp
@@ -97,17 +97,6 @@ IDevice::Ptr IosSimulator::clone() const
     return IDevice::Ptr(new IosSimulator(*this));
 }
 
-void IosSimulator::fromMap(const QVariantMap &map)
-{
-    IDevice::fromMap(map);
-}
-
-QVariantMap IosSimulator::toMap() const
-{
-    QVariantMap res = IDevice::toMap();
-    return res;
-}
-
 Utils::Port IosSimulator::nextPort() const
 {
     for (int i = 0; i < 100; ++i) {
@@ -140,14 +129,7 @@ Utils::OsType IosSimulator::osType() const
     return Utils::OsTypeMac;
 }
 
-IosSimulator::ConstPtr IosKitInformation::simulator(Kit *kit)
-{
-    if (!kit)
-        return IosSimulator::ConstPtr();
-    IDevice::ConstPtr dev = DeviceKitAspect::device(kit);
-    IosSimulator::ConstPtr res = dev.dynamicCast<const IosSimulator>();
-    return res;
-}
+// IosDeviceType
 
 IosDeviceType::IosDeviceType(IosDeviceType::Type type, const QString &identifier, const QString &displayName) :
     type(type), identifier(identifier), displayName(displayName)
diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h
index b7bea6d6294..98924400754 100644
--- a/src/plugins/ios/iossimulator.h
+++ b/src/plugins/ios/iossimulator.h
@@ -32,13 +32,14 @@
 
 #include <QDebug>
 
-namespace ProjectExplorer { class Kit; }
 namespace Ios {
 namespace Internal {
+
 class IosConfigurations;
 class IosSimulatorFactory;
 
-class IosDeviceType {
+class IosDeviceType
+{
 public:
     enum Type {
         IosDevice,
@@ -58,6 +59,7 @@ public:
     QString identifier;
     QString displayName;
 };
+
 QDebug operator <<(QDebug debug, const IosDeviceType &deviceType);
 
 class IosSimulator : public ProjectExplorer::IDevice
@@ -70,8 +72,6 @@ public:
     QString displayType() const override;
     ProjectExplorer::IDeviceWidget *createWidget() override;
     ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
-    void fromMap(const QVariantMap &map) override;
-    QVariantMap toMap() const override;
     Utils::Port nextPort() const;
     bool canAutoDetectPorts() const override;
     Utils::OsType osType() const override;
@@ -94,9 +94,6 @@ public:
     IosSimulatorFactory();
 };
 
-namespace IosKitInformation {
-IosSimulator::ConstPtr simulator(ProjectExplorer::Kit *kit);
-} // namespace IosKitInformation
 } // namespace Internal
 } // namespace Ios