diff --git a/core/hdd/inc/wlan_hdd_softap_tx_rx.h b/core/hdd/inc/wlan_hdd_softap_tx_rx.h
index 39b05c6d36ec..e3e28d3de7d1 100644
--- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h
+++ b/core/hdd/inc/wlan_hdd_softap_tx_rx.h
@@ -123,7 +123,6 @@ QDF_STATUS hdd_softap_deregister_sta(struct hdd_adapter *adapter,
  * @adapter: pointer to adapter context
  * @auth_required: is additional authentication required?
  * @privacy_required: should 802.11 privacy bit be set?
- * @sta_id: station ID assigned to this station
  * @sta_mac: station MAC address
  * @wmm_enabled: is WMM enabled for this STA?
  *
@@ -132,7 +131,6 @@ QDF_STATUS hdd_softap_deregister_sta(struct hdd_adapter *adapter,
 QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
 				   bool auth_required,
 				   bool privacy_required,
-				   uint8_t sta_id,
 				   struct qdf_mac_addr *sta_mac,
 				   bool wmm_enabled);
 
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index e71bdbcd9082..3e859efa320f 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -1963,16 +1963,13 @@ QDF_STATUS hdd_change_peer_state(struct hdd_adapter *adapter,
 	void *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	void *peer;
-	/* Will be removed as a part of clean up */
-	uint8_t sta_id;
 
 	if (!pdev) {
 		hdd_err("Failed to get txrx context");
 		return QDF_STATUS_E_FAULT;
 	}
 
-	peer = cdp_peer_find_by_addr(soc, (struct cdp_pdev *)pdev,
-				     peer_mac, &sta_id);
+	peer = cdp_peer_find_by_addr(soc, (struct cdp_pdev *)pdev, peer_mac);
 	if (!peer)
 		return QDF_STATUS_E_FAULT;
 
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index fc2ed3373a5f..bfe491f52f15 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -2199,7 +2199,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 						adapter,
 						true,
 						ap_ctx->privacy,
-						event->staId,
 						(struct qdf_mac_addr *)
 						wrqu.addr.sa_data,
 						event->wmmEnabled);
@@ -2212,7 +2211,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 						adapter,
 						false,
 						ap_ctx->privacy,
-						event->staId,
 						(struct qdf_mac_addr *)
 						wrqu.addr.sa_data,
 						event->wmmEnabled);
diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c
index 4d4394e7f16b..523ca6a060af 100644
--- a/core/hdd/src/wlan_hdd_ocb.c
+++ b/core/hdd/src/wlan_hdd_ocb.c
@@ -218,28 +218,18 @@ static int hdd_ocb_register_sta(struct hdd_adapter *adapter)
 	struct ol_txrx_desc_type sta_desc = {0};
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	/* To be cleaned up */
-	uint8_t peer_id;
 	struct ol_txrx_ops txrx_ops;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	void *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	struct cdp_vdev *vdev;
 
 	qdf_status = cdp_peer_register_ocb_peer(soc,
-				adapter->mac_addr.bytes,
-				&peer_id);
+				adapter->mac_addr.bytes);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		hdd_err("Error registering OCB Self Peer!");
 		return -EINVAL;
 	}
 
-	if (peer_id >= HDD_MAX_ADAPTERS) {
-		hdd_err("Error: Invalid peer_id: %u", peer_id);
-		return -EINVAL;
-	}
-
-	/* To be cleaned up */
-	sta_desc.sta_id = peer_id;
 	WLAN_ADDR_COPY(sta_desc.peer_addr.bytes, adapter->mac_addr.bytes);
 	sta_desc.is_qos_enabled = 1;
 
diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c
index 4bc094c5e642..3f6894bcaabc 100644
--- a/core/hdd/src/wlan_hdd_softap_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c
@@ -1011,7 +1011,6 @@ QDF_STATUS hdd_softap_deregister_sta(struct hdd_adapter *adapter,
 QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
 				   bool auth_required,
 				   bool privacy_required,
-				   uint8_t sta_id,
 				   struct qdf_mac_addr *sta_mac,
 				   bool wmm_enabled)
 {
@@ -1039,8 +1038,6 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
 		hdd_softap_deregister_sta(adapter, sta_info);
 	}
 
-	/* Get the Station ID from the one saved during the association. */
-	txrx_desc.sta_id = sta_id;
 	/*
 	 * If the address is a broadcast address, then provide the self mac addr
 	 * to the data path. Else provide the mac address of the connected peer.
@@ -1173,7 +1170,7 @@ QDF_STATUS hdd_softap_register_bc_sta(struct hdd_adapter *adapter,
 	}
 
 	qdf_status = hdd_softap_register_sta(adapter, false,
-					     privacy_required, sta_id,
+					     privacy_required,
 					     &broadcast_macaddr, 0);
 
 	return qdf_status;
diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c
index 53a1119eda3f..089fb3e66875 100644
--- a/core/hdd/src/wlan_hdd_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_tx_rx.c
@@ -565,13 +565,11 @@ static inline bool hdd_is_tx_allowed(struct sk_buff *skb, uint8_t *peer_mac)
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	void *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	void *peer;
-	/* Will be removed in Phase 3 cleanup */
-	uint8_t peer_id;
 
 	QDF_BUG(soc);
 	QDF_BUG(pdev);
 
-	peer = cdp_peer_find_by_addr(soc, pdev, peer_mac, &peer_id);
+	peer = cdp_peer_find_by_addr(soc, pdev, peer_mac);
 
 	if (!peer) {
 		hdd_err_rl("Unable to find peer entry for sta: "
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 106367fa1582..0cfdf78cef2f 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -1595,7 +1595,6 @@ typedef struct sSmeIbssPeerInd {
 
 struct ibss_peer_inactivity_ind {
 	uint8_t bss_idx;
-	uint8_t staIdx;
 	struct qdf_mac_addr peer_addr;
 };
 
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index eff0bfa33673..2093bc0942db 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -2352,7 +2352,6 @@ lim_add_sta(struct mac_context *mac_ctx,
 	pe_debug("Assoc ID: %d wmmEnabled: %d listenInterval: %d",
 		 add_sta_params->assocId, add_sta_params->wmmEnabled,
 		 add_sta_params->listenInterval);
-
 	add_sta_params->staType = sta_ds->staType;
 
 	add_sta_params->updateSta = update_entry;
@@ -2819,10 +2818,10 @@ lim_del_sta(struct mac_context *mac,
 	msgQ.bodyval = 0;
 
 	pe_debug("Sessionid %d :Sending SIR_HAL_DELETE_STA_REQ "
-		 "for STAID: %X and AssocID: %d MAC : "
+		 "for mac_addr %pM and AssocID: %d MAC : "
 		 QDF_MAC_ADDR_STR, pDelStaParams->sessionId,
-		pDelStaParams->staIdx, pDelStaParams->assocId,
-		QDF_MAC_ADDR_ARRAY(sta->staAddr));
+		 pDelStaParams->staMac, pDelStaParams->assocId,
+		 QDF_MAC_ADDR_ARRAY(sta->staAddr));
 
 	MTRACE(mac_trace_msg_tx(mac, pe_session->peSessionId, msgQ.type));
 	retCode = wma_post_ctrl_msg(mac, &msgQ);
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 7995e413cd2e..90182859d7d3 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -1635,7 +1635,6 @@ static void lim_process_addba_req(struct mac_context *mac_ctx, uint8_t *rx_pkt_i
 	tDot11faddba_req *addba_req;
 	uint32_t frame_len, status;
 	QDF_STATUS qdf_status;
-	uint8_t peer_id;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	void *peer, *pdev;
 
@@ -1669,7 +1668,7 @@ static void lim_process_addba_req(struct mac_context *mac_ctx, uint8_t *rx_pkt_i
 			status, frame_len);
 	}
 
-	peer = cdp_peer_get_ref_by_addr(soc, pdev, mac_hdr->sa, &peer_id,
+	peer = cdp_peer_get_ref_by_addr(soc, pdev, mac_hdr->sa,
 					PEER_DEBUG_ID_WMA_ADDBA_REQ);
 	if (!peer) {
 		pe_err("PEER [%pM] not found", mac_hdr->sa);
@@ -1717,7 +1716,6 @@ static void lim_process_delba_req(struct mac_context *mac_ctx, uint8_t *rx_pkt_i
 	tDot11fdelba_req *delba_req;
 	uint32_t frame_len, status;
 	QDF_STATUS qdf_status;
-	uint8_t peer_id;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	void *peer, *pdev;
 
@@ -1751,7 +1749,7 @@ static void lim_process_delba_req(struct mac_context *mac_ctx, uint8_t *rx_pkt_i
 			status, frame_len);
 	}
 
-	peer = cdp_peer_get_ref_by_addr(soc, pdev, mac_hdr->sa, &peer_id,
+	peer = cdp_peer_get_ref_by_addr(soc, pdev, mac_hdr->sa,
 					PEER_DEBUG_ID_WMA_DELBA_REQ);
 	if (!peer) {
 		pe_err("PEER [%pM] not found", mac_hdr->sa);
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index 8af1fe2beb06..4b6c7860bff7 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -2413,7 +2413,6 @@ static QDF_STATUS lim_addba_rsp_tx_complete_cnf(void *context,
 	tDot11faddba_rsp rsp;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	void *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
-	uint8_t peer_id;
 	void *peer;
 	uint32_t frame_len;
 	QDF_STATUS status;
@@ -2449,7 +2448,7 @@ static QDF_STATUS lim_addba_rsp_tx_complete_cnf(void *context,
 		goto error;
 	}
 
-	peer = cdp_peer_get_ref_by_addr(soc, pdev, mac_hdr->da, &peer_id,
+	peer = cdp_peer_get_ref_by_addr(soc, pdev, mac_hdr->da,
 					PEER_DEBUG_ID_WMA_ADDBA_REQ);
 	if (!peer) {
 		pe_debug("no PEER found for mac_addr:%pM", mac_hdr->da);
@@ -4925,7 +4924,7 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
 	uint8_t tx_flag = 0;
 	uint8_t vdev_id = 0;
 	uint16_t buff_size, status_code, batimeout;
-	uint8_t peer_id, dialog_token;
+	uint8_t dialog_token;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	void *peer, *pdev;
 	uint8_t he_frag = 0;
@@ -4941,7 +4940,7 @@ QDF_STATUS lim_send_addba_response_frame(struct mac_context *mac_ctx,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	peer = cdp_peer_get_ref_by_addr(soc, pdev, peer_mac, &peer_id,
+	peer = cdp_peer_get_ref_by_addr(soc, pdev, peer_mac,
 					PEER_DEBUG_ID_LIM_SEND_ADDBA_RESP);
 	if (!peer) {
 		pe_err("PEER [%pM] not found", peer_mac);
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 06b98b92d4ca..98a0f8b4a1d0 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -16222,7 +16222,6 @@ QDF_STATUS sme_check_for_duplicate_session(mac_handle_t mac_handle,
 	QDF_STATUS status = QDF_STATUS_E_INVAL;
 	struct cdp_pdev *pdev;
 	ol_txrx_peer_handle peer;
-	uint8_t peer_id;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	struct mac_context *mac_ctx = MAC_CONTEXT(mac_handle);
 
@@ -16241,10 +16240,9 @@ QDF_STATUS sme_check_for_duplicate_session(mac_handle_t mac_handle,
 		return status;
 
 	peer = cdp_peer_find_by_addr(soc, pdev,
-				     peer_addr,
-				     &peer_id);
+				     peer_addr);
 	if (peer) {
-		sme_err("Peer=%d exist with same MAC", peer_id);
+		sme_err("Peer exists with same MAC");
 		status = QDF_STATUS_E_EXISTS;
 	} else {
 		status = QDF_STATUS_SUCCESS;
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index 86a044cfe0f5..f9ec784f2a2b 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -2557,8 +2557,6 @@ QDF_STATUS wma_pre_assoc_req(struct bss_params *add_bss);
  */
 void wma_add_bss_lfr3(tp_wma_handle wma, struct bss_params *add_bss);
 
-uint8_t wma_peer_get_peet_id(uint8_t *mac);
-
 #ifdef WLAN_FEATURE_HOST_ROAM
 /**
  * wma_add_bss_lfr2_vdev_start() - add bss and start vdev during host roaming
diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h
index ba335a573298..4d106ad2fea3 100644
--- a/core/wma/inc/wma_if.h
+++ b/core/wma/inc/wma_if.h
@@ -254,7 +254,6 @@ typedef struct {
 
 /**
  * struct tDeleteStaParams - parameters required for del sta request
- * @staIdx: station index
  * @assocId: association index
  * @status: status
  * @respReqd: is response required
@@ -264,7 +263,6 @@ typedef struct {
  * @staMac: station mac
  */
 typedef struct {
-	uint16_t staIdx;
 	uint16_t assocId;
 	QDF_STATUS status;
 	uint8_t respReqd;
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 211f19904c2a..d229af7a0f07 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -621,7 +621,6 @@ static QDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle,
 	void *peer;
 	struct cdp_pdev *pdev;
 	QDF_STATUS qdf_status;
-	uint8_t peer_id;
 	uint8_t vdev_id = del_vdev_req->vdev_id;
 	struct wma_target_req *msg = NULL;
 	struct del_sta_self_rsp_params *sta_self_wmi_rsp;
@@ -637,8 +636,7 @@ static QDF_STATUS wma_self_peer_remove(tp_wma_handle wma_handle,
 		goto error;
 	}
 
-	peer = cdp_peer_find_by_addr(soc, pdev, del_vdev_req->self_mac_addr,
-				     &peer_id);
+	peer = cdp_peer_find_by_addr(soc, pdev, del_vdev_req->self_mac_addr);
 	if (!peer) {
 		wma_err("Failed to find peer %pM", del_vdev_req->self_mac_addr);
 		qdf_status = QDF_STATUS_E_FAULT;
@@ -1734,7 +1732,6 @@ static bool wma_find_duplicate_peer_on_other_vdev(tp_wma_handle wma,
 	struct cdp_pdev *pdev, uint8_t vdev_id, uint8_t *peer_mac)
 {
 	int i;
-	uint8_t peer_id;
 	struct cdp_vdev *handle;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	struct wlan_objmgr_vdev *vdev;
@@ -1749,9 +1746,9 @@ static bool wma_find_duplicate_peer_on_other_vdev(tp_wma_handle wma,
 		   !handle)
 			continue;
 		if (cdp_peer_find_by_addr_and_vdev(soc, pdev,
-			handle, peer_mac, &peer_id)) {
-			WMA_LOGE("%s :Duplicate peer %pM (peer id %d) already exist on vdev %d",
-				__func__, peer_mac, peer_id, i);
+			handle, peer_mac)) {
+			WMA_LOGE("%s :Duplicate peer %pM already exist on vdev %d",
+				__func__, peer_mac, i);
 			return true;
 		}
 	}
@@ -2036,7 +2033,6 @@ static int wma_remove_bss_peer(tp_wma_handle wma, void *pdev, uint32_t vdev_id,
 			       uint8_t type)
 {
 	void *peer, *vdev;
-	uint8_t peer_id;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	uint8_t *mac_addr = NULL;
 	struct wma_target_req *del_req;
@@ -2070,7 +2066,7 @@ static int wma_remove_bss_peer(tp_wma_handle wma, void *pdev, uint32_t vdev_id,
 		mac_addr = bssid.bytes;
 	}
 
-	peer = cdp_peer_find_by_addr(soc, pdev, mac_addr, &peer_id);
+	peer = cdp_peer_find_by_addr(soc, pdev, mac_addr);
 	if (!peer) {
 		WMA_LOGE(FL("peer NULL for vdev_id = %d"), vdev_id);
 		return -EINVAL;
@@ -2317,7 +2313,6 @@ __wma_handle_vdev_stop_rsp(struct vdev_stop_response *resp_event)
 	tp_wma_handle wma = cds_get_context(QDF_MODULE_ID_WMA);
 	struct cdp_pdev *pdev;
 	void *peer = NULL;
-	uint8_t peer_id;
 	struct wma_txrx_node *iface;
 	int status = QDF_STATUS_SUCCESS;
 	struct qdf_mac_addr bssid;
@@ -2379,8 +2374,7 @@ __wma_handle_vdev_stop_rsp(struct vdev_stop_response *resp_event)
 	}
 
 	if (vdev_stop_type == WMA_DELETE_BSS_HO_FAIL_REQ) {
-		peer = cdp_peer_find_by_addr(soc, pdev,
-					     bssid.bytes, &peer_id);
+		peer = cdp_peer_find_by_addr(soc, pdev, bssid.bytes);
 		if (!peer) {
 			WMA_LOGE("%s: Failed to find peer %pM", __func__,
 				 bssid.bytes);
@@ -3518,7 +3512,6 @@ QDF_STATUS wma_pre_vdev_start_setup(uint8_t vdev_id,
 	struct cdp_pdev *pdev;
 	struct cdp_vdev *vdev;
 	void *peer;
-	uint8_t peer_id;
 	QDF_STATUS status;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	struct wma_txrx_node *iface;
@@ -3559,7 +3552,7 @@ QDF_STATUS wma_pre_vdev_start_setup(uint8_t vdev_id,
 		return status;
 	}
 
-	peer = cdp_peer_find_by_addr(soc, pdev, mac_addr, &peer_id);
+	peer = cdp_peer_find_by_addr(soc, pdev, mac_addr);
 	if (!peer) {
 		wma_err("Failed to find peer %pM", mac_addr);
 		return QDF_STATUS_E_FAILURE;
@@ -3672,7 +3665,7 @@ static QDF_STATUS wma_update_iface_params(tp_wma_handle wma,
 }
 
 static inline
-void *wma_cdp_find_peer_by_addr(uint8_t *peer_addr, uint8_t *sta_idx)
+void *wma_cdp_find_peer_by_addr(uint8_t *peer_addr)
 {
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	struct cdp_pdev *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
@@ -3682,17 +3675,16 @@ void *wma_cdp_find_peer_by_addr(uint8_t *peer_addr, uint8_t *sta_idx)
 		return NULL;
 	}
 
-	return cdp_peer_find_by_addr(soc, pdev, peer_addr, sta_idx);
+	return cdp_peer_find_by_addr(soc, pdev, peer_addr);
 }
 
 static
 QDF_STATUS wma_save_bss_params(tp_wma_handle wma, struct bss_params *add_bss)
 {
 	QDF_STATUS status;
-	uint8_t sta_id;
 
 	wma_vdev_set_he_config(wma, add_bss->staContext.smesessionId, add_bss);
-	if (!wma_cdp_find_peer_by_addr(add_bss->bssId, &sta_id))
+	if (!wma_cdp_find_peer_by_addr(add_bss->bssId))
 		status = QDF_STATUS_E_FAILURE;
 	else
 		status = QDF_STATUS_SUCCESS;
@@ -3730,13 +3722,12 @@ void wma_add_bss_lfr3(tp_wma_handle wma, struct bss_params *add_bss)
 {
 	QDF_STATUS status;
 	void *peer = NULL;
-	uint8_t peer_id;
 
 	status = wma_update_iface_params(wma, add_bss);
 	if (QDF_IS_STATUS_ERROR(status))
 		return;
 
-	peer = wma_cdp_find_peer_by_addr(add_bss->bssId, &peer_id);
+	peer = wma_cdp_find_peer_by_addr(add_bss->bssId);
 	if (!peer) {
 		WMA_LOGE("%s Failed to find peer %pM", __func__,
 			 add_bss->bssId);
@@ -3784,7 +3775,6 @@ QDF_STATUS wma_add_bss_lfr2_vdev_start(struct wlan_objmgr_vdev *vdev,
 				       struct bss_params *add_bss)
 {
 	tp_wma_handle wma;
-	uint8_t peer_id;
 	void *peer = NULL;
 	QDF_STATUS status;
 	struct vdev_mlme_obj *mlme_obj;
@@ -3807,8 +3797,7 @@ QDF_STATUS wma_add_bss_lfr2_vdev_start(struct wlan_objmgr_vdev *vdev,
 	if (QDF_IS_STATUS_ERROR(status))
 		goto send_fail_resp;
 
-	peer = wma_cdp_find_peer_by_addr(mlme_obj->mgmt.generic.bssid,
-					 &peer_id);
+	peer = wma_cdp_find_peer_by_addr(mlme_obj->mgmt.generic.bssid);
 	if (!peer) {
 		wma_err("Failed to find peer %pM",
 			mlme_obj->mgmt.generic.bssid);
@@ -3849,7 +3838,7 @@ QDF_STATUS wma_send_peer_assoc_req(struct bss_params *add_bss)
 	struct cdp_pdev *pdev;
 	struct wma_target_req *msg;
 	tp_wma_handle wma;
-	uint8_t vdev_id, peer_id;
+	uint8_t vdev_id;
 	void *peer = NULL;
 	QDF_STATUS status;
 	struct wma_txrx_node *iface;
@@ -3877,7 +3866,7 @@ QDF_STATUS wma_send_peer_assoc_req(struct bss_params *add_bss)
 	if (QDF_IS_STATUS_ERROR(status))
 		goto send_resp;
 
-	peer = wma_cdp_find_peer_by_addr(add_bss->bssId, &peer_id);
+	peer = wma_cdp_find_peer_by_addr(add_bss->bssId);
 	if (add_bss->nonRoamReassoc && peer)
 		goto send_resp;
 
@@ -3999,7 +3988,6 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 	struct cdp_pdev *pdev;
 	struct cdp_vdev *vdev;
 	void *peer;
-	uint8_t peer_id;
 	QDF_STATUS status;
 	int32_t ret;
 	struct wma_txrx_node *iface = NULL;
@@ -4040,7 +4028,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 
 	iface = &wma->interfaces[add_sta->smesessionId];
 	peer = cdp_peer_find_by_addr_and_vdev(soc, pdev, vdev,
-				add_sta->staMac, &peer_id);
+				add_sta->staMac);
 	if (peer) {
 		wma_remove_peer(wma, add_sta->staMac, add_sta->smesessionId,
 				peer, false);
@@ -4054,10 +4042,10 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 	 * here.
 	 */
 	peer = cdp_peer_find_by_addr(soc, pdev,
-			add_sta->staMac, &peer_id);
+			add_sta->staMac);
 	if (peer) {
-		WMA_LOGE("%s: My vdev:%pK, but Peer exists on other vdev with peer_addr %pM and peer_id %d",
-			__func__, vdev, add_sta->staMac, peer_id);
+		WMA_LOGE("%s: My vdev:%pK, but Peer exists on other vdev with peer_addr %pM",
+			 __func__, vdev, add_sta->staMac);
 		add_sta->status = QDF_STATUS_E_FAILURE;
 		goto send_rsp;
 	}
@@ -4076,7 +4064,7 @@ static void wma_add_sta_req_ap_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 
 	peer = cdp_peer_find_by_addr_and_vdev(soc, pdev,
 				vdev,
-				add_sta->staMac, &peer_id);
+				add_sta->staMac);
 	if (!peer) {
 		WMA_LOGE("%s: Failed to find peer handle using peer mac %pM",
 			 __func__, add_sta->staMac);
@@ -4206,7 +4194,6 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta)
 	struct cdp_pdev *pdev;
 	struct cdp_vdev *vdev;
 	void *peer;
-	uint8_t peer_id;
 	QDF_STATUS status;
 	int32_t ret;
 	struct tdls_peer_update_state *peer_state;
@@ -4258,13 +4245,12 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta)
 		}
 
 		peer = cdp_peer_find_by_addr(soc, pdev,
-				add_sta->staMac,
-				&peer_id);
+				add_sta->staMac);
 		if (!peer) {
 			WMA_LOGE("%s: addSta, failed to find peer handle for mac %pM",
 				__func__, add_sta->staMac);
 			add_sta->status = QDF_STATUS_E_FAILURE;
-			cdp_peer_add_last_real_peer(soc, pdev, vdev, &peer_id);
+			cdp_peer_add_last_real_peer(soc, pdev, vdev);
 			goto send_rsp;
 		}
 
@@ -4286,14 +4272,13 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta)
 		/* its a change sta request * */
 		peer =
 			cdp_peer_find_by_addr(soc, pdev,
-				add_sta->staMac,
-				&peer_id);
+				add_sta->staMac);
 		if (!peer) {
 			WMA_LOGE("%s: changeSta,failed to find peer handle for mac %pM",
 				__func__, add_sta->staMac);
 			add_sta->status = QDF_STATUS_E_FAILURE;
 
-			cdp_peer_add_last_real_peer(soc, pdev, vdev, &peer_id);
+			cdp_peer_add_last_real_peer(soc, pdev, vdev);
 
 			goto send_rsp;
 		}
@@ -4331,7 +4316,7 @@ static void wma_add_tdls_sta(tp_wma_handle wma, tpAddStaParams add_sta)
 			add_sta->status = QDF_STATUS_E_FAILURE;
 			wma_remove_peer(wma, add_sta->staMac,
 					add_sta->smesessionId, peer, false);
-			cdp_peer_add_last_real_peer(soc, pdev, vdev, &peer_id);
+			cdp_peer_add_last_real_peer(soc, pdev, vdev);
 			wma_remove_req(wma, add_sta->smesessionId,
 				       WMA_PEER_ASSOC_CNF_START);
 			peer_assoc_cnf = false;
@@ -4412,8 +4397,6 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params)
 	bool peer_assoc_cnf = false;
 	int smps_param;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
-	/* Will be removed as a part of cleanup */
-	uint8_t sta_id;
 
 #ifdef FEATURE_WLAN_TDLS
 	if (STA_ENTRY_TDLS_PEER == params->staType) {
@@ -4435,7 +4418,7 @@ static void wma_add_sta_req_sta_mode(tp_wma_handle wma, tpAddStaParams params)
 			 __func__, params->staType);
 		goto out;
 	}
-	peer = cdp_peer_find_by_addr(soc, pdev, params->bssId, &sta_id);
+	peer = cdp_peer_find_by_addr(soc, pdev, params->bssId);
 	if (!peer) {
 		WMA_LOGE("%s: Peer is not present vdev id %d for %pM", __func__,
 			params->smesessionId, params->bssId);
@@ -4678,8 +4661,6 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma,
 	struct wma_target_req *msg;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	QDF_STATUS qdf_status;
-	/* Will be removed as a part of cleanup */
-	uint8_t sta_id;
 
 	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
@@ -4689,10 +4670,10 @@ static void wma_delete_sta_req_ap_mode(tp_wma_handle wma,
 		goto send_del_rsp;
 	}
 
-	peer = cdp_peer_find_by_addr(soc, pdev, del_sta->staMac, &sta_id);
+	peer = cdp_peer_find_by_addr(soc, pdev, del_sta->staMac);
 	if (!peer) {
-		WMA_LOGE("%s: Failed to get peer handle using peer id %d",
-			 __func__, del_sta->staIdx);
+		WMA_LOGE("%s: Failed to get peer handle using peer addr %pM",
+			 __func__, del_sta->staMac);
 		del_sta->status = QDF_STATUS_E_FAILURE;
 		goto send_del_rsp;
 	}
@@ -5130,7 +5111,6 @@ void wma_delete_bss(tp_wma_handle wma, uint8_t vdev_id)
 	struct cdp_pdev *pdev;
 	void *peer = NULL;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
-	uint8_t peer_id;
 	struct cdp_vdev *txrx_vdev = NULL;
 	bool roam_synch_in_progress = false;
 	struct wma_txrx_node *iface;
@@ -5167,15 +5147,14 @@ void wma_delete_bss(tp_wma_handle wma, uint8_t vdev_id)
 	}
 	if (wma_is_vdev_in_ibss_mode(wma, vdev_id))
 		/* in rome ibss case, self mac is used to create the bss peer */
-		peer = cdp_peer_find_by_addr(soc, pdev, addr, &peer_id);
+		peer = cdp_peer_find_by_addr(soc, pdev, addr);
 	else if (WMA_IS_VDEV_IN_NDI_MODE(wma->interfaces,
 			vdev_id))
 		/* In ndi case, self mac is used to create the self peer */
-		peer = cdp_peer_find_by_addr(soc, pdev, addr, &peer_id);
+		peer = cdp_peer_find_by_addr(soc, pdev, addr);
 	else
 		peer = cdp_peer_find_by_addr(soc, pdev,
-				bssid.bytes,
-				&peer_id);
+				bssid.bytes);
 
 	if (!peer) {
 		WMA_LOGE("%s: Failed to find peer %pM", __func__,
@@ -5407,23 +5386,6 @@ QDF_STATUS wma_set_wlm_latency_level(void *wma_ptr,
 	return ret;
 }
 
-uint8_t wma_peer_get_peet_id(uint8_t *peer_mac)
-{
-	uint8_t peer_id = 0;
-	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
-	struct cdp_pdev *pdev;
-
-	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
-	if (!pdev) {
-		WMA_LOGE("%s: Failed to get pdev", __func__);
-		return peer_id;
-	}
-
-	cdp_peer_find_by_addr(soc, pdev, peer_mac, &peer_id);
-
-	return peer_id;
-}
-
 QDF_STATUS wma_add_bss_peer_sta(uint8_t *self_mac, uint8_t *bssid,
 				bool roam_synch)
 {
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index b9c362540fe9..b26370008dca 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -2416,7 +2416,6 @@ static int wma_wake_event_piggybacked(
 	uint32_t wake_reason;
 	uint32_t event_id;
 	uint8_t *bssid;
-	uint8_t peer_id;
 	void *peer, *pdev;
 	tpDeleteStaContext del_sta_ctx;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
@@ -2446,8 +2445,7 @@ static int wma_wake_event_piggybacked(
 			 __func__, event_param->fixed_param->vdev_id);
 		return 0;
 	}
-
-	peer = cdp_peer_find_by_addr(soc, pdev, bssid, &peer_id);
+	peer = cdp_peer_find_by_addr(soc, pdev, bssid);
 	wake_reason = event_param->fixed_param->wake_reason;
 
 	/* parse piggybacked event from param buffer */
@@ -2976,8 +2974,6 @@ QDF_STATUS wma_process_get_peer_info_req
 	uint16_t len;
 	wmi_buf_t buf;
 	int32_t vdev_id;
-	/* Will be removed in cleanup */
-	uint8_t sta_id;
 	struct cdp_pdev *pdev;
 	void *peer;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
@@ -3009,8 +3005,7 @@ QDF_STATUS wma_process_get_peer_info_req
 		qdf_mem_copy(peer_mac, bcast_mac, QDF_MAC_ADDR_SIZE);
 	} else {
 		/*get info for a single peer */
-		peer = cdp_peer_find_by_addr(soc, pdev,
-					     pReq->peer_mac.bytes, &sta_id);
+		peer = cdp_peer_find_by_addr(soc, pdev, pReq->peer_mac.bytes);
 		if (!peer) {
 			WMA_LOGE("%s: Failed to get peer handle using peer "
 				 QDF_MAC_ADDR_STR, __func__,
@@ -3738,7 +3733,6 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle,
 	tp_wma_handle wma_handle = (tp_wma_handle) handle;
 	uint32_t i;
 	struct cdp_pdev *pdev;
-	uint8_t peer_id;
 	void *peer, *vdev;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	struct tdls_peer_params *peer_cap;
@@ -3800,8 +3794,7 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle,
 
 	peer = cdp_peer_find_by_addr(soc,
 				     pdev,
-				     peer_state->peer_macaddr,
-				     &peer_id);
+				     peer_state->peer_macaddr);
 	if (!peer) {
 		WMA_LOGE("%s: Failed to get peer handle using peer mac %pM",
 				__func__, peer_state->peer_macaddr);
@@ -3847,9 +3840,8 @@ int wma_update_tdls_peer_state(WMA_HANDLE handle,
 			ret = -EINVAL;
 			goto end_tdls_peer_state;
 		}
-		cdp_peer_update_last_real_peer(soc,
-				pdev, vdev, &peer_id,
-				restore_last_peer);
+		cdp_peer_update_last_real_peer(soc, pdev, vdev,
+					       restore_last_peer);
 	}
 
 	if (TDLS_PEER_STATE_CONNECTED == peer_state->peer_state) {
diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index 0b49a0a68023..c9c299a6b925 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -335,7 +335,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, uint8_t *event,
 	tp_wma_handle wma = (tp_wma_handle) handle;
 	WMI_PEER_STA_KICKOUT_EVENTID_param_tlvs *param_buf = NULL;
 	wmi_peer_sta_kickout_event_fixed_param *kickout_event = NULL;
-	uint8_t vdev_id, peer_id, macaddr[QDF_MAC_ADDR_SIZE];
+	uint8_t vdev_id, macaddr[QDF_MAC_ADDR_SIZE];
 	void *peer;
 	struct cdp_pdev *pdev;
 	tpDeleteStaContext del_sta_ctx;
@@ -353,7 +353,7 @@ int wma_peer_sta_kickout_event_handler(void *handle, uint8_t *event,
 		return -EINVAL;
 	}
 	WMI_MAC_ADDR_TO_CHAR_ARRAY(&kickout_event->peer_macaddr, macaddr);
-	peer = cdp_peer_find_by_addr(soc, pdev,	macaddr, &peer_id);
+	peer = cdp_peer_find_by_addr(soc, pdev, macaddr);
 	if (!peer) {
 		WMA_LOGE("PEER [%pM] not found", macaddr);
 		return -EINVAL;
@@ -370,9 +370,8 @@ int wma_peer_sta_kickout_event_handler(void *handle, uint8_t *event,
 	}
 	addr = wlan_vdev_mlme_get_macaddr(vdev);
 
-	WMA_LOGA("%s: PEER:[%pM], ADDR:[%pN], INTERFACE:%d, peer_id:%d, reason:%d",
-		__func__, macaddr, addr, vdev_id,
-		 peer_id, kickout_event->reason);
+	WMA_LOGA("%s: PEER:[%pM], ADDR:[%pN], INTERFACE:%d, reason:%d",
+		 __func__, macaddr, addr, vdev_id, kickout_event->reason);
 	if (wma->interfaces[vdev_id].roaming_in_progress) {
 		WMA_LOGE("Ignore STA kick out since roaming is in progress");
 		return -EINVAL;
@@ -391,8 +390,6 @@ int wma_peer_sta_kickout_event_handler(void *handle, uint8_t *event,
 			WMA_LOGE("QDF MEM Alloc Failed for tSirIbssPeerInactivity");
 			return -ENOMEM;
 		}
-
-		inactivity->staIdx = peer_id;
 		qdf_mem_copy(inactivity->peer_addr.bytes, macaddr,
 			     QDF_MAC_ADDR_SIZE);
 		wma_send_msg(wma, WMA_IBSS_PEER_INACTIVITY_IND,
@@ -2099,7 +2096,6 @@ static QDF_STATUS wma_setup_install_key_cmd(tp_wma_handle wma_handle,
 	struct cdp_pdev *txrx_pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	struct cdp_vdev *txrx_vdev;
 	uint32_t pn[4] = {0, 0, 0, 0};
-	uint8_t peer_id;
 	struct cdp_peer *peer;
 	bool skip_set_key;
 
@@ -2122,10 +2118,8 @@ static QDF_STATUS wma_setup_install_key_cmd(tp_wma_handle wma_handle,
 		return QDF_STATUS_E_INVAL;
 	}
 
-	txrx_vdev = wma_find_vdev_by_id(wma_handle,
-					key_params->vdev_id);
-	peer = cdp_peer_find_by_addr(soc, txrx_pdev,
-				key_params->peer_mac, &peer_id);
+	txrx_vdev = wma_find_vdev_by_id(wma_handle, key_params->vdev_id);
+	peer = cdp_peer_find_by_addr(soc, txrx_pdev, key_params->peer_mac);
 	iface = &wma_handle->interfaces[key_params->vdev_id];
 
 	params.vdev_id = key_params->vdev_id;
@@ -2657,7 +2651,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info)
 	struct cdp_pdev *txrx_pdev;
 	struct cdp_vdev *txrx_vdev;
 	void *peer;
-	uint8_t num_keys = 0, peer_id;
+	uint8_t num_keys = 0;
 	struct wma_set_key_params key_params;
 	uint32_t def_key_idx = 0;
 	int opmode;
@@ -2675,8 +2669,7 @@ void wma_set_stakey(tp_wma_handle wma_handle, tpSetStaKeyParams key_info)
 	}
 
 	peer = cdp_peer_find_by_addr(soc, txrx_pdev,
-				key_info->peer_macaddr.bytes,
-				&peer_id);
+				     key_info->peer_macaddr.bytes);
 	if (!peer) {
 		WMA_LOGE("%s:Invalid peer for key setting", __func__);
 		key_info->status = QDF_STATUS_E_FAILURE;
diff --git a/core/wma/src/wma_nan_datapath.c b/core/wma/src/wma_nan_datapath.c
index 537d77080c02..94d84a89d3c5 100644
--- a/core/wma/src/wma_nan_datapath.c
+++ b/core/wma/src/wma_nan_datapath.c
@@ -49,7 +49,6 @@ void wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 	struct cdp_vdev *vdev;
 	void *peer;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
-	u_int8_t peer_id;
 	QDF_STATUS status;
 	struct wma_txrx_node *iface;
 
@@ -74,7 +73,7 @@ void wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 
 	peer = cdp_peer_find_by_addr_and_vdev(soc,
 			pdev, vdev,
-			add_sta->staMac, &peer_id);
+			add_sta->staMac);
 	if (peer) {
 		WMA_LOGE(FL("NDI peer already exists, peer_addr %pM"),
 			 add_sta->staMac);
@@ -89,13 +88,11 @@ void wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 	 * exists on the pDev. As this peer belongs to other vDevs, just return
 	 * here.
 	 */
-	peer = cdp_peer_find_by_addr(soc,
-			pdev,
-			add_sta->staMac, &peer_id);
+	peer = cdp_peer_find_by_addr(soc, pdev, add_sta->staMac);
 	if (peer) {
-		WMA_LOGE(FL("vdev:%d, peer exists on other vdev with peer_addr %pM and peer_id %d"),
-			cdp_get_vdev_id(soc, vdev),
-			add_sta->staMac, peer_id);
+		WMA_LOGE(FL("vdev:%d, peer exists on other vdev with peer_addr %pM"),
+			 cdp_get_vdev_id(soc, vdev),
+			add_sta->staMac);
 		add_sta->status = QDF_STATUS_E_EXISTS;
 		goto send_rsp;
 	}
@@ -111,7 +108,7 @@ void wma_add_sta_ndi_mode(tp_wma_handle wma, tpAddStaParams add_sta)
 
 	peer = cdp_peer_find_by_addr_and_vdev(soc,
 			pdev, vdev,
-			add_sta->staMac, &peer_id);
+			add_sta->staMac);
 	if (!peer) {
 		WMA_LOGE(FL("Failed to find peer handle using peer mac %pM"),
 			 add_sta->staMac);
@@ -147,8 +144,6 @@ void wma_delete_sta_req_ndi_mode(tp_wma_handle wma,
 	struct cdp_pdev *pdev;
 	void *peer;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
-	/* Will be removed as a part of cleanup */
-	uint8_t sta_id;
 
 	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
@@ -158,7 +153,7 @@ void wma_delete_sta_req_ndi_mode(tp_wma_handle wma,
 	}
 
 	peer = cdp_peer_find_by_addr(cds_get_context(QDF_MODULE_ID_SOC),
-				     pdev, del_sta->staMac, &sta_id);
+				     pdev, del_sta->staMac);
 	if (!peer) {
 		WMA_LOGE(FL("Failed to get peer handle using peer mac "
 			 QDF_MAC_ADDR_STR),
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index ed18cce9ff5b..2e8719416b6f 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -4147,7 +4147,6 @@ void wma_remove_bss_peer_on_vdev_start_failure(tp_wma_handle wma,
 {
 	struct cdp_pdev *pdev;
 	void *peer = NULL;
-	uint8_t peer_id;
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	QDF_STATUS status;
 	struct qdf_mac_addr bss_peer;
@@ -4169,8 +4168,8 @@ void wma_remove_bss_peer_on_vdev_start_failure(tp_wma_handle wma,
 		return;
 	}
 
-	peer = cdp_peer_find_by_addr(soc, pdev, bss_peer.bytes,
-				     &peer_id);
+	peer = cdp_peer_find_by_addr(soc, pdev, bss_peer.bytes);
+
 	if (!peer) {
 		WMA_LOGE("%s Failed to find peer %pM",
 			 __func__, bss_peer.bytes);