diff --git a/src/capwap/cw_send_configuration_update_response.c b/src/capwap/cw_send_configuration_update_response.c
deleted file mode 100644
index 4c298d4e..00000000
--- a/src/capwap/cw_send_configuration_update_response.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-#include "capwap.h"
-
-int cw_send_configuration_update_response(struct conn * conn,int seqnum,struct radioinfo * radioinfo)
-{
-	struct cwmsg * cwmsg = &conn->resp_msg;	
-	cwmsg_init(cwmsg,conn->resp_buffer,CW_MSG_CONFIGURATION_UPDATE_RESPONSE,seqnum,radioinfo);
-
-	cwmsg_addelem_result_code(cwmsg,0);
-
-	conn_send_response(conn,cwmsg,seqnum);
-	return 1;
-}
diff --git a/src/capwap/cwmsg_addelem_ac_timestamp.c b/src/capwap/cwmsg_addelem_ac_timestamp.c
deleted file mode 100644
index 374e2a5f..00000000
--- a/src/capwap/cwmsg_addelem_ac_timestamp.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    libcapwap is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include <stdint.h>
-#include <time.h>
-
-#include "capwap.h"
-
-void cwmsg_addelem_ac_timestamp(struct cwmsg *msg)
-{
-	time_t t = time(NULL);
-	uint32_t ntpt = t+(uint32_t)2398291200LL;
-	uint8_t c[4];
-       	*((uint32_t*)c)= htonl(ntpt);
-	cwmsg_addelem(msg,CW_ELEM_AC_TIMESTAMP,c,4);
-}
-
diff --git a/src/capwap/cwmsg_init.c b/src/capwap/cwmsg_init.c
deleted file mode 100644
index 95a520da..00000000
--- a/src/capwap/cwmsg_init.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    libcapwap is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "capwap.h"
-#include "cwmsg.h"
-
-#include "sock.h" //Tube
-
-void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, struct radioinfo * radioinfo)
-{
-	int hlen=8;
-	cwmsg->buffer=buffer;
-	cwmsg->trnsprthdr=buffer;
-
-
-	int rmaclen=0;
-	cwmsg->flags=0;
-
-	if (radioinfo){
-		if (radioinfo->rmac){
-			/* we assume the radio mac is already aligned */
-			rmaclen=bstr_len(radioinfo->rmac);
-			*(buffer+8)=rmaclen;
-			memcpy(buffer+9,bstr_data(radioinfo->rmac),rmaclen);
-			cwmsg->flags=CWTH_FLAGS_M;	
-			rmaclen++;
-		}
-	}
-
-	hlen+=rmaclen;
-	if (hlen%4){
-		int n = hlen;
-		hlen = (hlen>>2)*4+4;
-		memset(buffer+n,0,hlen-n);
-		*(buffer+n)=0xc0;
-	}
-
-	
-	cwmsg->ctrlhdr=cwmsg->trnsprthdr+hlen; 
-	cwmsg->msgelems=cwmsg->ctrlhdr+8;
-
-	*((uint32_t*)(cwmsg->ctrlhdr))=htonl(type); 
-
-	cwmsg->pos=0;
-	cwmsg->hlen=hlen/4;
-	if (radioinfo)
-		cwmsg->rid=radioinfo->rid;
-	else	
-		cwmsg->rid=0;
-	cwmsg->seqnum=seqnum;
-	cwmsg->type=type;
-}
-
diff --git a/src/capwap/cwmsg_init_echo_request.c b/src/capwap/cwmsg_init_echo_request.c
deleted file mode 100644
index 0c539358..00000000
--- a/src/capwap/cwmsg_init_echo_request.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-    This file is part of libcapwap.
-
-    libcapwap is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    libcapwap is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "capwap.h"
-#include "conn.h"
-#include "cwmsg.h"
-
-void cwmsg_init_echo_request(struct cwmsg * cwmsg,uint8_t *buffer,struct conn * conn, struct radioinfo * radioinfo)
-{
-	cwmsg_init(cwmsg,buffer,CW_MSG_ECHO_REQUEST,conn_get_next_seqnum(conn),radioinfo);
-}
-
-
diff --git a/src/capwap/cwmsg_set_control_header.c b/src/capwap/cwmsg_set_control_header.c
deleted file mode 100644
index 0ba2ed8a..00000000
--- a/src/capwap/cwmsg_set_control_header.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#include "cwmsg.h"
-
-void cwmsg_set_control_header(struct cwmsg * cwmsg,int msgtype, int seqnum)
-{
-	uint32_t val;
-	val = htonl(msgtype);
-	*((uint32_t*)(cwmsg->ctrlhdr))=htonl(val);
-	val = (seqnum<<24)|(cwmsg->pos<<8);
-	*((uint32_t*)(cwmsg->ctrlhdr+4))=htonl(val);
-}
-
-