diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c
index 7d7a053..8f7d93f 100644
--- a/hal/usb_ops_linux.c
+++ b/hal/usb_ops_linux.c
@@ -396,18 +396,6 @@ static void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf)
 	}
 #endif /* CONFIG_INTERRUPT_BASED_TXBCN */
 
-#ifdef DBG_CONFIG_ERROR_DETECT_INT
-	if (  pHalData->IntArray[1]  & IMR_TXERR_88E )
-		DBG_88E("===> %s Tx Error Flag Interrupt Status\n",__func__);
-	if (  pHalData->IntArray[1]  & IMR_RXERR_88E )
-		DBG_88E("===> %s Rx Error Flag INT Status\n",__func__);
-	if (  pHalData->IntArray[1]  & IMR_TXFOVW_88E )
-		DBG_88E("===> %s Transmit FIFO Overflow\n",__func__);
-	if (  pHalData->IntArray[1]  & IMR_RXFOVW_88E )
-		DBG_88E("===> %s Receive FIFO Overflow\n",__func__);
-#endif/* DBG_CONFIG_ERROR_DETECT_INT */
-
-
 	/*  C2H Event */
 	if (pbuf[0]!= 0){
 		_rtw_memcpy(&(pHalData->C2hArray[0]), &(pbuf[USB_INTR_CONTENT_C2H_OFFSET]), 16);
diff --git a/include/autoconf.h b/include/autoconf.h
index 9899da9..d65c7a3 100644
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -153,12 +153,9 @@
 #define RTL8188ES_SUPPORT				0
 #define RTL8188E_SUPPORT				(RTL8188EE_SUPPORT|RTL8188EU_SUPPORT|RTL8188ES_SUPPORT)
 #define RTL8188E_FOR_TEST_CHIP			0
-//#if (RTL8188E_SUPPORT==1)
 #define RATE_ADAPTIVE_SUPPORT			1
 #define POWER_TRAINING_ACTIVE			1
 
-//#endif
-
 #ifdef CONFIG_TX_EARLY_MODE
 #define	RTL8188E_EARLY_MODE_PKT_NUM_10	0
 #endif
@@ -170,38 +167,7 @@
  */
 #define DBG	1
 
-//#define CONFIG_DEBUG /* DBG_88E, etc... */
-//#define CONFIG_DEBUG_RTL871X /* RT_TRACE, RT_PRINT_DATA, _func_enter_, _func_exit_ */
-
 #define CONFIG_PROC_DEBUG
 
 #define DBG_CONFIG_ERROR_DETECT
-//#define DBG_CONFIG_ERROR_DETECT_INT
-//#define DBG_CONFIG_ERROR_RESET
 
-//#define DBG_IO
-//#define DBG_DELAY_OS
-//#define DBG_MEM_ALLOC
-//#define DBG_IOCTL
-
-//#define DBG_TX
-//#define DBG_XMIT_BUF
-//#define DBG_XMIT_BUF_EXT
-//#define DBG_TX_DROP_FRAME
-
-//#define DBG_RX_DROP_FRAME
-//#define DBG_RX_SEQ
-//#define DBG_RX_SIGNAL_DISPLAY_PROCESSING
-//#define DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED "jeff-ap"
-
-
-
-//#define DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE
-//#define DBG_ROAMING_TEST
-
-//#define DBG_HAL_INIT_PROFILING
-
-//TX use 1 urb
-//#define CONFIG_SINGLE_XMIT_BUF
-//RX use 1 urb
-//#define CONFIG_SINGLE_RECV_BUF