diff --git a/actube.workspace b/actube.workspace
index e0162c79..b8870938 100644
--- a/actube.workspace
+++ b/actube.workspace
@@ -3,9 +3,9 @@
   <Project Name="ac" Path="ac.project" Active="No"/>
   <Project Name="wtp" Path="wtp.project" Active="No"/>
   <Project Name="mod_cipwap" Path="mod_cipwap.project" Active="No"/>
-  <Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
+  <Project Name="mod_capwap" Path="mod_capwap.project" Active="Yes"/>
   <Project Name="mod_cisco" Path="mod_cisco.project" Active="No"/>
-  <Project Name="libcw" Path="libcw.project" Active="Yes"/>
+  <Project Name="libcw" Path="libcw.project" Active="No"/>
   <Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
   <Project Name="mod_fortinet" Path="mod_fortinet.project" Active="No"/>
   <BuildMatrix>
diff --git a/mod_capwap.project b/mod_capwap.project
index baae11ed..498dc026 100644
--- a/mod_capwap.project
+++ b/mod_capwap.project
@@ -4,7 +4,6 @@
     <VirtualDirectory Name="mod">
       <VirtualDirectory Name="capwap">
         <File Name="src/mod/capwap/capwap_out_ac_ip_list.c"/>
-        <File Name="src/mod/capwap/capwap_actions.h"/>
         <File Name="src/mod/capwap/mod_capwap_ac.c"/>
         <File Name="src/mod/capwap/capwap_in_wtp_board_data.c"/>
         <File Name="src/mod/capwap/capwap_actions_wtp.c"/>
diff --git a/src/mod/capwap/Makefile b/src/mod/capwap/Makefile
index de137c80..2b32e2b7 100644
--- a/src/mod/capwap/Makefile
+++ b/src/mod/capwap/Makefile
@@ -8,12 +8,10 @@ OBJS=\
 	capwap_in_ac_descriptor.o \
 	capwap_out_wtp_board_data.o \
 	capwap_out_ac_descriptor.o \
-	capwap_out_get_session_id.o \
 	capwap_out_get_idle_timeout.o \
 	capwap_out_wtp_descriptor.o \
 	capwap_in_wtp_descriptor.o \
 	capwap_out_ac_ip_list.o \
-	capwap_in_session_id.o \
 	capwap_in_vendor_specific_payload.o \
 	capwap_in_mtu_discovery_padding.o \
 	capwap_out_capwap_control_ip_address.o \
diff --git a/src/mod/capwap/capwap_actions.h b/src/mod/capwap/capwap_actions.h
deleted file mode 100644
index 813655b2..00000000
--- a/src/mod/capwap/capwap_actions.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __CAPWAP_ACTIONS_H
-#define __CAPWAP_ACTIONS_H
-
-int capwap_in_session_id(struct conn *conn, struct cw_action_in *a, uint8_t * data,
-			 int len, struct sockaddr *from);
-
-#endif
diff --git a/src/mod/capwap/capwap_in_vendor_specific_payload.c b/src/mod/capwap/capwap_in_vendor_specific_payload.c
index ffd1be5d..eb156d0e 100644
--- a/src/mod/capwap/capwap_in_vendor_specific_payload.c
+++ b/src/mod/capwap/capwap_in_vendor_specific_payload.c
@@ -32,10 +32,11 @@ int capwap_in_vendor_specific_payload(struct cw_ElemHandler *handler,
 		       params->msgdata->name, cw_strstate(params->conn->capwap_state));
 		return 0;
 	}
-	
+
+/*	
 //	cw_dbg_elem(DBG_ELEM_IN,params->conn,0,vhandler, data+6,len-6);
 	//vhandler->get(vhandler, params, data+6, len-6);
-	
+*/
 	cw_process_element(params,0,vendor_id,elem_id,data+6,len-6);
 
 	return 1;
diff --git a/src/mod/capwap/capwap_out_ac_ip_list.c b/src/mod/capwap/capwap_out_ac_ip_list.c
index 725e259d..e8f50a26 100644
--- a/src/mod/capwap/capwap_out_ac_ip_list.c
+++ b/src/mod/capwap/capwap_out_ac_ip_list.c
@@ -9,8 +9,9 @@
 
 
 
-int capwap_out_ac_ip_list(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
+/*int capwap_out_ac_ip_list(struct conn *conn, struct cw_action_out *a, uint8_t * dst)
 {
+ */
 /*	mbag_t ips = conn->local;
 	MAVLITER_DEFINE (it,ips);
 
@@ -18,10 +19,10 @@ int capwap_out_ac_ip_list(struct conn *conn, struct cw_action_out *a, uint8_t *
 
 	}
 */
-	return 0;
+/*	return 0;
 
 	struct sockaddr sa;
 	sock_strtoaddr( "192.168.0.11", &sa);
 	cw_put_sockaddr(dst+4,(struct sockaddr_storage*)&sa);
 	return 4 + cw_put_elem_hdr(dst,CAPWAP_ELEM_AC_IPV4_LIST,4);
-}
+}*/
diff --git a/src/mod/capwap/capwap_out_capwap_control_ip_address.c b/src/mod/capwap/capwap_out_capwap_control_ip_address.c
index 5e81f928..4e736074 100644
--- a/src/mod/capwap/capwap_out_capwap_control_ip_address.c
+++ b/src/mod/capwap/capwap_out_capwap_control_ip_address.c
@@ -59,7 +59,7 @@ int capwap_out_capwap_control_ip_address(struct cw_ElemHandler * eh,
 	d = dst;
 	i=0; 
 	do {
-		uint8_t * msg;
+/*		uint8_t * msg;*/
 		int l;
 
 		sprintf(key,"%s/address.%d",eh->key,i);
@@ -71,7 +71,7 @@ int capwap_out_capwap_control_ip_address(struct cw_ElemHandler * eh,
 			break;
 		}
 		
-		msg = d;
+/*		msg = d;*/
 		
 		l = address->type->len(address);
 
diff --git a/src/mod/capwap/mod_capwap_ac.c b/src/mod/capwap/mod_capwap_ac.c
index 95cead86..7d789c02 100644
--- a/src/mod/capwap/mod_capwap_ac.c
+++ b/src/mod/capwap/mod_capwap_ac.c
@@ -8,10 +8,6 @@
 
 #include "mod_capwap.h"
 
-
-
-extern int capwap_register_actions_ac(struct cw_actiondef *def);
-
 static int init(struct cw_Mod * mod, mavl_t global_cfg, int role)
 {
 	cw_dbg(DBG_INFO,"CAPWAP: Inititalizing mod_capwap.");
diff --git a/src/mod/capwap80211/Makefile b/src/mod/capwap80211/Makefile
index f36aca87..36841f41 100644
--- a/src/mod/capwap80211/Makefile
+++ b/src/mod/capwap80211/Makefile
@@ -2,7 +2,7 @@ include ../../Defs.mak
 
 
 OBJS=\
-	mod_capwap80211_ac.o \
+	mod_capwap80211.o \
 
 
 LIBDIR		:= ../../../lib
diff --git a/src/mod/cipwap/mod_cipwap.h b/src/mod/cipwap/mod_cipwap.h
index 0c4bb045..f3c1f00e 100644
--- a/src/mod/cipwap/mod_cipwap.h
+++ b/src/mod/cipwap/mod_cipwap.h
@@ -4,6 +4,8 @@
 struct cw_Mod * mod_cipwap_ac();
 struct cw_Mod * mod_cipwap_wtp();
 
+/*
 extern int cipwap_register_actions_ac(struct cw_actiondef *def);
+*/
 
 #endif
diff --git a/src/mod/cisco/mod_cisco_ac.c b/src/mod/cisco/mod_cisco_ac.c
index ce6ee378..7a57b657 100644
--- a/src/mod/cisco/mod_cisco_ac.c
+++ b/src/mod/cisco/mod_cisco_ac.c
@@ -189,7 +189,7 @@ static struct cw_Mod capwap_ac = {
 */
 
 
-static struct cw_Mod cisco_data = {
+struct cw_Mod mod_cisco = {
 	"cisco",			/* name */
 	init,				/* init */
 	detect,				/* detect */
@@ -202,8 +202,9 @@ static struct cw_Mod cisco_data = {
 
 
 
-
+/*
 struct cw_Mod *mod_cisco()
 {
 	return &cisco_data;
 }
+*/
\ No newline at end of file