Index: CloudConnect/CloudConnectController.h
===================================================================
diff -u -rfe8875710ffd0f7ecc8df54bb5dee1be3d28212b -ra3de17abef83da8edaa4ca90b9f5091ff98cfc1e
--- CloudConnect/CloudConnectController.h	(.../CloudConnectController.h)	(revision fe8875710ffd0f7ecc8df54bb5dee1be3d28212b)
+++ CloudConnect/CloudConnectController.h	(.../CloudConnectController.h)	(revision a3de17abef83da8edaa4ca90b9f5091ff98cfc1e)
@@ -23,8 +23,6 @@
 
 #include "CanInterface.h"
 #include "CanMessage.h"
-#include "CloudConnectFrame.h"
-#include "CloudConnectServer.h"
 #include "MessageDispatcher.h"
 #include "MqttClient.h"
 
@@ -53,7 +51,6 @@
     bool loadConfig(const QString &configPath);
     void initThread(QThread &thread);
     bool startCan();
-    bool listenForApp();
     bool connectToCloud();
 
 private:
@@ -66,23 +63,29 @@
         SendDelta,
     };
 
+    enum class MqttTopic : quint16 {
+        HighPriority        = 0x0001,
+        NormalPriority      = 0x0002,
+        DeviceLogFile       = 0x0003,
+        TreatmentLogFile    = 0x0004,
+        CloudSyncLogFile    = 0x0005,
+    };
+
     /*!
      * \brief   CAN message routing entry loaded from CAN handling INI.
      */
     struct CanRouting {
         CanAction action = CanAction::Drop;
-        CloudConnectFrame::Topic topic = CloudConnectFrame::Topic::NormalPriority;
+        MqttTopic topic = MqttTopic::NormalPriority;
     };
 
     bool loadCanRouting(const QString &canRoutingPath);
-    QString mqttTopic(CloudConnectFrame::Topic topic) const;
+    QString mqttTopic(MqttTopic topic) const;
 
     Can::CanInterface _canInterface;
     Can::MessageDispatcher _dispatcher;
     QMap<Can::MsgId, std::pair<bool, Can::Message>> _canCache;
     QHash<Can::MsgId, CanRouting> _canRouting;
-    QString _appServerSocketPath;
-    QSharedPointer<CloudConnectServer> _appServer;
     MqttClient _mqttClient;
     QString _topicPrefix; // TODO: define in INI?
     QString _deviceId; // TODO: this needs to be sent from Leahi app or retrieved from somewhere