diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1f0b37d..5ce19479 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -491,7 +491,7 @@ endif()
 
 # Add libraries
 target_link_libraries(${LIB_EIVE_MISSION}
-                      PUBLIC ${LIB_FSFW_NAME} ${LIB_LWGPS_NAME} ${LIB_OS_NAME})
+                      PUBLIC ${LIB_FSFW_NAME} ${LIB_OS_NAME})
 
 target_link_libraries(${LIB_DUMMIES} PUBLIC ${LIB_FSFW_NAME} ${LIB_JSON_NAME})
 
diff --git a/tmtc b/tmtc
index 9b7471e9..20e107c7 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 9b7471e9097edd410995ba0c76125b626440d9be
+Subproject commit 20e107c7ae373e7f36fca68957dbc36f4dd76f3b