diff --git a/src/dmr_csbk.c b/src/dmr_csbk.c
index e615498..478f454 100644
--- a/src/dmr_csbk.c
+++ b/src/dmr_csbk.c
@@ -613,9 +613,6 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
         sprintf (state->dmr_branding, "%s", "Motorola");
         sprintf(state->dmr_branding_sub, "Con+ ");
 
-        //nullify any previous TIII data (bugfix for bad assignments or system type switching)
-        sprintf(state->dmr_site_parms, "%s", "");
-
       }
 
       if (csbk_o == 0x03)
@@ -634,9 +631,6 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
         sprintf (state->dmr_branding, "%s", "Motorola");
         sprintf(state->dmr_branding_sub, "Con+ ");
 
-        //nullify any previous TIII data (bugfix for bad assignments or system type switching)
-        sprintf(state->dmr_site_parms, "%s", "");
-
         //if using rigctl we can set an unknown cc frequency by polling rigctl for the current frequency
         if (opts->use_rigctl == 1 && state->p25_cc_freq == 0) //if not set from channel map 0
         {
@@ -719,9 +713,6 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
         state->dmr_mfid = 0x06; 
         sprintf (state->dmr_branding, "%s", "Motorola");
         sprintf(state->dmr_branding_sub, "Con+ ");
-
-        //nullify any previous TIII data (bugfix for bad assignments or system type switching)
-        sprintf(state->dmr_site_parms, "%s", "");
       }
 
       if (csbk_o == 0x0C) 
@@ -738,9 +729,6 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
         state->dmr_mfid = 0x06; 
         sprintf (state->dmr_branding, "%s", "Motorola");
         sprintf(state->dmr_branding_sub, "Con+ ");
-
-        //nullify any previous TIII data (bugfix for bad assignments or system type switching)
-        sprintf(state->dmr_site_parms, "%s", "");
       }
 
       if (csbk_o == 0x11) 
@@ -752,9 +740,6 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
         state->dmr_mfid = 0x06; 
         sprintf (state->dmr_branding, "%s", "Motorola");
         sprintf(state->dmr_branding_sub, "Con+ ");
-
-        //nullify any previous TIII data (bugfix for bad assignments or system type switching)
-        sprintf(state->dmr_site_parms, "%s", "");
       }
 
       if (csbk_o == 0x12) 
@@ -766,9 +751,6 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
         state->dmr_mfid = 0x06; 
         sprintf (state->dmr_branding, "%s", "Motorola");
         sprintf(state->dmr_branding_sub, "Con+ ");
-
-        //nullify any previous TIII data (bugfix for bad assignments or system type switching)
-        sprintf(state->dmr_site_parms, "%s", "");
       }
 
       if (csbk_o == 0x18) 
@@ -780,9 +762,6 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
         state->dmr_mfid = 0x06; 
         sprintf (state->dmr_branding, "%s", "Motorola");
         sprintf(state->dmr_branding_sub, "Con+ ");
-
-        //nullify any previous TIII data (bugfix for bad assignments or system type switching)
-        sprintf(state->dmr_site_parms, "%s", "");
       }
 
       fprintf (stderr, "%s", KNRM);
diff --git a/src/dmr_flco.c b/src/dmr_flco.c
index d56c68b..b34e245 100644
--- a/src/dmr_flco.c
+++ b/src/dmr_flco.c
@@ -499,9 +499,6 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
     sprintf (state->dmr_branding_sub, "%s", "Con+ ");
     fprintf (stderr, " SLCO Connect Plus Voice Channel - Net ID: %d Site ID: %d", con_netid, con_siteid);
     sprintf (state->dmr_site_parms, "%d-%d ", con_netid, con_siteid);
-
-    //nullify any previous TIII data (bugfix for bad assignments or system type switching)
-    sprintf(state->dmr_site_parms, "%s", "");
   }
     
   else if (slco == 0xA)
@@ -511,15 +508,13 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
     sprintf (state->dmr_branding_sub, "%s", "Con+ ");
     fprintf (stderr, " SLCO Connect Plus Control Channel - Net ID: %d Site ID: %d", con_netid, con_siteid);
     sprintf (state->dmr_site_parms, "%d-%d ", con_netid, con_siteid);
+    
     //if using rigctl we can set an unknown cc frequency by polling rigctl for the current frequency
     if (opts->use_rigctl == 1 && state->p25_cc_freq == 0) //if not set from channel map 0
     {
       ccfreq = GetCurrentFreq (opts->rigctl_sockfd);
       if (ccfreq != 0) state->p25_cc_freq = ccfreq;
     }
-
-    //nullify any previous TIII data (bugfix for bad assignments or system type switching)
-    sprintf(state->dmr_site_parms, "%s", "");
   }
    
   else if (slco == 0xF)
@@ -534,7 +529,7 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
     {
       state->p25_cc_freq = state->trunk_chan_map[restchannel];
     }
-    
+
     //nullify any previous TIII data (bugfix for bad assignments or system type switching)
     sprintf(state->dmr_site_parms, "%s", "");
   }