diff --git a/bsp_rpi/InitMission.cpp b/bsp_rpi/InitMission.cpp
index 76918716..8dcb42d7 100644
--- a/bsp_rpi/InitMission.cpp
+++ b/bsp_rpi/InitMission.cpp
@@ -14,18 +14,10 @@
 
 #include <iostream>
 
-// This is configured for linux without \cr
-#ifdef LINUX
 ServiceInterfaceStream sif::debug("DEBUG");
 ServiceInterfaceStream sif::info("INFO");
 ServiceInterfaceStream sif::warning("WARNING");
 ServiceInterfaceStream sif::error("ERROR", false, false, true);
-#else
-ServiceInterfaceStream sif::debug("DEBUG", true);
-ServiceInterfaceStream sif::info("INFO", true);
-ServiceInterfaceStream sif::warning("WARNING", true);
-ServiceInterfaceStream sif::error("ERROR", true, false, true);
-#endif
 
 ObjectManagerIF *objectManager = nullptr;
 
diff --git a/tmtc b/tmtc
index 4b0d4579..7e64595d 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 4b0d45793720df05c6a79990b84038b140c093b0
+Subproject commit 7e64595d1a34732ed5d178cbbae634104634763f