diff --git a/src/applications/packet-sink/packet-sink.cc b/src/applications/packet-sink/packet-sink.cc
index b200a4879..2ed2b1882 100644
--- a/src/applications/packet-sink/packet-sink.cc
+++ b/src/applications/packet-sink/packet-sink.cc
@@ -109,35 +109,22 @@ void PacketSink::HandleRead (Ptr<Socket> socket)
   uint32_t flags = 0;  // no flags
   while (packet = socket->Recv (maxSize, flags))
     {
-          NS_LOG_INFO ("Received " << packet->GetSize());
-#if 0
-      // this code waits until we pass address as a Packet tag
+      SocketRxAddressTag tag;
+      bool found = packet->PeekTag (tag);
+      NS_ASSERT (found);
+      Address from = tag.GetAddress ();
+      packet->RemoveTag (tag);
       if (InetSocketAddress::IsMatchingType (from))
         {
-          address = InetSocketAddress::ConvertFrom (from);
+          InetSocketAddress address = InetSocketAddress::ConvertFrom (from);
           NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " << 
             address.GetIpv4() << " [" << address << "]---'" << 
             packet->PeekData() << "'");
         }    
       m_rxTrace (packet, from);
-#endif
     }
 }
 
-// This LOG output inspired by the application on Joseph Kopena's wiki
-void PacketSink::Receive(Ptr<Socket> socket, Ptr<Packet> packet,
-                       const Address &from) 
-{
-  if (InetSocketAddress::IsMatchingType (from))
-    {
-      InetSocketAddress address = InetSocketAddress::ConvertFrom (from);
-      NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " << 
-        address.GetIpv4() << " [" << address << "]---'" << 
-        packet->PeekData() << "'");
-    }
-  m_rxTrace (packet, from);
-}
-
 void PacketSink::CloseConnection (Ptr<Socket> socket)
 {
   socket->Close ();
diff --git a/src/applications/packet-sink/packet-sink.h b/src/applications/packet-sink/packet-sink.h
index 576784dda..638309aad 100644
--- a/src/applications/packet-sink/packet-sink.h
+++ b/src/applications/packet-sink/packet-sink.h
@@ -65,7 +65,6 @@ private:
   virtual void StartApplication (void);    // Called at time specified by Start
   virtual void StopApplication (void);     // Called at time specified by Stop
 
-  virtual void Receive (Ptr<Socket> socket, Ptr<Packet> packet, const Address& from);
   virtual void HandleRead (Ptr<Socket> socket);
 
   virtual void CloseConnection (Ptr<Socket> socket);
diff --git a/src/applications/udp-echo/udp-echo-client.cc b/src/applications/udp-echo/udp-echo-client.cc
index 86122177f..382fbac82 100644
--- a/src/applications/udp-echo/udp-echo-client.cc
+++ b/src/applications/udp-echo/udp-echo-client.cc
@@ -170,21 +170,4 @@ UdpEchoClient::HandleRead (Ptr<Socket> socket)
     }
 }
 
-void
-UdpEchoClient::Receive(
-  Ptr<Socket> socket, 
-  Ptr<Packet> packet,
-  const Address &from) 
-{
-  NS_LOG_FUNCTION (this << socket << packet << from);
-
-  if (InetSocketAddress::IsMatchingType (from))
-    {
-      InetSocketAddress address = InetSocketAddress::ConvertFrom (from);
-      NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " << 
-        address.GetIpv4());
-    }
-}
-
-
 } // Namespace ns3
diff --git a/src/applications/udp-echo/udp-echo-client.h b/src/applications/udp-echo/udp-echo-client.h
index 848bdd211..bfb1c3fcf 100644
--- a/src/applications/udp-echo/udp-echo-client.h
+++ b/src/applications/udp-echo/udp-echo-client.h
@@ -56,7 +56,6 @@ private:
   void ScheduleTransmit (Time dt);
   void Send (void);
 
-  void Receive(Ptr<Socket> socket, Ptr<Packet> packet, const Address &from);
   void HandleRead (Ptr<Socket> socket);
 
   uint32_t m_count;
diff --git a/src/applications/udp-echo/udp-echo-server.cc b/src/applications/udp-echo/udp-echo-server.cc
index fda6ad08e..c22b03af3 100644
--- a/src/applications/udp-echo/udp-echo-server.cc
+++ b/src/applications/udp-echo/udp-echo-server.cc
@@ -118,23 +118,4 @@ UdpEchoServer::HandleRead (Ptr<Socket> socket)
     }
 }
 
-void
-UdpEchoServer::Receive(
-  Ptr<Socket> socket, 
-  Ptr<Packet> packet,
-  const Address &from) 
-{
-  NS_LOG_FUNCTION (this << socket << packet << from);
-
-  if (InetSocketAddress::IsMatchingType (from))
-    {
-      InetSocketAddress address = InetSocketAddress::ConvertFrom (from);
-      NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " << 
-        address.GetIpv4());
-
-      NS_LOG_LOGIC ("Echoing packet");
-      socket->SendTo (from, packet);
-    }
-}
-
 } // Namespace ns3
diff --git a/src/applications/udp-echo/udp-echo-server.h b/src/applications/udp-echo/udp-echo-server.h
index 6b42ec2fc..4e2b09fce 100644
--- a/src/applications/udp-echo/udp-echo-server.h
+++ b/src/applications/udp-echo/udp-echo-server.h
@@ -49,7 +49,6 @@ private:
   virtual void StartApplication (void);
   virtual void StopApplication (void);
 
-  void Receive(Ptr<Socket> socket, Ptr<Packet> packet, const Address &from);
   void HandleRead (Ptr<Socket> socket);
 
   uint16_t m_port;