diff --git a/core/mac/src/include/sir_params.h b/core/mac/src/include/sir_params.h
index 78513a3ac805..c5b6d7c56ed7 100644
--- a/core/mac/src/include/sir_params.h
+++ b/core/mac/src/include/sir_params.h
@@ -680,9 +680,8 @@ typedef struct sSirMbMsgP2p {
 
 #define SIR_LIM_BEACON_GEN_IND          (SIR_LIM_TIMEOUT_MSG_START + 0x23)
 #define SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT    (SIR_LIM_TIMEOUT_MSG_START + 0x24)
-#ifdef FEATURE_WLAN_ESE
-#define SIR_LIM_ESE_TSM_TIMEOUT        (SIR_LIM_TIMEOUT_MSG_START + 0x25)
-#endif
+
+/* currently unused                     (SIR_LIM_TIMEOUT_MSG_START + 0x25) */
 
 #define SIR_LIM_DISASSOC_ACK_TIMEOUT       (SIR_LIM_TIMEOUT_MSG_START + 0x26)
 #define SIR_LIM_DEAUTH_ACK_TIMEOUT       (SIR_LIM_TIMEOUT_MSG_START + 0x27)
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index acb078cd5de0..79f8a1f489a1 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -663,8 +663,6 @@ lim_cleanup_rx_path(tpAniSirGlobal pMac, tpDphHashNode pStaDs,
 #ifdef FEATURE_WLAN_ESE
 #ifdef FEATURE_WLAN_ESE_UPLOAD
 		lim_send_sme_tsm_ie_ind(pMac, psessionEntry, 0, 0, 0);
-#else
-		lim_deactivate_and_change_timer(pMac, eLIM_TSM_TIMER);
 #endif /* FEATURE_WLAN_ESE_UPLOAD */
 #endif
 
diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index dd041c448135..2ef83fd10038 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -822,8 +822,6 @@ static void __lim_process_add_ts_rsp(tpAniSirGlobal mac_ctx,
 		lim_send_sme_tsm_ie_ind(mac_ctx, session, addts.tsmIE.tsid,
 					addts.tsmIE.state,
 					addts.tsmIE.msmt_interval);
-#else
-		limActivateTSMStatsTimer(mac_ctx, session);
 #endif /* FEATURE_WLAN_ESE_UPLOAD */
 	}
 #endif
@@ -1099,8 +1097,6 @@ static void __lim_process_del_ts_req(tpAniSirGlobal mac_ctx,
 #ifdef FEATURE_WLAN_ESE
 #ifdef FEATURE_WLAN_ESE_UPLOAD
 	lim_send_sme_tsm_ie_ind(mac_ctx, session, 0, 0, 0);
-#else
-	lim_deactivate_and_change_timer(mac_ctx, eLIM_TSM_TIMER);
 #endif /* FEATURE_WLAN_ESE_UPLOAD */
 #endif
 }
diff --git a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
index c11cecc56d39..a73fa87a22fd 100644
--- a/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c
@@ -501,8 +501,6 @@ static void lim_update_ese_tsm(tpAniSirGlobal mac_ctx,
 				session_entry, assoc_rsp->tsmIE.tsid,
 				assoc_rsp->tsmIE.state,
 				assoc_rsp->tsmIE.msmt_interval);
-#else
-			limActivateTSMStatsTimer(mac_ctx, session_entry);
 #endif
 			if (tsm_ctx->tsmInfo.state)
 				tsm_ctx->tsmMetrics.RoamingCount++;
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index bacb031ed16c..ac63aee78c87 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -1506,17 +1506,10 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 		lim_process_sme_req_messages(mac_ctx, msg);
 		break;
 #ifdef FEATURE_WLAN_ESE
-	case SIR_LIM_ESE_TSM_TIMEOUT:
-#ifndef FEATURE_WLAN_ESE_UPLOAD
-		limProcessTsmTimeoutHandler(mac_ctx, msg);
-#endif /* FEATURE_WLAN_ESE_UPLOAD */
-		break;
 	case WMA_TSM_STATS_RSP:
 #ifdef FEATURE_WLAN_ESE_UPLOAD
 		lim_send_sme_pe_ese_tsm_rsp(mac_ctx,
 			(tAniGetTsmStatsRsp *) msg->bodyptr);
-#else
-		limProcessHalEseTsmRsp(mac_ctx, msg);
 #endif /* FEATURE_WLAN_ESE_UPLOAD */
 		break;
 #endif
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 3846b8bba891..81939b572ccb 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -3981,8 +3981,6 @@ static void __lim_process_sme_delts_req(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 #ifdef FEATURE_WLAN_ESE
 #ifdef FEATURE_WLAN_ESE_UPLOAD
 	lim_send_sme_tsm_ie_ind(pMac, psessionEntry, 0, 0, 0);
-#else
-	lim_deactivate_and_change_timer(pMac, eLIM_TSM_TIMER);
 #endif /* FEATURE_WLAN_ESE_UPLOAD */
 #endif
 
diff --git a/core/mac/src/pe/lim/lim_timer_utils.h b/core/mac/src/pe/lim/lim_timer_utils.h
index b133d712f9e0..33b94d5505ee 100644
--- a/core/mac/src/pe/lim/lim_timer_utils.h
+++ b/core/mac/src/pe/lim/lim_timer_utils.h
@@ -65,9 +65,6 @@ enum {
 #endif
 	eLIM_REMAIN_CHN_TIMER,
 	eLIM_PERIODIC_PROBE_REQ_TIMER,
-#ifdef FEATURE_WLAN_ESE
-	eLIM_TSM_TIMER,
-#endif
 	eLIM_DISASSOC_ACK_TIMER,
 	eLIM_DEAUTH_ACK_TIMER,
 	eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER,
diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c
index d82e022021c2..35f23a80ae1a 100644
--- a/core/mac/src/pe/lim/lim_trace.c
+++ b/core/mac/src/pe/lim/lim_trace.c
@@ -76,9 +76,6 @@ static uint8_t *__lim_trace_get_timer_string(uint16_t timerId)
 #endif
 		CASE_RETURN_STRING(eLIM_REMAIN_CHN_TIMER);
 		CASE_RETURN_STRING(eLIM_PERIODIC_PROBE_REQ_TIMER);
-#ifdef FEATURE_WLAN_ESE
-		CASE_RETURN_STRING(eLIM_TSM_TIMER);
-#endif
 		CASE_RETURN_STRING(eLIM_DISASSOC_ACK_TIMER);
 		CASE_RETURN_STRING(eLIM_DEAUTH_ACK_TIMER);
 		CASE_RETURN_STRING(eLIM_PERIODIC_JOIN_PROBE_REQ_TIMER);
diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
index 7d0d9ac102f3..63f13c8fe787 100644
--- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
+++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
@@ -663,9 +663,6 @@ uint8_t *mac_trace_get_lim_msg_string(uint16_t lim_msg)
 		CASE_RETURN_STRING(SIR_LIM_CONVERT_ACTIVE_CHANNEL_TO_PASSIVE);
 		CASE_RETURN_STRING(SIR_LIM_BEACON_GEN_IND);
 		CASE_RETURN_STRING(SIR_LIM_PERIODIC_PROBE_REQ_TIMEOUT);
-#ifdef FEATURE_WLAN_ESE
-		CASE_RETURN_STRING(SIR_LIM_ESE_TSM_TIMEOUT);
-#endif
 		CASE_RETURN_STRING(SIR_LIM_DISASSOC_ACK_TIMEOUT);
 		CASE_RETURN_STRING(SIR_LIM_DEAUTH_ACK_TIMEOUT);
 		CASE_RETURN_STRING(SIR_LIM_PERIODIC_JOIN_PROBE_REQ_TIMEOUT);
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index f22b16d51cfe..fbfa066e3e5b 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -10801,8 +10801,6 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr)
 	    && session->connectedProfile.isESEAssoc) {
 #ifdef FEATURE_WLAN_ESE_UPLOAD
 		csr_send_ese_adjacent_ap_rep_ind(mac_ctx, session);
-#else
-		csr_ese_send_adjacent_ap_rep_msg(mac_ctx, session);
 #endif
 		session->isPrevApInfoValid = false;
 	}
@@ -13565,16 +13563,6 @@ CDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 				cdf_mem_copy((void *)(wpaRsnIE),
 						pSession->suppCckmIeInfo.cckmIe,
 						ieLen);
-#else
-				ieLen = csrConstructEseCckmIe(pMac,
-						pSession,
-						pProfile,
-						pBssDescription,
-						pSession->
-						pWpaRsnReqIE,
-						pSession->
-						nWpaRsnReqIeLength,
-						(void *)(wpaRsnIE));
 #endif /* FEATURE_WLAN_ESE_UPLOAD */
 			} else
 				ieLen = 0;
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index acebf9b3ae3f..529ee0de6724 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -4469,8 +4469,6 @@ CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler,
 #ifdef FEATURE_WLAN_ESE_UPLOAD
 	tpAniGetTsmStatsReq pStats = (tpAniGetTsmStatsReq) pTsmStatsMsg;
 	tpAniGetTsmStatsRsp pTsmRspParams = NULL;
-#else
-	tpTSMStats pStats = (tpTSMStats) pTsmStatsMsg;
 #endif /* FEATURE_WLAN_ESE_UPLOAD */
 	int tid = pStats->tid;
 	/*
@@ -4506,8 +4504,6 @@ CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler,
 	pTsmRspParams->rc = eSIR_FAILURE;
 	pTsmRspParams->tsmStatsReq = pStats;
 	pTsmMetric = &pTsmRspParams->tsmMetrics;
-#else
-	pTsmMetric = (tpAniTrafStrmMetrics)&(pStats->tsmMetrics);
 #endif /* FEATURE_WLAN_ESE_UPLOAD */
 	/* populate pTsmMetric */
 	pTsmMetric->UplinkPktQueueDly = queue_delay_microsec;
@@ -4527,8 +4523,6 @@ CDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler,
 	/* post this message to LIM/PE */
 #ifdef FEATURE_WLAN_ESE_UPLOAD
 	wma_send_msg(wma_handler, WMA_TSM_STATS_RSP, (void *)pTsmRspParams, 0);
-#else
-	wma_send_msg(wma_handler, WMA_TSM_STATS_RSP, (void *)pTsmStatsMsg, 0);
 #endif /* FEATURE_WLAN_ESE_UPLOAD */
 	return CDF_STATUS_SUCCESS;
 }