diff --git a/pus_tc/devs/gps.py b/pus_tc/devs/gps.py
index 96f89f2..c7577fc 100644
--- a/pus_tc/devs/gps.py
+++ b/pus_tc/devs/gps.py
@@ -12,7 +12,6 @@ from tmtccmd.tc.pus_8_funccmd import generate_action_command
 LOGGER = get_console_logger()
 
 
-
 class OpCodes:
     REQ_OS_HK = ["0", "hk-os"]
     RESET_GNSS = ["5", "reset"]
@@ -43,10 +42,6 @@ def add_gps_cmds(cmd_dict: ServiceOpCodeDictT):
     )
 
 
-class SetIds:
-    HK = 0
-
-
 def pack_gps_command(object_id: bytes, tc_queue: TcQueueT, op_code: str):
     if op_code in OpCodes.RESET_GNSS:
         # TODO: This needs to be re-implemented
diff --git a/pus_tc/system/proc.py b/pus_tc/system/proc.py
index e282058..f4e513b 100644
--- a/pus_tc/system/proc.py
+++ b/pus_tc/system/proc.py
@@ -281,7 +281,7 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
         )
 
     if op_code in OpCodes.TV_TEARDOWN_TCS_FT_OFF:
-        # TCS board shold always be on anyway, do not command it off here
+        # TCS board should always be on anyway, do not command it off here
         pack_cmd_ctrl_to_off(
             tc_queue=tc_queue, object_id=obj_id_dict.get(oids.THERMAL_CONTROLLER_ID)
         )
@@ -325,8 +325,6 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
             oid = b_side_dev[0]
             set_id = b_side_dev[1]
             sid_list.append(make_sid(oid, set_id))
-        # GNSS1
-        sid_list.append(make_sid(oids.GPS_HANDLER_1_ID, GpsSetIds.HK))
         pack_generic_hk_listening_cmds(
             tc_queue=tc_queue,
             proc_key=key,
@@ -343,7 +341,6 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
             oid = d_side_dev[0]
             set_id = d_side_dev[1]
             sid_list.append(make_sid(oid, set_id))
-
         pack_generic_hk_listening_cmds(
             tc_queue=tc_queue,
             proc_key=key,