diff --git a/include/autoconf.h b/include/autoconf.h
index 195a6c3..458671f 100755
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -36,9 +36,6 @@
 
 #define CONFIG_SKB_COPY	//for amsdu
 
-#define USB_INTERFERENCE_ISSUE // this should be checked in all usb interface
-#define CONFIG_GLOBAL_UI_PID
-
 #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/include/osdep_service.h b/include/osdep_service.h
index 3a19f9d..88d0952 100755
--- a/include/osdep_service.h
+++ b/include/osdep_service.h
@@ -91,9 +91,7 @@ extern int rtw_ht_enable;
 extern int rtw_cbw40_enable;
 extern int rtw_ampdu_enable;//for enable tx_ampdu
 
-#ifdef CONFIG_GLOBAL_UI_PID
 extern int ui_pid[3];
-#endif
 
 extern unsigned char	MCS_rate_2R[16];
 #ifdef CONFIG_DISABLE_MCS13TO15
diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c
index cecf397..841e0ee 100755
--- a/os_dep/ioctl_linux.c
+++ b/os_dep/ioctl_linux.c
@@ -3456,14 +3456,11 @@ static int rtw_set_pid(struct net_device *dev,
 	selector = *pdata;
 	if(selector < 3 && selector >=0) {
 		padapter->pid[selector] = *(pdata+1);
-		#ifdef CONFIG_GLOBAL_UI_PID
 		ui_pid[selector] = *(pdata+1);
-		#endif
 		DBG_871X("%s set pid[%d]=%d\n", __FUNCTION__, selector ,padapter->pid[selector]);
-	}
-	else
+	} else {
 		DBG_871X("%s selector %d error\n", __FUNCTION__, selector);
-
+	}
 exit:
 
 	return ret;
diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c
index 0d60ad1..7b8c123 100755
--- a/os_dep/usb_intf.c
+++ b/os_dep/usb_intf.c
@@ -35,10 +35,7 @@
 #include <asm/io.h>
 #endif
 
-#ifdef CONFIG_GLOBAL_UI_PID
 int ui_pid[3] = {0, 0, 0};
-#endif
-
 
 static int rtw_suspend(struct usb_interface *intf, pm_message_t message);
 static int rtw_resume(struct usb_interface *intf);
@@ -1427,12 +1424,10 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
 	rtw_sw_export=if1;
 #endif
 
-#ifdef CONFIG_GLOBAL_UI_PID
 	if(ui_pid[1]!=0) {
 		DBG_871X("ui_pid[1]:%d\n",ui_pid[1]);
 		rtw_signal_process(ui_pid[1], SIGUSR2);
 	}
-#endif
 
 	/* dev_alloc_name && register_netdev */
 	if((status = rtw_drv_register_netdev(if1)) != _SUCCESS) {