diff --git a/src/cw/cw.h b/src/cw/cw.h
index a6118b47..eb2566ec 100644
--- a/src/cw/cw.h
+++ b/src/cw/cw.h
@@ -123,10 +123,14 @@
 
 
 
-
+/*
 #define CW_RECEIVER_AC 1
 #define CW_RECEIVER_WTP 1
+*/
 
+#define	CW_ROLE_AC	1
+#define CW_ROLE_WTP	2
+#define CW_ROLE_BOTH	(CW_ROLE_AC | CW_ROLE_WTP)
 
 
 
diff --git a/src/cw/mod.h b/src/cw/mod.h
index bf67fb07..b293d07d 100644
--- a/src/cw/mod.h
+++ b/src/cw/mod.h
@@ -36,10 +36,6 @@ enum {
 	CW_MOD_MODE_BINDINGS
 };
 
-enum {
-	CW_ROLE_AC=1,
-	CW_ROLE_WTP=2
-};
 
 
 
@@ -50,9 +46,6 @@ struct cw_Mod {
 	/** Initializion method */
 	int (*init) (struct cw_Mod *mod, mavl_t global_cfg, int role);
 
-	/** init_config */
-/*	int (*init_config) (void *);*/
-
 	/** Detect capwap 
 	 * This function is called after receiving and disassembling a complete 
 	 * CAPWAP message. Either on Discovery Request or Join Request.