diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index fc97f97..0633ea8 100644
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -5441,7 +5441,6 @@ s32 dump_mgntframe_and_wait(_adapter *padapter, struct xmit_frame *pmgntframe, i
 
 s32 dump_mgntframe_and_wait_ack(_adapter *padapter, struct xmit_frame *pmgntframe)
 {
-#ifdef CONFIG_XMIT_ACK
 	s32 ret = _FAIL;
 	u32 timeout_ms = 500;/*   500ms */
 	struct xmit_priv	*pxmitpriv = &padapter->xmitpriv;
@@ -5462,11 +5461,6 @@ s32 dump_mgntframe_and_wait_ack(_adapter *padapter, struct xmit_frame *pmgntfram
 	_exit_critical_mutex(&pxmitpriv->ack_tx_mutex, NULL);
 
 	 return ret;
-#else /* CONFIG_XMIT_ACK */
-	dump_mgntframe(padapter, pmgntframe);
-	rtw_msleep_os(50);
-	return _SUCCESS;
-#endif /* CONFIG_XMIT_ACK */
 }
 
 static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)
diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c
index 9db3811..0ae7cc2 100644
--- a/core/rtw_xmit.c
+++ b/core/rtw_xmit.c
@@ -262,11 +262,9 @@ _func_enter_;
 	pxmitpriv->viq_cnt = 0;
 	pxmitpriv->voq_cnt = 0;
 
-#ifdef CONFIG_XMIT_ACK
 	pxmitpriv->ack_tx = false;
 	_rtw_mutex_init(&pxmitpriv->ack_tx_mutex);
 	rtw_sctx_init(&pxmitpriv->ack_tx_ops, 0);
-#endif
 
 	rtw_hal_init_xmit_priv(padapter);
 
@@ -363,14 +361,11 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
 
 	rtw_free_hwxmits(padapter);
 
-#ifdef CONFIG_XMIT_ACK
 	_rtw_mutex_free(&pxmitpriv->ack_tx_mutex);
-#endif
 
 out:
 
 _func_exit_;
-
 }
 
 static void update_attrib_vcs_info(_adapter *padapter, struct xmit_frame *pxmitframe)
@@ -1742,10 +1737,7 @@ _func_enter_;
 		pxframe->agg_num = 1;
 #endif
 
-#ifdef CONFIG_XMIT_ACK
 		pxframe->ack_report = 0;
-#endif
-
 	}
 
 	_exit_critical_bh(&pfree_xmit_queue->lock, &irqL);
@@ -3085,64 +3077,8 @@ void rtw_sctx_done(struct submit_ctx **sctx)
 	rtw_sctx_done_err(sctx, RTW_SCTX_DONE_SUCCESS);
 }
 
-#ifdef CONFIG_XMIT_ACK
-
-#ifdef CONFIG_XMIT_ACK_POLLING
-s32 c2h_evt_hdl(_adapter *adapter, struct c2h_evt_hdr *c2h_evt, c2h_id_filter filter);
-
-/**
- * rtw_ack_tx_polling -
- * @pxmitpriv: xmit_priv to address ack_tx_ops
- * @timeout_ms: timeout msec
- *
- * Init ack_tx_ops and then do c2h_evt_hdl() and polling ack_tx_ops repeatedly
- * till tx report or timeout
- * Returns: _SUCCESS if TX report ok, _FAIL for others
- */
-int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms)
-{
-	int ret = _FAIL;
-	struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
-	_adapter *adapter = container_of(pxmitpriv, _adapter, xmitpriv);
-
-	pack_tx_ops->submit_time = rtw_get_current_time();
-	pack_tx_ops->timeout_ms = timeout_ms;
-	pack_tx_ops->status = RTW_SCTX_SUBMITTED;
-
-	do {
-		c2h_evt_hdl(adapter, NULL, rtw_hal_c2h_id_filter_ccx(adapter));
-		if (pack_tx_ops->status != RTW_SCTX_SUBMITTED)
-			break;
-
-		if (adapter->bDriverStopped) {
-			pack_tx_ops->status = RTW_SCTX_DONE_DRV_STOP;
-			break;
-		}
-		if (adapter->bSurpriseRemoved) {
-			pack_tx_ops->status = RTW_SCTX_DONE_DEV_REMOVE;
-			break;
-		}
-
-		rtw_msleep_os(10);
-	} while (rtw_get_passing_time_ms(pack_tx_ops->submit_time) < timeout_ms);
-
-	if (pack_tx_ops->status == RTW_SCTX_SUBMITTED) {
-		pack_tx_ops->status = RTW_SCTX_DONE_TIMEOUT;
-		DBG_88E("%s timeout\n", __func__);
-	}
-
-	if (pack_tx_ops->status == RTW_SCTX_DONE_SUCCESS)
-		ret = _SUCCESS;
-
-	return ret;
-}
-#endif
-
 int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms)
 {
-#ifdef CONFIG_XMIT_ACK_POLLING
-	return rtw_ack_tx_polling(pxmitpriv, timeout_ms);
-#else
 	struct submit_ctx *pack_tx_ops = &pxmitpriv->ack_tx_ops;
 
 	pack_tx_ops->submit_time = rtw_get_current_time();
@@ -3150,7 +3086,6 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms)
 	pack_tx_ops->status = RTW_SCTX_SUBMITTED;
 
 	return rtw_sctx_wait(pack_tx_ops);
-#endif
 }
 
 void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status)
@@ -3163,4 +3098,3 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status)
 		DBG_88E("%s ack_tx not set\n", __func__);
 	}
 }
-#endif /* CONFIG_XMIT_ACK */
diff --git a/hal/rtl8188e_xmit.c b/hal/rtl8188e_xmit.c
index 0f37f19..d4ab887 100644
--- a/hal/rtl8188e_xmit.c
+++ b/hal/rtl8188e_xmit.c
@@ -24,7 +24,6 @@
 #include <drv_types.h>
 #include <rtl8188e_hal.h>
 
-#ifdef CONFIG_XMIT_ACK
 void dump_txrpt_ccx_88e(void *buf)
 {
 	struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf;
@@ -61,7 +60,6 @@ void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf)
 			rtw_ack_tx_done(&adapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL);
 	}
 }
-#endif /* CONFIG_XMIT_ACK */
 
 void _dbg_dump_tx_info(_adapter	*padapter,int frame_tag,struct tx_desc *ptxdesc)
 {
diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c
index b80e860..98e0455 100644
--- a/hal/rtl8188eu_xmit.c
+++ b/hal/rtl8188eu_xmit.c
@@ -368,7 +368,6 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
 
 
 		/* offset 8 */
-#ifdef CONFIG_XMIT_ACK
 		/* CCX-TXRPT ack for xmit mgmt frames. */
 		if (pxmitframe->ack_report) {
 			#ifdef DBG_CCX
@@ -379,7 +378,6 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
 			#endif
 			ptxdesc->txdw2 |= cpu_to_le32(BIT(19));
 		}
-#endif /* CONFIG_XMIT_ACK */
 
 		/* offset 12 */
 		ptxdesc->txdw3 |= cpu_to_le32((pattrib->seqnum<<SEQ_SHT)&0x0FFF0000);
diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c
index 323e9b5..3b29044 100644
--- a/hal/usb_halinit.c
+++ b/hal/usb_halinit.c
@@ -1565,10 +1565,8 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_LCK);
 /* 	_InitPABias(Adapter); */
 	rtw_write8(Adapter, REG_USB_HRPWM, 0);
 
-#ifdef CONFIG_XMIT_ACK
 	/* ack for xmit mgmt frames. */
 	rtw_write32(Adapter, REG_FWHW_TXQ_CTRL, rtw_read32(Adapter, REG_FWHW_TXQ_CTRL)|BIT(12));
-#endif /* CONFIG_XMIT_ACK */
 
 exit:
 HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END);
diff --git a/include/autoconf.h b/include/autoconf.h
index c871928..ccd48e7 100644
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -44,25 +44,14 @@
 
 #define CONFIG_EMBEDDED_FWIMG
 
-#define CONFIG_XMIT_ACK
-#ifdef CONFIG_XMIT_ACK
-	#define CONFIG_ACTIVE_KEEP_ALIVE_CHECK
-#endif
 #define CONFIG_80211N_HT
 
 #define CONFIG_SUPPORT_USB_INT
-#ifdef	CONFIG_SUPPORT_USB_INT
-#endif
 
 #define CONFIG_IPS
-#ifdef CONFIG_IPS
-#endif
 #define SUPPORT_HW_RFOFF_DETECTED
 
 #define CONFIG_LPS
-#if defined(CONFIG_LPS) && defined(CONFIG_SUPPORT_USB_INT)
-
-#endif
 
 #ifdef CONFIG_LPS_LCLK
 #define CONFIG_XMIT_THREAD_MODE
diff --git a/include/rtl8188e_xmit.h b/include/rtl8188e_xmit.h
index 2fbfc32..496f8a1 100644
--- a/include/rtl8188e_xmit.h
+++ b/include/rtl8188e_xmit.h
@@ -268,13 +268,8 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
 void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmitbuf );
 #endif
 
-#ifdef CONFIG_XMIT_ACK
 void dump_txrpt_ccx_88e(void *buf);
 void handle_txrpt_ccx_88e(_adapter *adapter, u8 *buf);
-#else
-#define dump_txrpt_ccx_88e(buf) do {} while (0)
-#define handle_txrpt_ccx_88e(adapter, buf) do {} while (0)
-#endif //CONFIG_XMIT_ACK
 
 void _dbg_dump_tx_info(_adapter	*padapter,int frame_tag,struct tx_desc *ptxdesc);
 #endif //__RTL8188E_XMIT_H__
diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h
index 6042692..a0a29e7 100644
--- a/include/rtw_xmit.h
+++ b/include/rtw_xmit.h
@@ -271,9 +271,7 @@ struct xmit_frame
 #endif
 	s8	pkt_offset;
 
-#ifdef CONFIG_XMIT_ACK
 	u8 ack_report;
-#endif
 };
 
 struct tx_servq {
@@ -402,12 +400,9 @@ struct	xmit_priv	{
 	struct agg_pkt_info agg_pkt[MAX_AGG_PKT_NUM];
 	#endif
 
-#ifdef CONFIG_XMIT_ACK
 	int	ack_tx;
 	_mutex ack_tx_mutex;
 	struct submit_ctx ack_tx_ops;
-#endif
-
 };
 
 extern struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv);
@@ -470,10 +465,8 @@ thread_return	rtw_xmit_thread(thread_context context);
 
 u32	rtw_get_ff_hwaddr(struct xmit_frame	*pxmitframe);
 
-#ifdef CONFIG_XMIT_ACK
 int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms);
 void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status);
-#endif //CONFIG_XMIT_ACK
 
 
 //include after declaring struct xmit_buf, in order to avoid warning
diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c
index 53174e3..be5157b 100644
--- a/os_dep/usb_intf.c
+++ b/os_dep/usb_intf.c
@@ -424,10 +424,8 @@ static void rtw_dev_unload(_adapter *padapter)
 		DBG_88E("===> rtw_dev_unload\n");
 
 		padapter->bDriverStopped = true;
-		#ifdef CONFIG_XMIT_ACK
 		if (padapter->xmitpriv.ack_tx)
 			rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
-		#endif
 
 		//s3.
 		if (padapter->intf_stop)