diff --git a/src/ac/wtpman.c b/src/ac/wtpman.c
index 399e6bcf..371cdf3c 100644
--- a/src/ac/wtpman.c
+++ b/src/ac/wtpman.c
@@ -150,70 +150,6 @@ conn->radios = mbag_create();
 	wtpman_remove(wtpman);
 	return;
 
-
-
-
-
-/*
-	timer = cw_timer_start(10);
-	cwrmsg = wtpman_wait_for_message(wtpman, timer);
-
-	if (!cwrmsg) {
-		cw_dbg(DBG_MSG_ERR,
-		       "No complete message from %s received after %d seconds", CLIENT_IP,
-		       10);
-		wtpman_remove(wtpman);
-		return;
-	}
-
-
-	if (cwrmsg->type != CW_MSG_DISCOVERY_REQUEST) {
-		cw_dbg(DBG_MSG_ERR,
-		       "Invalid message in discovery state from %s, type=%s - %s ",
-		       CLIENT_IP, cwrmsg->type, cw_msgtostr(cwrmsg->type));
-		wtpman_remove(wtpman);
-		return;
-	}
-
-	cwread_discovery_request(&wtpman->wtpinfo, cwrmsg->msgelems,
-				 cwrmsg->msgelems_len);
-
-
-//      printf("RMAC-LEN:%d\n",cwrmsg->rmac[0]);
-
-//printf("HW: %s\n",sock_hwaddr2str(bstr_data(cwrmsg->rmac),bstr_len(cwrmsg->rmac)));
-
-
-
-	conn_detect_capwap(wtpman->conn, &wtpman->wtpinfo);
-
-	char wtpinfostr[8192];
-	wtpinfo_print(wtpinfostr, &wtpman->wtpinfo);
-	cw_dbg(DBG_INFO, "Discovery request gave us the follwing WTP Info:\n%s",
-	       wtpinfostr);
-
-
-	struct radioinfo radioinfo;
-	radioinfo.rid = cwrmsg->rid;
-	radioinfo.rmac = 0;	//&cwrmsg->rmac;
-
-//      memcpy(radioinfo.rmac, cwrmsg->rmac,8);
-//      radioinfo.rmac[0]=0;
-
-	struct ac_info *acinfo = get_acinfo();
-
-*/
-
-/*	char wtpinfostr[8192];
-	wtpinfo_print(wtpinfostr,&wtpman->wtpinfo);
-	cw_dbg(DBG_INFO,"Discovery request gave us the follwing WTP Info:\n%s",wtpinfostr);
-*/
-
-/*
-	cwsend_discovery_response(wtpman->conn, cwrmsg->seqnum, &radioinfo, acinfo,
-				  &wtpman->wtpinfo);
-	wtpman_remove(wtpman);
-*/
 }