diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index 219e40e..a7178b0 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -1,7 +1,7 @@
 """HK Handling for EIVE OBSW"""
 import struct
 
-from pus_tm.system.tcs import handle_thermal_controller_hk_data
+from pus_tm.system.tcs import handle_thermal_controller_hk_data, TM_TCP_SERVER
 from tmtccmd.config.definitions import HkReplyUnpacked
 from tmtccmd.tm.pus_3_fsfw_hk import (
     Service3Base,
@@ -24,8 +24,6 @@ from pus_tm.system.core import handle_core_hk_data
 from pus_tm.devs.mgms import handle_mgm_hk_data
 import config.object_ids as obj_ids
 
-from pus_tm.tm_tcp_server import TmTcpServer
-
 
 LOGGER = get_console_logger()
 
diff --git a/tmtccmd b/tmtccmd
index 4433284..bca6440 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 443328422a03395bd51d072d3360de3397e1d88b
+Subproject commit bca6440dba775b4691e693551e29849f2ab6542f