Index: CloudConnect/main.cpp
===================================================================
diff -u -r59b4c22f45a1d098064a886452769204e90cfb4b -raaebfee335c74b0250864a6dce0555f866adadea
--- CloudConnect/main.cpp	(.../main.cpp)	(revision 59b4c22f45a1d098064a886452769204e90cfb4b)
+++ CloudConnect/main.cpp	(.../main.cpp)	(revision aaebfee335c74b0250864a6dce0555f866adadea)
@@ -58,18 +58,16 @@
 
     QCommandLineOption configOption(
         {"c", "config"}, "Path to the configuration INI file.", "config",
-        QDir(app.applicationDirPath()).filePath("/home/leahi/Public/leahi-realtime-cdt/CloudConnect/config/CloudConnect.ini")
+        QDir(app.applicationDirPath()).filePath("config/CloudConnect.ini")
     );
-    QCommandLineOption msgHandlingOption(
-        {"m", "msg_handling"}, "Path to the message handling INI file.", "msg_handling",
-        QDir(app.applicationDirPath()).filePath("/home/leahi/Public/leahi-realtime-cdt/CloudConnect/config/LeahiMsgHandling.ini")
-    );
     parser.addOption(configOption);
-    parser.addOption(msgHandlingOption);
     parser.process(app);
 
     QThread controllerThread;
-    CloudConnectController ccController(parser.value(configOption), parser.value(msgHandlingOption));
+    CloudConnectController ccController;
+    if (!ccController.loadConfig(parser.value(configOption))) {
+        return 1;
+    }
 
     // Bind on the controller thread: QLocalServer's socket engine belongs to the
     // thread that calls listen(), and accepted sockets are parented under it.