diff --git a/service_scan.cc b/service_scan.cc
index ae5f16eb5..c74f38679 100644
--- a/service_scan.cc
+++ b/service_scan.cc
@@ -851,11 +851,6 @@ ServiceProbe::~ServiceProbe() {
   if (fallbackStr) free(fallbackStr);
 }
 
-void ServiceProbe::setName(const char *name) {
-  if (probename) free(probename);
-  probename = strdup(name);
-}
-
   // Parses the "probe " line in the nmap-service-probes file.  Pass the rest of the line
   // after "probe ".  The format better be:
   // [TCP|UDP] [probename] q|probetext|
diff --git a/service_scan.h b/service_scan.h
index 2d13a4403..c4db6d355 100644
--- a/service_scan.h
+++ b/service_scan.h
@@ -218,7 +218,6 @@ class ServiceProbe {
   ServiceProbe();
   ~ServiceProbe();
   const char *getName() { return probename; }
-  void setName(const char *name); // a copy of name will be made and stored
   // Returns true if this is the "null" probe, meaning it sends no probe and
   // only listens for a banner.  Only TCP services have this.
   bool isNullProbe() { return (probestringlen == 0); }
diff --git a/tcpip.cc b/tcpip.cc
index 8dd02de01..94d5f346e 100644
--- a/tcpip.cc
+++ b/tcpip.cc
@@ -952,11 +952,6 @@ ip->ip_dst.s_addr= victim->s_addr;
 ip->ip_sum = in_cksum((unsigned short *)ip, sizeof(struct ip));
 #endif
 
-if (TCPIP_DEBUGGING > 1) {
-  log_write(LOG_STDOUT, "Raw TCP packet creation completed!  Here it is:\n");
-  readtcppacket(packet,ntohs(ip->ip_len));
-}
-
  *packetlen = ntohs(ip->ip_len);
  return packet;
 
@@ -1398,11 +1393,6 @@ u8 *build_udp_raw(struct in_addr *source, const struct in_addr *victim,
   ip->ip_sum = in_cksum((unsigned short *)ip, sizeof(struct ip));
 #endif
   
-  if (TCPIP_DEBUGGING > 1) {
-    printf("Raw UDP packet creation completed!  Here it is:\n");
-    readudppacket(packet,1);
-  }
-  
   *packetlen = ntohs(ip->ip_len);
   return packet;
 }
@@ -1476,11 +1466,6 @@ ip->ip_sum = in_cksum((unsigned short *)ip, sizeof(struct ip));
  if (data)
    memcpy(packet + sizeof(struct ip), data, datalen);
 
-if (TCPIP_DEBUGGING > 1) {
-  printf("Raw IP packet creation completed!  Here it is:\n");
-  hdump(packet, ntohs(ip->ip_len));
-}
-
  *packetlen = ntohs(ip->ip_len);
  return packet;
 }