diff --git a/include/autoconf.h b/include/autoconf.h
index 57712c2..5dcaa21 100644
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -113,19 +113,14 @@
 #define CONFIG_LED
 #ifdef CONFIG_LED
 	#define CONFIG_SW_LED
-	#ifdef CONFIG_SW_LED
-		//#define CONFIG_LED_HANDLED_BY_CMD_THREAD
-	#endif
 #endif // CONFIG_LED
 
 #ifdef CONFIG_IOL
 	#define CONFIG_IOL_NEW_GENERATION
 	#define CONFIG_IOL_READ_EFUSE_MAP
-	//#define DBG_IOL_READ_EFUSE_MAP
 	#define CONFIG_IOL_LLT
 	#define CONFIG_IOL_EFUSE_PATCH
 	#define CONFIG_IOL_IOREG_CFG
-	//#define CONFIG_IOL_IOREG_CFG_DBG
 #endif
 
 
@@ -133,13 +128,8 @@
 #define CONFIG_GLOBAL_UI_PID
 
 #define CONFIG_LAYER2_ROAMING
-#define CONFIG_LAYER2_ROAMING_RESUME
-//#define CONFIG_ADAPTOR_INFO_CACHING_FILE // now just applied on 8192cu only, should make it general...
-//#define CONFIG_RESUME_IN_WORKQUEUE
-//#define CONFIG_SET_SCAN_DENY_TIMER
 #define CONFIG_LONG_DELAY_ISSUE
 #define CONFIG_NEW_SIGNAL_STAT_PROCESS
-//#define CONFIG_SIGNAL_DISPLAY_DBM //display RX signal with dbm
 #define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */
 
 #define CONFIG_BR_EXT		// Enable NAT2.5 support for STA mode interface with a L2 Bridge
diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c
index 61edb14..5c1cebb 100644
--- a/os_dep/usb_intf.c
+++ b/os_dep/usb_intf.c
@@ -704,7 +704,6 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
 	}
 #endif //CONFIG_WOWLAN
 
-#ifdef CONFIG_LAYER2_ROAMING_RESUME
 	if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) )
 	{
 		DBG_88E("%s:%d %s( %pM ), length:%d assoc_ssid.length:%d\n",__func__, __LINE__,
@@ -715,7 +714,6 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
 
 		pmlmepriv->to_roaming = 1;
 	}
-#endif
 	//s2-2.  indicate disconnect to os
 	rtw_indicate_disconnect(padapter);
 	//s2-3.
@@ -884,9 +882,7 @@ int rtw_resume_process(_adapter *padapter)
 		rtw_signal_process(padapter->pid[1], SIGUSR2);
 	}
 
-	#ifdef CONFIG_LAYER2_ROAMING_RESUME
 	rtw_roaming(padapter, NULL);
-	#endif
 
 	ret = 0;
 exit: