diff --git a/dkms.conf b/dkms.conf
index 21954b4..58ec88b 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="realtek-rtl88xxau"
-PACKAGE_VERSION="5.3.4~20181004"
+PACKAGE_VERSION="5.3.4~20181020"
 CLEAN="'make' clean"
 BUILT_MODULE_NAME[0]=88XXau
 PROCS_NUM=`nproc`
diff --git a/hal/phydm/phydm_hwconfig.c b/hal/phydm/phydm_hwconfig.c
index 31f4836..a9176e0 100644
--- a/hal/phydm/phydm_hwconfig.c
+++ b/hal/phydm/phydm_hwconfig.c
@@ -34,25 +34,12 @@
 #define READ_AND_CONFIG_TC(ic, txt) (odm_read_and_config_tc_##ic##txt(dm))
 
 
-#if (PHYDM_TESTCHIP_SUPPORT == 1)
-#define READ_AND_CONFIG(ic, txt) do {\
-		if (dm->is_mp_chip)\
-			READ_AND_CONFIG_MP(ic, txt);\
-		else\
-			READ_AND_CONFIG_TC(ic, txt);\
-	} while (0)
-#else
 #define READ_AND_CONFIG     READ_AND_CONFIG_MP
-#endif
 
 #define GET_VERSION_MP(ic, txt)		(odm_get_version_mp_##ic##txt())
 #define GET_VERSION_TC(ic, txt)		(odm_get_version_tc_##ic##txt())
 
-#if (PHYDM_TESTCHIP_SUPPORT == 1)
-	#define GET_VERSION(ic, txt) (dm->is_mp_chip ? GET_VERSION_MP(ic, txt) : GET_VERSION_TC(ic, txt))
-#else
-	#define GET_VERSION(ic, txt) GET_VERSION_MP(ic, txt)
-#endif
+#define GET_VERSION(ic, txt) GET_VERSION_MP(ic, txt)
 
 enum hal_status
 odm_config_rf_with_header_file(
diff --git a/hal/phydm/phydm_types.h b/hal/phydm/phydm_types.h
index d1248e4..016f959 100644
--- a/hal/phydm/phydm_types.h
+++ b/hal/phydm/phydm_types.h
@@ -124,7 +124,6 @@ enum rt_spinlock_type {
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 	#define sta_info 	_RT_WLAN_STA
 	#define	__func__		__FUNCTION__
-	#define	PHYDM_TESTCHIP_SUPPORT	TESTCHIP_SUPPORT
 	#define MASKH3BYTES			0xffffff00
 	#define SUCCESS	0
 	#define FAIL	(-1)
@@ -142,7 +141,7 @@ enum rt_spinlock_type {
 	#define	s64		s8Byte
 
 	#define	phydm_timer_list	_RT_TIMER
-	
+
 
 #elif (DM_ODM_SUPPORT_TYPE == ODM_AP)
 	#include "../typedef.h"
@@ -151,12 +150,6 @@ enum rt_spinlock_type {
 		#define DEV_BUS_TYPE		RT_PCI_INTERFACE
 	#endif
 
-	#if (defined(TESTCHIP_SUPPORT))
-		#define	PHYDM_TESTCHIP_SUPPORT 1
-	#else
-		#define	PHYDM_TESTCHIP_SUPPORT 0
-	#endif
-
 	#define	sta_info stat_info
 	#define	boolean	bool
 
@@ -181,7 +174,6 @@ enum rt_spinlock_type {
 	#define	FOR_BRAZIL_PRETEST 0
 	#define	FPGA_TWO_MAC_VERIFICATION	0
 	#define	RTL8881A_SUPPORT	0
-	#define	PHYDM_TESTCHIP_SUPPORT 0
 
 
 	#define RATE_ADAPTIVE_SUPPORT			0
@@ -223,12 +215,6 @@ enum rt_spinlock_type {
 	#define	FPGA_TWO_MAC_VERIFICATION	0
 	#define	RTL8881A_SUPPORT	0
 
-	#if (defined(TESTCHIP_SUPPORT))
-		#define	PHYDM_TESTCHIP_SUPPORT 1
-	#else
-		#define	PHYDM_TESTCHIP_SUPPORT 0
-	#endif
-
 	#define	phydm_timer_list	rtw_timer_list
 #endif