diff --git a/src/core/cntlr_map_debug.c b/src/core/cntlr_map_debug.c
index 4985ca3f974918c8fdc50fe6f1c78e080fbfc617..5a28b6e1b0fa130569d919905b592b06e186cac8 100644
--- a/src/core/cntlr_map_debug.c
+++ b/src/core/cntlr_map_debug.c
@@ -72,12 +72,12 @@ int debug_ap_caps_report(void *cntlr, struct cmdu_cstruct *cmdu)
 
 	for (i = 0; i < cmdu->num_tlvs; i++) {
 		tlv = (uint8_t *) cmdu->tlvs[i];
-		trace("CMDU type: %s, len = %04x %d %d\n", map_stringify_tlv_type(*tlv), *(tlv + 1), (uint16_t) *(tlv+2), map_get_first_tlv_length(cmdu->tlvs));
+		trace("CMDU type: %s\n", map_stringify_tlv_type(*tlv));
 		switch (*tlv) {
 		case MAP_TLV_AP_CAPABILITY:
 			{
 				struct tlv_ap_cap *p = (struct tlv_ap_cap *)tlv;
-				trace("len = %d\n", p->tlv_len);
+
 				trace("\top_ch_metric_reporting: %d\n", p->op_ch_metric_reporting);
 				trace("\tnon_op_ch_metric_reporting: %d\n", p->non_op_ch_metric_reporting);
 				trace("\tagent_init_rcpi_steering: %d\n", p->agent_init_rcpi_steering);
@@ -86,7 +86,7 @@ int debug_ap_caps_report(void *cntlr, struct cmdu_cstruct *cmdu)
 		case MAP_TLV_AP_RADIO_BASIC_CAPABILITIES:
 			{
 				struct tlv_ap_radio_basic_cap *p = (struct tlv_ap_radio_basic_cap *)tlv;
-				trace("len = %d\n", p->tlv_len);
+
 				trace("\tradio_id: " MACFMT "\n", MAC2STR(p->radio_id));
 				trace("\tmax_bss_nr: %d\n", p->max_bss_nr);
 				trace("\toperating_classes_nr: %d\n", p->operating_classes_nr);
@@ -103,7 +103,7 @@ int debug_ap_caps_report(void *cntlr, struct cmdu_cstruct *cmdu)
 		case MAP_TLV_AP_HT_CAPABILITIES:
 			{
 				struct tlv_ap_ht_cap *p = (struct tlv_ap_ht_cap *)tlv;
-				trace("len = %d\n", p->tlv_len);
+
 				trace("\tradio_id: " MACFMT "\n", MAC2STR(p->radio_id));
 				trace("\tmax_tx_streams_supported: %d\n", p->max_tx_streams_supported);
 				trace("\tmax_tx_streams_supported: ");
@@ -118,7 +118,7 @@ int debug_ap_caps_report(void *cntlr, struct cmdu_cstruct *cmdu)
 		case MAP_TLV_AP_VHT_CAPABILITIES:
 			{
 				struct tlv_ap_vht_cap *p = (struct tlv_ap_vht_cap *)tlv;
-				trace("len = %d\n", p->tlv_len);
+
 				trace("\tradio_id: " MACFMT "\n", MAC2STR(p->radio_id));
 				trace("\tvht_tx_mcs_supported: ");
 				print_bits(p->vht_tx_mcs_supported, 16, 2);