diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c
index de21170..9bbe8e9 100644
--- a/core/rtw_cmd.c
+++ b/core/rtw_cmd.c
@@ -91,13 +91,6 @@ sint _rtw_init_evt_priv(struct evt_priv *pevtpriv)
 
 _func_enter_;
 
-#ifdef CONFIG_H2CLBK
-	_rtw_init_sema(&(pevtpriv->lbkevt_done), 0);
-	pevtpriv->lbkevt_limit = 0;
-	pevtpriv->lbkevt_num = 0;
-	pevtpriv->cmdevt_parm = NULL;
-#endif
-
 	/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
 	ATOMIC_SET(&pevtpriv->event_seq, 0);
 	pevtpriv->evt_done_cnt = 0;
diff --git a/include/rtw_cmd.h b/include/rtw_cmd.h
index 0547a2c..5d46cf9 100644
--- a/include/rtw_cmd.h
+++ b/include/rtw_cmd.h
@@ -92,13 +92,6 @@ struct	evt_priv {
 	struct rtw_cbuf *c2h_queue;
 	#define C2H_QUEUE_MAX_LEN 10
 #endif
-
-#ifdef CONFIG_H2CLBK
-	_sema	lbkevt_done;
-	u8	lbkevt_limit;
-	u8	lbkevt_num;
-	u8	*cmdevt_parm;
-#endif
 	ATOMIC_T event_seq;
 	u8	*evt_buf;	//shall be non-paged, and 4 bytes aligned
 	u8	*evt_allocated_buf;
@@ -595,37 +588,7 @@ struct Tx_Beacon_param
 
 */
 
-#ifdef CONFIG_H2CLBK
-
-struct seth2clbk_parm {
-	u8 mac[6];
-	u16	s0;
-	u16	s1;
-	u32	w0;
-	u8	b0;
-	u16  s2;
-	u8	b1;
-	u32	w1;
-};
-
-struct geth2clbk_parm {
-	u32 rsv;
-};
-
-struct geth2clbk_rsp {
-	u8	mac[6];
-	u16	s0;
-	u16	s1;
-	u32	w0;
-	u8	b0;
-	u16	s2;
-	u8	b1;
-	u32	w1;
-};
-
-#endif	/* CONFIG_H2CLBK */
-
-// CMD param Formart for driver extra cmd handler
+// CMD param Format for driver extra cmd handler
 struct drvextra_cmd_parm {
 	int ec_id; //extra cmd id
 	int type_size; // Can use this field as the type id or command size
diff --git a/include/rtw_event.h b/include/rtw_event.h
index 0b9e8a8..c77220c 100644
--- a/include/rtw_event.h
+++ b/include/rtw_event.h
@@ -30,13 +30,8 @@
 #endif
 #include <linux/sem.h>
 
-#ifdef CONFIG_H2CLBK
-#include <h2clbk.h>
-#endif
-
 /*
 Used to report a bss has been scanned
-
 */
 struct survey_event	{
 	WLAN_BSSID_EX bss;
@@ -92,30 +87,13 @@ struct addba_event
 	unsigned int tid;
 };
 
-
-#ifdef CONFIG_H2CLBK
-struct c2hlbk_event{
-	unsigned char mac[6];
-	unsigned short	s0;
-	unsigned short	s1;
-	unsigned int	w0;
-	unsigned char	b0;
-	unsigned short  s2;
-	unsigned char	b1;
-	unsigned int	w1;
-};
-#endif//CONFIG_H2CLBK
-
 #define GEN_EVT_CODE(event)	event ## _EVT_
 
-
-
 struct fwevent {
 	u32	parmsize;
 	void (*event_callback)(_adapter *dev, u8 *pbuf);
 };
 
-
 #define C2HEVENT_SZ			32
 
 struct event_node{