diff --git a/app_ui.c b/app_ui.c
index e12c071..b8c5df3 100644
--- a/app_ui.c
+++ b/app_ui.c
@@ -124,8 +124,6 @@ void buttonShortPressed(u8 btNum)
 		//zb_nlmePermitJoiningRequest(duration);
 
 		// todo remove test for color order
-		sampleLight_onoff(ZCL_ONOFF_STATUS_OFF);
-
 		if (G_pwmTestPressed == 0) {
 			hwLight_colorUpdate_RGB(255,0,0);
 			G_pwmTestPressed++;
@@ -136,7 +134,6 @@ void buttonShortPressed(u8 btNum)
 			hwLight_colorUpdate_RGB(0,0,255);
 			G_pwmTestPressed++;
 		} else {
-			sampleLight_onoff(ZCL_ONOFF_STATUS_ON);
 			G_pwmTestPressed = 0;
 		}
 	}
diff --git a/sampleLightEpCfg.c b/sampleLightEpCfg.c
index 2f4da7e..73640c0 100644
--- a/sampleLightEpCfg.c
+++ b/sampleLightEpCfg.c
@@ -271,7 +271,6 @@ zcl_lightColorCtrlAttr_t g_zcl_colorCtrlAttrs =
 		.currentSaturation = 0x00,
 		.currentX = 0x616b,
 		.currentY = 0x607d,
-		.enhancedCurrentHue = 0x0000,
 		.colorLoopActive = 0x00,
 		.colorLoopDirection = 0x00,
 		.colorLoopTime = 0x0019,
@@ -293,7 +292,6 @@ const zclAttrInfo_t lightColorCtrl_attrTbl[] =
 		{ZCL_ATTRID_CURRENT_X, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.currentX},
 		{ZCL_ATTRID_CURRENT_Y, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.currentY},
 		{ZCL_ATTRID_CURRENT_HUE, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.currentHue},
-		{ZCL_ATTRID_ENHANCED_CURRENT_HUE, ZCL_DATA_TYPE_UINT16, ACCESS_CONTROL_READ, (u8 *)&g_zcl_colorCtrlAttrs.enhancedCurrentHue},
 		{ZCL_ATTRID_CURRENT_SATURATION, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.currentSaturation},
 		{ZCL_ATTRID_COLOR_LOOP_ACTIVE, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.colorLoopActive},
 		{ZCL_ATTRID_COLOR_LOOP_DIRECTION, ZCL_DATA_TYPE_UINT8, ACCESS_CONTROL_READ | ACCESS_CONTROL_REPORTABLE, (u8 *)&g_zcl_colorCtrlAttrs.colorLoopDirection},