diff --git a/libnymea-core/devices/scriptdeviceplugin.cpp b/libnymea-core/devices/scriptdeviceplugin.cpp
index aa6955ec..0e492c8c 100644
--- a/libnymea-core/devices/scriptdeviceplugin.cpp
+++ b/libnymea-core/devices/scriptdeviceplugin.cpp
@@ -53,12 +53,6 @@ bool ScriptDevicePlugin::loadScript(const QString &fileName)
     }
     m_metaData = QJsonObject::fromVariantMap(jsonDoc.toVariant().toMap());
 
-
-    QFile scriptFile(fileName);
-    if (!scriptFile.open(QIODevice::ReadOnly)) {
-        return false;
-    }
-
     m_engine = new QQmlEngine(this);
     m_engine->installExtensions(QJSEngine::AllExtensions);
 
@@ -181,7 +175,6 @@ void ScriptDevicePlugin::setupDevice(DeviceSetupInfo *info)
 
     ScriptDeviceSetupInfo *scriptInfo = new ScriptDeviceSetupInfo(info, scriptDevice);
 
-    qWarning() << "Setup params" << info->device()->params();
     QJSValue jsInfo = m_engine->newQObject(scriptInfo);
     QJSValue ret = setupFunction.call({jsInfo});
 
diff --git a/libnymea-core/jsonrpc/devicehandler.cpp b/libnymea-core/jsonrpc/devicehandler.cpp
index 1de7c8dc..367b0c88 100644
--- a/libnymea-core/jsonrpc/devicehandler.cpp
+++ b/libnymea-core/jsonrpc/devicehandler.cpp
@@ -455,8 +455,6 @@ JsonReply *DeviceHandler::GetDiscoveredDevices(const QVariantMap &params) const
             QVariantList deviceDescriptorList;
             foreach (const DeviceDescriptor &deviceDescriptor, info->deviceDescriptors()) {
                 deviceDescriptorList.append(pack(deviceDescriptor));
-                qWarning() << "*** Discovery result:" << deviceDescriptor.params();
-                qWarning() << "Packed:" << pack(deviceDescriptor);
             }
             returns.insert("deviceDescriptors", deviceDescriptorList);
         }
diff --git a/libnymea/typeutils.h b/libnymea/typeutils.h
index 37690efe..4ad88095 100644
--- a/libnymea/typeutils.h
+++ b/libnymea/typeutils.h
@@ -29,19 +29,11 @@
 
 #include "libnymea.h"
 
-class GadgetUuid: public QUuid
-{
-    Q_GADGET
-public:
-    GadgetUuid() {}
-    GadgetUuid(const QUuid &uuid): QUuid(uuid) {}
-};
-
-#define DECLARE_TYPE_ID(type) class type##Id: public GadgetUuid \
+#define DECLARE_TYPE_ID(type) class type##Id: public QUuid \
 { \
 public: \
-    type##Id(const QUuid &uuid): GadgetUuid(uuid) {} \
-    type##Id(): GadgetUuid() {} \
+    type##Id(const QUuid &uuid): QUuid(uuid) {} \
+    type##Id(): QUuid() {} \
     static type##Id create##type##Id() { return type##Id(QUuid::createUuid()); } \
     bool operator==(const type##Id &other) const { \
         return toString() == other.toString(); \