diff --git a/src/ge_app.c b/src/ge_app.c
index 6616965..b6088cd 100644
--- a/src/ge_app.c
+++ b/src/ge_app.c
@@ -136,46 +136,6 @@ static MPC_CONFIG mpcConfig = {
 	.rxQueueMax = 16
 };
 
-#ifdef APP_EMULATE_DATA
-uint8_t testDataLj[] =
-{
-	0xEA, 0xDF, 0x3F, 0x27, 0xCE, 0x9B, 0xE6, 0x3F,
-	0xB5, 0xA3, 0x38, 0x47, 0x1D, 0x1D, 0xFA, 0x3F,
-	0x39, 0xB4, 0xC8, 0x76, 0xBE, 0xAB, 0x8E, 0x40,
-	0xC9, 0xE8, 0x80, 0x24, 0xEC, 0xCB, 0x13, 0x40,
-	0x37, 0x38, 0x7F, 0x22, 0x72, 0x06, 0xF0, 0x01,
-	0x00, 0x00, 0xB8, 0xAA, 0x08, 0x47, 0x1E, 0xC6,
-	0xB0, 0x47, 0x54, 0xFD, 0xEB, 0x45, 0xA1, 0x8A,
-	0x86, 0x44, 0x43, 0xB6, 0xC8, 0x44, 0x4E, 0x19,
-	0xA8, 0x42
-};
-
-uint8_t testDataFlj[] =
-{
-	0xFD, 0x1E, 0xA5, 0x22, 0x72, 0x02, 0x5A, 0x02,
-	0x00, 0x00, 0x81, 0x97, 0x39, 0x3F, 0xF1, 0xF4,
-	0xC0, 0x3F, 0x27, 0xF1, 0x65, 0x44, 0x53, 0x5C,
-	0xD3, 0x3F, 0xB5, 0x24, 0xA6, 0x22, 0x72, 0x02,
-	0x83, 0x01, 0x00, 0x00, 0xFC, 0xE0, 0x44, 0x47,
-	0xB7, 0x83, 0x35, 0x47, 0xA4, 0xBF, 0xE5, 0xC4,
-	0xE8, 0xDC, 0xD1, 0x44, 0x5D, 0x5D, 0xE7, 0x44,
-	0x7D, 0x1B, 0xE8, 0xC1, 0x60, 0x97, 0x57, 0x42,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x5D, 0x86, 0xA6, 0x22, 0x72, 0x02, 0xA5, 0x02,
-	0x00, 0x00, 0x97, 0x4E, 0xB5, 0x47, 0xC4, 0x2A,
-	0xB0, 0x47, 0x2D, 0x00, 0x21, 0xC5, 0x8A, 0x85,
-	0xD1, 0x44, 0x23, 0xFD, 0xC8, 0x44, 0xA1, 0xC4,
-	0xEA, 0xC1, 0x91, 0x4E, 0x71, 0xC2, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0xAD,
-	0xA6, 0x22, 0x72, 0x02, 0xA5, 0x02, 0x00, 0x00,
-	0xCD, 0x07, 0xD6, 0x47, 0x1D, 0xA4, 0xCE, 0x47,
-	0x6E, 0x61, 0x33, 0xC5, 0x85, 0x55, 0xD1, 0x44,
-	0x9C, 0x16, 0xBD, 0x44, 0x36, 0xC0, 0xEB, 0xC1,
-	0xF0, 0xFF, 0x5B, 0x42, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x78, 0x25, 0x03, 0x00
-};
-#endif
-
 /************************** Function Prototypes ******************************/
 static struct irq_ctrl_desc *intcDescPtr; // General interrupt controller descriptor
 static struct timer_desc *logTmPtr;
@@ -438,16 +398,6 @@ static void ScuTimer_IntrHandler(void *context)
 			{
 				DBG_ERROR("Failed to apply remote test.\n");
 			}
-#ifdef APP_EMULATE_DATA
-			if (L2_GetNodeType(linkInstPtr) == L2_NODE_HEAD)
-			{
-				SysMonitor_UpdateSendPayload(testDataFlj, PAYLOAD_LEN_FLJ_TX);
-			}
-			else
-			{
-				SysMonitor_UpdateSendPayload(testDataLj, PAYLOAD_LEN_LJ_TX);
-			}
-#endif
 		}
 
 		XScuTimer_ClearInterruptStatus((XScuTimer *)xdesc->instance);
diff --git a/src/ge_config/app_config.h b/src/ge_config/app_config.h
index c7b80d6..1b980da 100644
--- a/src/ge_config/app_config.h
+++ b/src/ge_config/app_config.h
@@ -36,12 +36,6 @@
 // 1 - print only errors
 // other - print nothing
 
-#define APP_EMULATE_DATA
-#define DATALINK_ENABLE_AUTORECONNECT
-#define DATALINK_ENABLE_AUTOTIMESYNC
-//#define DATALINK_ENABLE_BERTEST
-
-
 /************ Hardware Configs ************/
 #define CPU_CLK_HZ 			XPAR_CPU_CORTEXA9_0_CPU_CLK_FREQ_HZ
 #define GLOBAL_TIMER_CLK_HZ (CPU_CLK_HZ/2)
@@ -86,16 +80,4 @@
 // INTC configis
 #define INTC_DEVICE_ID XPAR_SCUGIC_0_DEVICE_ID
 
-// Configuration Check
-#if defined(PHY_BEAM_SET_PRESET) && !defined(PHY_BEAM_FORMING_ENABLE)
-#define PHY_BEAM_FORMING_ENABLE
-#warning To impliment beam scan must enable beam forming...
-#endif
-
-#if defined(DATALINK_ENABLE_BERTEST)
-#if !defined(DATALINK_ENABLE_AUTOTIMESYNC)
-	#warning To enbale bit error rate test, auto time-sync should be enabled...
-#endif
-#endif
-
 #endif