diff --git a/experiences/airconditioning/temperatureschedule.cpp b/experiences/airconditioning/temperatureschedule.cpp
index be04888b..6808598e 100644
--- a/experiences/airconditioning/temperatureschedule.cpp
+++ b/experiences/airconditioning/temperatureschedule.cpp
@@ -123,7 +123,9 @@ QHash<int, QByteArray> TemperatureDaySchedule::roleNames() const
 void TemperatureDaySchedule::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (TemperatureSchedule *schedule, m_list)
+        schedule->deleteLater();
+
     m_list.clear();
     endResetModel();
 }
diff --git a/experiences/airconditioning/temperatureschedule.h b/experiences/airconditioning/temperatureschedule.h
index bef2e7d1..673d80fa 100644
--- a/experiences/airconditioning/temperatureschedule.h
+++ b/experiences/airconditioning/temperatureschedule.h
@@ -90,7 +90,7 @@ signals:
     void countChanged();
 
 private:
-    QList<TemperatureSchedule*> m_list;
+    QList<TemperatureSchedule *> m_list;
 };
 
 class TemperatureWeekSchedule: public QAbstractListModel
diff --git a/libnymea-app/configuration/mqttpolicies.cpp b/libnymea-app/configuration/mqttpolicies.cpp
index 5faf8c37..fe8a9d65 100644
--- a/libnymea-app/configuration/mqttpolicies.cpp
+++ b/libnymea-app/configuration/mqttpolicies.cpp
@@ -127,7 +127,9 @@ MqttPolicy *MqttPolicies::get(int index) const
 void MqttPolicies::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (MqttPolicy* policy, m_list)
+        policy->deleteLater();
+
     m_list.clear();
     endResetModel();
 }
diff --git a/libnymea-app/configuration/serverconfigurations.cpp b/libnymea-app/configuration/serverconfigurations.cpp
index cb7ba2af..a084ed19 100644
--- a/libnymea-app/configuration/serverconfigurations.cpp
+++ b/libnymea-app/configuration/serverconfigurations.cpp
@@ -107,7 +107,9 @@ void ServerConfigurations::removeConfiguration(const QString &id)
 void ServerConfigurations::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (ServerConfiguration *config, m_list)
+        config->deleteLater();
+
     m_list.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/energy/energylogs.cpp b/libnymea-app/energy/energylogs.cpp
index 12d6de36..745ae0a7 100644
--- a/libnymea-app/energy/energylogs.cpp
+++ b/libnymea-app/energy/energylogs.cpp
@@ -422,7 +422,9 @@ void EnergyLogs::clear()
 {
     int count = static_cast<int>(m_list.count());
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (EnergyLogEntry *entry, m_list)
+        entry->deleteLater();
+
     m_list.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/modbus/modbusrtumasters.cpp b/libnymea-app/modbus/modbusrtumasters.cpp
index b30154ff..a1755836 100644
--- a/libnymea-app/modbus/modbusrtumasters.cpp
+++ b/libnymea-app/modbus/modbusrtumasters.cpp
@@ -156,7 +156,9 @@ void ModbusRtuMasters::removeModbusRtuMaster(const QUuid &modbusUuid)
 void ModbusRtuMasters::clear()
 {
     beginResetModel();
-    qDeleteAll(m_modbusRtuMasters);
+    foreach (ModbusRtuMaster *master, m_modbusRtuMasters)
+        master->deleteLater();
+
     m_modbusRtuMasters.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/models/logsmodel.cpp b/libnymea-app/models/logsmodel.cpp
index dcdfa5e6..f02b037f 100644
--- a/libnymea-app/models/logsmodel.cpp
+++ b/libnymea-app/models/logsmodel.cpp
@@ -150,7 +150,9 @@ void LogsModel::setTypeIds(const QStringList &typeIds)
         emit typeIdsChanged();
         qCDebug(dcLogEngine()) << "Resetting model because type ids changed";
         beginResetModel();
-        qDeleteAll(m_list);
+        foreach (LogEntry *entry, m_list)
+            entry->deleteLater();
+
         m_list.clear();
         m_generatedEntries = 0;
         endResetModel();
diff --git a/libnymea-app/models/logsmodelng.cpp b/libnymea-app/models/logsmodelng.cpp
index 30e454fd..42ef3f04 100644
--- a/libnymea-app/models/logsmodelng.cpp
+++ b/libnymea-app/models/logsmodelng.cpp
@@ -161,7 +161,9 @@ void LogsModelNg::setTypeIds(const QStringList &typeIds)
         m_typeIds = fixedTypeIds;
         emit typeIdsChanged();
         beginResetModel();
-        qDeleteAll(m_list);
+        foreach (LogEntry *entry, m_list)
+            entry->deleteLater();
+
         m_list.clear();
         endResetModel();
         fetchMore();
diff --git a/libnymea-app/models/newlogsmodel.cpp b/libnymea-app/models/newlogsmodel.cpp
index 17733488..2e051631 100644
--- a/libnymea-app/models/newlogsmodel.cpp
+++ b/libnymea-app/models/newlogsmodel.cpp
@@ -358,7 +358,9 @@ void NewLogsModel::clear()
 {
     int count = static_cast<int>(m_list.count());
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (NewLogEntry *entry, m_list)
+        entry->deleteLater();
+
     m_list.clear();
     m_currentNewest = QDateTime();
     m_lastOffset = 0;
@@ -447,7 +449,9 @@ void NewLogsModel::logsReply(int commandId, const QVariantMap &data)
         m_list.clear();
         endResetModel();
         emit entriesRemoved(0, oldEntries.count());
-        qDeleteAll(oldEntries);
+
+        foreach (NewLogEntry *entry, oldEntries)
+            entry->deleteLater();
 
         if (!entries.isEmpty()) {
             beginInsertRows(QModelIndex(), 0, static_cast<int>(entries.count()) - 1);
diff --git a/libnymea-app/serverdebug/serverloggingcategories.cpp b/libnymea-app/serverdebug/serverloggingcategories.cpp
index 1731124c..28246dac 100644
--- a/libnymea-app/serverdebug/serverloggingcategories.cpp
+++ b/libnymea-app/serverdebug/serverloggingcategories.cpp
@@ -60,8 +60,11 @@ void ServerLoggingCategories::createFromVariantList(const QVariantList &loggingC
 {
     beginResetModel();
 
-    if (!m_list.isEmpty())
-        qDeleteAll(m_list);
+    if (!m_list.isEmpty()) {
+        foreach (ServerLoggingCategory *category, m_list) {
+            category->deleteLater();
+        }
+    }
 
     foreach(const QVariant &categoryVariant, loggingCategories) {
         QVariantMap categoryMap = categoryVariant.toMap();
diff --git a/libnymea-app/thingclasses.cpp b/libnymea-app/thingclasses.cpp
index 4aa37abf..fac066a6 100644
--- a/libnymea-app/thingclasses.cpp
+++ b/libnymea-app/thingclasses.cpp
@@ -102,7 +102,9 @@ void ThingClasses::addThingClass(ThingClass *thingClass)
 void ThingClasses::clearModel()
 {
     beginResetModel();
-    qDeleteAll(m_thingClasses);
+    foreach (ThingClass *thingClass, m_thingClasses)
+        thingClass->deleteLater();
+
     m_thingClasses.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/things.cpp b/libnymea-app/things.cpp
index fcbcf0c9..7c4f1474 100644
--- a/libnymea-app/things.cpp
+++ b/libnymea-app/things.cpp
@@ -23,7 +23,6 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "things.h"
-#include "engine.h"
 
 #include <QDebug>
 
@@ -148,7 +147,9 @@ void Things::removeThing(Thing *thing)
 void Things::clearModel()
 {
     beginResetModel();
-    qDeleteAll(m_things);
+    foreach (Thing *thing, m_things)
+        thing->deleteLater();
+
     m_things.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/ioconnections.cpp b/libnymea-app/types/ioconnections.cpp
index 50069daf..f6881cdf 100644
--- a/libnymea-app/types/ioconnections.cpp
+++ b/libnymea-app/types/ioconnections.cpp
@@ -90,7 +90,9 @@ void IOConnections::removeIOConnection(const QUuid &ioConnectionId)
 void IOConnections::clearModel()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (IOConnection *connection, m_list)
+        connection->deleteLater();
+
     m_list.clear();
     endResetModel();
 }
diff --git a/libnymea-app/types/networkdevices.cpp b/libnymea-app/types/networkdevices.cpp
index fb08af28..a8a5cc12 100644
--- a/libnymea-app/types/networkdevices.cpp
+++ b/libnymea-app/types/networkdevices.cpp
@@ -124,7 +124,9 @@ NetworkDevice *NetworkDevices::getNetworkDevice(const QString &interface)
 void NetworkDevices::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (NetworkDevice *device, m_list)
+        device->deleteLater();
+
     m_list.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/packages.cpp b/libnymea-app/types/packages.cpp
index 8c63f2cc..3639d52f 100644
--- a/libnymea-app/types/packages.cpp
+++ b/libnymea-app/types/packages.cpp
@@ -146,7 +146,9 @@ Package *Packages::getPackage(const QString &packageId)
 void Packages::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (Package *package, m_list)
+        package->deleteLater();
+
     m_list.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/packages.h b/libnymea-app/types/packages.h
index 02b4e481..e6108e6a 100644
--- a/libnymea-app/types/packages.h
+++ b/libnymea-app/types/packages.h
@@ -64,7 +64,7 @@ signals:
     void countChanged();
 
 private:
-    QList<Package*> m_list;
+    QList<Package *> m_list;
 };
 
 #endif // PACKAGES_H
diff --git a/libnymea-app/types/paramdescriptors.cpp b/libnymea-app/types/paramdescriptors.cpp
index c42d1416..1e5d9ffd 100644
--- a/libnymea-app/types/paramdescriptors.cpp
+++ b/libnymea-app/types/paramdescriptors.cpp
@@ -119,7 +119,9 @@ void ParamDescriptors::setParamDescriptorByName(const QString &paramName, const
 void ParamDescriptors::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (ParamDescriptor *descriptor, m_list)
+        descriptor->deleteLater();
+
     m_list.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/plugins.cpp b/libnymea-app/types/plugins.cpp
index e7e776cf..d371d9a7 100644
--- a/libnymea-app/types/plugins.cpp
+++ b/libnymea-app/types/plugins.cpp
@@ -91,7 +91,9 @@ void Plugins::addPlugin(Plugin *plugin)
 void Plugins::clearModel()
 {
     beginResetModel();
-    qDeleteAll(m_plugins);
+    foreach (Plugin *plugin, m_plugins)
+        plugin->deleteLater();
+
     m_plugins.clear();
     endResetModel();
 }
diff --git a/libnymea-app/types/repositories.cpp b/libnymea-app/types/repositories.cpp
index 3e466450..56495302 100644
--- a/libnymea-app/types/repositories.cpp
+++ b/libnymea-app/types/repositories.cpp
@@ -111,7 +111,9 @@ void Repositories::removeRepository(const QString &repositoryId)
 void Repositories::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (Repository *repo, m_list)
+        repo->deleteLater();
+
     m_list.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/ruleactionparams.cpp b/libnymea-app/types/ruleactionparams.cpp
index 3d64f5a8..ee372217 100644
--- a/libnymea-app/types/ruleactionparams.cpp
+++ b/libnymea-app/types/ruleactionparams.cpp
@@ -198,7 +198,9 @@ bool RuleActionParams::hasRuleActionParam(const QUuid &paramTypeId) const
 void RuleActionParams::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (RuleActionParam *param, m_list)
+        param->deleteLater();
+
     m_list.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/rules.cpp b/libnymea-app/types/rules.cpp
index a993a1d5..f6ee83ad 100644
--- a/libnymea-app/types/rules.cpp
+++ b/libnymea-app/types/rules.cpp
@@ -35,7 +35,9 @@ Rules::Rules(QObject *parent) : QAbstractListModel(parent)
 void Rules::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (Rule *rule, m_list)
+        rule->deleteLater();
+
     m_list.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/scripts.cpp b/libnymea-app/types/scripts.cpp
index 58f57087..a2a57263 100644
--- a/libnymea-app/types/scripts.cpp
+++ b/libnymea-app/types/scripts.cpp
@@ -60,7 +60,9 @@ QHash<int, QByteArray> Scripts::roleNames() const
 void Scripts::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (Script *script, m_list)
+        script->deleteLater();
+
     m_list.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/serialports.cpp b/libnymea-app/types/serialports.cpp
index bfa9e936..6ea334ff 100644
--- a/libnymea-app/types/serialports.cpp
+++ b/libnymea-app/types/serialports.cpp
@@ -87,7 +87,9 @@ void SerialPorts::removeSerialPort(const QString &systemLocation)
 void SerialPorts::clear()
 {
     beginResetModel();
-    qDeleteAll(m_serialPorts);
+    foreach (SerialPort *port, m_serialPorts)
+        port->deleteLater();
+
     m_serialPorts.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/statetypes.cpp b/libnymea-app/types/statetypes.cpp
index 2b0a425f..1ade70b0 100644
--- a/libnymea-app/types/statetypes.cpp
+++ b/libnymea-app/types/statetypes.cpp
@@ -118,7 +118,9 @@ QList<StateType *> StateTypes::ioStateTypes(Types::IOType ioType) const
 void StateTypes::clearModel()
 {
     beginResetModel();
-    qDeleteAll(m_stateTypes);
+    foreach (StateType *stateType, m_stateTypes)
+        stateType->deleteLater();
+
     m_stateTypes.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/tags.cpp b/libnymea-app/types/tags.cpp
index 69b3f72d..e4e6dfb2 100644
--- a/libnymea-app/types/tags.cpp
+++ b/libnymea-app/types/tags.cpp
@@ -138,7 +138,9 @@ Tag *Tags::findRuleTag(const QUuid &ruleId, const QString &tagId) const
 void Tags::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (Tag *tag, m_list)
+        tag->deleteLater();
+
     m_list.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/vendors.cpp b/libnymea-app/types/vendors.cpp
index bb21f60d..56dbac1d 100644
--- a/libnymea-app/types/vendors.cpp
+++ b/libnymea-app/types/vendors.cpp
@@ -67,7 +67,9 @@ void Vendors::addVendor(Vendor *vendor)
 void Vendors::clearModel()
 {
     beginResetModel();
-    qDeleteAll(m_vendors);
+    foreach (Vendor *vendor, m_vendors)
+        vendor->deleteLater();
+
     m_vendors.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/types/wirelessaccesspoints.cpp b/libnymea-app/types/wirelessaccesspoints.cpp
index 941f1772..9d2d5292 100644
--- a/libnymea-app/types/wirelessaccesspoints.cpp
+++ b/libnymea-app/types/wirelessaccesspoints.cpp
@@ -42,7 +42,9 @@ void WirelessAccessPoints::setWirelessAccessPoints(QList<WirelessAccessPoint *>
     beginResetModel();
 
     // Delete all
-    qDeleteAll(m_wirelessAccessPoints);
+    foreach (WirelessAccessPoint *ap, m_wirelessAccessPoints)
+        ap->deleteLater();
+
     m_wirelessAccessPoints.clear();
 
     m_wirelessAccessPoints = wirelessAccessPoints;
@@ -108,7 +110,9 @@ WirelessAccessPoint *WirelessAccessPoints::get(int index)
 void WirelessAccessPoints::clearModel()
 {
     beginResetModel();
-    qDeleteAll(m_wirelessAccessPoints);
+    foreach (WirelessAccessPoint *ap, m_wirelessAccessPoints)
+        ap->deleteLater();
+
     m_wirelessAccessPoints.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/wifisetup/bluetoothdeviceinfos.cpp b/libnymea-app/wifisetup/bluetoothdeviceinfos.cpp
index 262f5ad7..8af9f00e 100644
--- a/libnymea-app/wifisetup/bluetoothdeviceinfos.cpp
+++ b/libnymea-app/wifisetup/bluetoothdeviceinfos.cpp
@@ -93,7 +93,9 @@ void BluetoothDeviceInfos::addBluetoothDeviceInfo(BluetoothDeviceInfo *deviceInf
 void BluetoothDeviceInfos::clearModel()
 {
     beginResetModel();
-    qDeleteAll(m_deviceInfos);
+    foreach (BluetoothDeviceInfo *deviceInfo, m_deviceInfos)
+        deviceInfo->deleteLater();
+
     m_deviceInfos.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/zigbee/zigbeeadapters.cpp b/libnymea-app/zigbee/zigbeeadapters.cpp
index 0012b86a..0f895768 100644
--- a/libnymea-app/zigbee/zigbeeadapters.cpp
+++ b/libnymea-app/zigbee/zigbeeadapters.cpp
@@ -123,7 +123,9 @@ void ZigbeeAdapters::removeAdapter(const QString &serialPort)
 void ZigbeeAdapters::clear()
 {
     beginResetModel();
-    qDeleteAll(m_adapters);
+    foreach (ZigbeeAdapter *adapter, m_adapters)
+        adapter->deleteLater();
+
     m_adapters.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/zigbee/zigbeenetworks.cpp b/libnymea-app/zigbee/zigbeenetworks.cpp
index 86bb23d9..f00cc03d 100644
--- a/libnymea-app/zigbee/zigbeenetworks.cpp
+++ b/libnymea-app/zigbee/zigbeenetworks.cpp
@@ -179,7 +179,9 @@ void ZigbeeNetworks::removeNetwork(const QUuid &networkUuid)
 void ZigbeeNetworks::clear()
 {
     beginResetModel();
-    qDeleteAll(m_networks);
+    foreach (ZigbeeNetwork *network, m_networks)
+        network->deleteLater();
+
     m_networks.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/zigbee/zigbeenodes.cpp b/libnymea-app/zigbee/zigbeenodes.cpp
index c7f91c87..cbf42760 100644
--- a/libnymea-app/zigbee/zigbeenodes.cpp
+++ b/libnymea-app/zigbee/zigbeenodes.cpp
@@ -164,7 +164,9 @@ void ZigbeeNodes::removeNode(const QString &ieeeAddress)
 void ZigbeeNodes::clear()
 {
     beginResetModel();
-    qDeleteAll(m_nodes);
+    foreach (ZigbeeNode *node, m_nodes)
+        node->deleteLater();
+
     m_nodes.clear();
     endResetModel();
     emit countChanged();
diff --git a/libnymea-app/zwave/zwavenetwork.cpp b/libnymea-app/zwave/zwavenetwork.cpp
index 5fc949b1..86d11b83 100644
--- a/libnymea-app/zwave/zwavenetwork.cpp
+++ b/libnymea-app/zwave/zwavenetwork.cpp
@@ -212,8 +212,12 @@ QHash<int, QByteArray> ZWaveNetworks::roleNames() const
 void ZWaveNetworks::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (ZWaveNetwork *network, m_list)
+        network->deleteLater();
+
+    m_list.clear();
     endResetModel();
+    emit countChanged();
 }
 
 void ZWaveNetworks::addNetwork(ZWaveNetwork *network)
diff --git a/libnymea-app/zwave/zwavenode.cpp b/libnymea-app/zwave/zwavenode.cpp
index 091bac30..394a2ce7 100644
--- a/libnymea-app/zwave/zwavenode.cpp
+++ b/libnymea-app/zwave/zwavenode.cpp
@@ -334,7 +334,10 @@ QHash<int, QByteArray> ZWaveNodes::roleNames() const
 void ZWaveNodes::clear()
 {
     beginResetModel();
-    qDeleteAll(m_list);
+    foreach (ZWaveNode *node, m_list)
+        node->deleteLater();
+
+    m_list.clear();
     endResetModel();
     emit countChanged();
 }
diff --git a/nymea-app/dashboard/dashboardmodel.cpp b/nymea-app/dashboard/dashboardmodel.cpp
index 3c65d739..5ecd0fe2 100644
--- a/nymea-app/dashboard/dashboardmodel.cpp
+++ b/nymea-app/dashboard/dashboardmodel.cpp
@@ -151,7 +151,9 @@ void DashboardModel::loadFromJson(const QByteArray &json)
     }
     beginResetModel();
 
-    qDeleteAll(m_list);
+    foreach (DashboardItem *item, m_list)
+        item->deleteLater();
+
     m_list.clear();
 
     QJsonDocument jsonDoc = QJsonDocument::fromJson(json);