Index: LeahiRt/LeahiRtController.cpp
===================================================================
diff -u -r6b422c15085ed605d40cb5dd70177e4657a0ca7e -r42bfa9903a12ff03e4051a6c9a9a0d188606dea7
--- LeahiRt/LeahiRtController.cpp	(.../LeahiRtController.cpp)	(revision 6b422c15085ed605d40cb5dd70177e4657a0ca7e)
+++ LeahiRt/LeahiRtController.cpp	(.../LeahiRtController.cpp)	(revision 42bfa9903a12ff03e4051a6c9a9a0d188606dea7)
@@ -2,7 +2,6 @@
 #include <QDebug> // SQ
 #include <QString>
 
-#include "AlphaOmega.h" // SQ
 #include "LeahiRtController.h"
 #include "LeahiMsgDefs.h"
 
@@ -31,7 +30,6 @@
 
 void LeahiRtController::openSocket(const QString host, const unsigned int port)
 {
-    AO_BEGIN_END_CLASS(ao) // SQ
     _clientSocket.close();
     _clientSocket.open(QUrl(QString("ws://%1:%2").arg(host).arg(port)));
 }
Index: lib/MsgUtils/CMakeLists.txt
===================================================================
diff -u -r0bbdafc836463652c41d839ba652e77775a43bec -r42bfa9903a12ff03e4051a6c9a9a0d188606dea7
--- lib/MsgUtils/CMakeLists.txt	(.../CMakeLists.txt)	(revision 0bbdafc836463652c41d839ba652e77775a43bec)
+++ lib/MsgUtils/CMakeLists.txt	(.../CMakeLists.txt)	(revision 42bfa9903a12ff03e4051a6c9a9a0d188606dea7)
@@ -31,7 +31,7 @@
 
 # set(DENALI_MSG_CSV ${CMAKE_CURRENT_SOURCE_DIR}/../../data/FW_Messages_List.csv)
 set(LEAHI_MSG_CSV ${CMAKE_CURRENT_SOURCE_DIR}/../../data/Leahi_Staging_FW_Messages_List.csv)
-set(LEAHI_MSG_CONF ${CMAKE_CURRENT_SOURCE_DIR}/../../data/Unhandled.conf)
+set(LEAHI_MSG_CONF ${CMAKE_CURRENT_SOURCE_DIR}/../../data/LeahiUnhandled.conf)
 
 set(INCLUDES
     include/CanMessage.h