--- a/src/internet-stack/tcp-l4-protocol.cc	Mon Jan 03 15:48:42 2011 -0800
+++ b/src/internet-stack/tcp-l4-protocol.cc	Mon Jan 03 15:51:55 2011 -0800
@@ -324,8 +324,6 @@
     m_node->GetObject<Ipv4L3Protocol> ();
   if (ipv4 != 0)
     {
-      // XXX We've already performed the route lookup in TcpSocketImpl
-      // should be cached.
       Ipv4Header header;
       header.SetDestination (daddr);
       header.SetProtocol (PROT_NUMBER);
@@ -372,8 +370,6 @@
     m_node->GetObject<Ipv4L3Protocol> ();
   if (ipv4 != 0)
     {
-      // XXX We've already performed the route lookup in TcpSocketImpl
-      // should be cached.
       Ipv4Header header;
       header.SetDestination (daddr);
       header.SetProtocol (PROT_NUMBER);

--- a/src/internet-stack/tcp-l4-protocol.h	Mon Jan 03 15:48:42 2011 -0800
+++ b/src/internet-stack/tcp-l4-protocol.h	Mon Jan 03 15:51:55 2011 -0800
@@ -65,7 +65,7 @@
   virtual int GetProtocolNumber (void) const;
 
   /**
-   * \return A smart Socket pointer to a TcpSocketImpl, allocated by this instance
+   * \return A smart Socket pointer to a TcpSocket allocated by this instance
    * of the TCP protocol
    */
   Ptr<Socket> CreateSocket (void);
@@ -80,10 +80,6 @@
 
   void DeAllocate (Ipv4EndPoint *endPoint);
 
-//   // called by TcpSocketImpl.
-//   bool Connect (const Ipv4Address& saddr, const Ipv4Address& daddr,
-//                 uint16_t sport, uint16_t dport);
-
   /**
    * \brief Send a packet via TCP
    * \param packet The packet to send

--- a/src/internet-stack/tcp-socket-base.cc	Mon Jan 03 15:48:42 2011 -0800
+++ b/src/internet-stack/tcp-socket-base.cc	Mon Jan 03 15:51:55 2011 -0800
@@ -1270,7 +1270,7 @@
   if (m_txBuffer.Size () == 0) return false; // Nothing to send
   if (m_endPoint == 0)
     {
-      NS_LOG_INFO ("TcpSocketImpl::SendPendingData: No endpoint; m_shutdownSend=" << m_shutdownSend);
+      NS_LOG_INFO ("TcpSocketBase::SendPendingData: No endpoint; m_shutdownSend=" << m_shutdownSend);
       return false; // Is this the right way to handle this condition?
     }
   uint32_t nPacketsSent = 0;

--- a/src/internet-stack/tcp-socket-factory-impl.h	Mon Jan 03 15:48:42 2011 -0800
+++ b/src/internet-stack/tcp-socket-factory-impl.h	Mon Jan 03 15:51:55 2011 -0800
@@ -31,13 +31,7 @@
  * \ingroup internetStack
  * \defgroup tcp Tcp
  *
- * The TCP code in ns3's internet stack is ported from the  
- * <a href="http://www.ece.gatech.edu/research/labs/MANIACS/GTNetS/">
- * Georgia Tech Network Simulator (GTNetS)</a>.
- *
- * Most of the logic is in class ns3::TcpSocketImpl.
- * This class serves to create sockets of the TcpSocketImpl
- * type.  That is, it creates sockets which use the GTNetS Tahoe code.
+ * This class serves to create sockets of the TcpSocketBase type.  
  */
 
 /**