diff --git a/src/capwap/cwmsg_init.c b/src/capwap/cwmsg_init.c
index 062fa459..2d8f610a 100644
--- a/src/capwap/cwmsg_init.c
+++ b/src/capwap/cwmsg_init.c
@@ -20,10 +20,8 @@
 #include <string.h>
 
 #include "capwap.h"
-
 #include "cwmsg.h"
 
-
 void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, struct radioinfo * radioinfo)
 {
 	int hlen=8;
@@ -32,17 +30,10 @@ void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, str
 
 
 
-//#ifdef WITH_RMAC_SUPPORT	
 	int rmaclen;
 	if (radioinfo->rmac[0]){
 		/* we assume the radio mac is already aligned */
-
 		rmaclen=(*radioinfo->rmac);
-
-//		printf ("Adding rmac len %d\n",rmaclen);
-//		printf ("Real copy woul dbe %d\n",rmaclen/8+8);
-
-
 		memcpy(buffer+8,radioinfo->rmac,rmaclen/8+8);
 		cwmsg->flags=CWTH_FLAGS_M;	
 	}
@@ -54,7 +45,6 @@ void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, str
 	hlen+=rmaclen;
 	if (hlen%4)
 		hlen = (hlen>>2)*4+4;
-//#endif	
 
 	
 	cwmsg->ctrlhdr=cwmsg->trnsprthdr+hlen;