diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index c94c2ae7dac9..19135f1b05d8 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -60,9 +60,7 @@
 #include "wlan_hdd_tsf.h"
 #include "wlan_hdd_cfg80211.h"
 #include <qdf_defer.h>
-#ifdef WLAN_FEATURE_MBSSID
 #include "sap_api.h"
-#endif
 #include "ol_txrx_osif_api.h"
 #include "ol_txrx_ctrl_api.h"
 #include <wlan_hdd_lro.h>
@@ -779,10 +777,10 @@ struct hdd_ap_ctx_s {
 	beacon_data_t *beacon;
 
 	bool bApActive;
-#ifdef WLAN_FEATURE_MBSSID
+
 	/* SAP Context */
 	void *sapContext;
-#endif
+
 	bool dfs_cac_block_tx;
 };
 
@@ -1095,9 +1093,7 @@ struct hdd_adapter_s {
 #define WLAN_HDD_GET_HAL_CTX(pAdapter)  (((hdd_context_t *)(pAdapter->pHddCtx))->hHal)
 #define WLAN_HDD_GET_HOSTAP_STATE_PTR(pAdapter) (&(pAdapter)->sessionCtx.ap.HostapdState)
 #define WLAN_HDD_GET_CFG_STATE_PTR(pAdapter)  (&(pAdapter)->cfg80211State)
-#ifdef WLAN_FEATURE_MBSSID
 #define WLAN_HDD_GET_SAP_CTX_PTR(pAdapter) (pAdapter->sessionCtx.ap.sapContext)
-#endif
 #ifdef FEATURE_WLAN_TDLS
 #define WLAN_HDD_IS_TDLS_SUPPORTED_ADAPTER(pAdapter) \
 	(((QDF_STA_MODE != pAdapter->device_mode) && \
@@ -1659,13 +1655,8 @@ QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter,
 						  tCsrRoamProfile *roam_profile,
 						  tScanResultHandle *scan_cache,
 						  bool *concurrent_chnl_same);
-#ifdef WLAN_FEATURE_MBSSID
 void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter);
 void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter);
-#else
-static inline void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter) {}
-static inline void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter) {}
-#endif
 
 void wlan_hdd_soc_set_antenna_mode_cb(enum set_antenna_mode_status status);
 
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 9993857bdf40..7c04a55357c3 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -3529,13 +3529,8 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
 			QDF_STATUS qdf_status;
 
 			/* Stop Bss. */
-#ifdef WLAN_FEATURE_MBSSID
 			status = wlansap_stop_bss(
 					WLAN_HDD_GET_SAP_CTX_PTR(adapter));
-#else
-			status = wlansap_stop_bss(
-				(WLAN_HDD_GET_CTX(adapter))->pcds_context);
-#endif
 
 			if (QDF_IS_STATUS_SUCCESS(status)) {
 				hdd_hostapd_state_t *hostapd_state =
@@ -7945,9 +7940,6 @@ void hdd_deregister_cb(hdd_context_t *hdd_ctx)
 QDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter,
 				 struct tagCsrDelStaParams *pDelStaParams)
 {
-#ifndef WLAN_FEATURE_MBSSID
-	v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(adapter))->pcds_context;
-#endif
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAULT;
 
 	ENTER();
@@ -7959,13 +7951,9 @@ QDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter,
 	if (pDelStaParams->peerMacAddr.bytes[0] & 0x1)
 		return qdf_status;
 
-#ifdef WLAN_FEATURE_MBSSID
 	qdf_status =
 		wlansap_deauth_sta(WLAN_HDD_GET_SAP_CTX_PTR(adapter),
 				   pDelStaParams);
-#else
-	qdf_status = wlansap_deauth_sta(p_cds_context, pDelStaParams);
-#endif
 
 	EXIT();
 	return qdf_status;
@@ -7983,10 +7971,6 @@ QDF_STATUS hdd_softap_sta_deauth(hdd_adapter_t *adapter,
 void hdd_softap_sta_disassoc(hdd_adapter_t *adapter,
 			     struct tagCsrDelStaParams *pDelStaParams)
 {
-#ifndef WLAN_FEATURE_MBSSID
-	v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(adapter))->pcds_context;
-#endif
-
 	ENTER();
 
 	hdd_err("hdd_softap_sta_disassoc:(%p, false)",
@@ -7996,32 +7980,20 @@ void hdd_softap_sta_disassoc(hdd_adapter_t *adapter,
 	if (pDelStaParams->peerMacAddr.bytes[0] & 0x1)
 		return;
 
-#ifdef WLAN_FEATURE_MBSSID
 	wlansap_disassoc_sta(WLAN_HDD_GET_SAP_CTX_PTR(adapter),
 			     pDelStaParams);
-#else
-	wlansap_disassoc_sta(p_cds_context, pDelStaParams);
-#endif
 }
 
 void hdd_softap_tkip_mic_fail_counter_measure(hdd_adapter_t *adapter,
 					      bool enable)
 {
-#ifndef WLAN_FEATURE_MBSSID
-	v_CONTEXT_t p_cds_context = (WLAN_HDD_GET_CTX(adapter))->pcds_context;
-#endif
-
 	ENTER();
 
 	hdd_err("hdd_softap_tkip_mic_fail_counter_measure:(%p, false)",
 	       (WLAN_HDD_GET_CTX(adapter))->pcds_context);
 
-#ifdef WLAN_FEATURE_MBSSID
 	wlansap_set_counter_measure(WLAN_HDD_GET_SAP_CTX_PTR(adapter),
 				    (bool) enable);
-#else
-	wlansap_set_counter_measure(p_cds_context, (bool) enable);
-#endif
 }
 
 /**
@@ -8474,7 +8446,6 @@ QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter,
 	return QDF_STATUS_SUCCESS;
 }
 
-#ifdef WLAN_FEATURE_MBSSID
 /**
  * wlan_hdd_stop_sap() - This function stops bss of SAP.
  * @ap_adapter: SAP adapter
@@ -8596,7 +8567,6 @@ end:
 	mutex_unlock(&hdd_ctx->sap_lock);
 	return;
 }
-#endif
 
 /**
  * wlan_hdd_soc_set_antenna_mode_cb() - Callback for set dual
diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c
index 2923e7d209e9..8ff10be73848 100644
--- a/core/hdd/src/wlan_hdd_softap_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c
@@ -829,11 +829,7 @@ QDF_STATUS hdd_softap_register_bc_sta(hdd_adapter_t *pAdapter,
 	pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(pAdapter);
 
 	pHddCtx->sta_to_adapter[WLAN_RX_BCMC_STA_ID] = pAdapter;
-#ifdef WLAN_FEATURE_MBSSID
 	pHddCtx->sta_to_adapter[pHddApCtx->uBCStaId] = pAdapter;
-#else
-	pHddCtx->sta_to_adapter[WLAN_RX_SAP_SELF_STA_ID] = pAdapter;
-#endif
 	qdf_status =
 		hdd_softap_register_sta(pAdapter, false, fPrivacyBit,
 					(WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->