diff --git a/src/core/empty-trace-resolver.cc b/src/core/empty-trace-resolver.cc
deleted file mode 100644
index dc3478864..000000000
--- a/src/core/empty-trace-resolver.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2007 INRIA
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
- */
-#include "empty-trace-resolver.h"
-
-ns3::EmptyTraceResolver::EmptyTraceResolver ()
-{}
diff --git a/src/core/empty-trace-resolver.h b/src/core/empty-trace-resolver.h
deleted file mode 100644
index 1e5ddab46..000000000
--- a/src/core/empty-trace-resolver.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2007 INRIA
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation;
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
- */
-#ifndef EMPTY_TRACE_RESOLVER_H
-#define EMPTY_TRACE_RESOLVER_H
-
-#include "trace-resolver.h"
-
-namespace ns3 {
-
-class TraceContext;
-
-/**
- * \brief a TraceResolver instance which does not resolve anything.
- * \ingroup tracing
- *
- * Trying to resolve against this class will yield no matches and no
- * connections. Returning an instance of this class from a 
- * CreateTraceResolver method is a hand way of not implementing
- * any Tracing code.
- */
-class EmptyTraceResolver : public TraceResolver
-{
-public:
-  /**
-   * \param o necessary context for this class.
-   *
-   * The only constructor exported by this class.
-   */
-  EmptyTraceResolver ();
-};
-
-}//namespace ns3
-
-#endif /* EMPTY_TRACE_RESOLVER_H */
diff --git a/src/core/wscript b/src/core/wscript
index dacab2c32..7d913eddc 100644
--- a/src/core/wscript
+++ b/src/core/wscript
@@ -47,7 +47,6 @@ def build(bld):
         'trace-context-element.cc',
         'trace-resolver.cc',
         'callback-trace-source.cc',
-        'empty-trace-resolver.cc',
         'composite-trace-resolver.cc',
         ]
 
@@ -88,7 +87,6 @@ def build(bld):
         'trace-context.h',
         'trace-context-element.h',
         'trace-resolver.h',
-        'empty-trace-resolver.h',
         'composite-trace-resolver.h',
         'array-trace-resolver.h',
         ]
diff --git a/src/internet-node/arp-l3-protocol.cc b/src/internet-node/arp-l3-protocol.cc
index b4d346e60..bcc62bfe2 100644
--- a/src/internet-node/arp-l3-protocol.cc
+++ b/src/internet-node/arp-l3-protocol.cc
@@ -20,7 +20,6 @@
  */
 #include "ns3/packet.h"
 #include "ns3/debug.h"
-#include "ns3/empty-trace-resolver.h"
 #include "ns3/node.h"
 #include "ns3/net-device.h"
 
diff --git a/src/internet-node/ipv4-loopback-interface.cc b/src/internet-node/ipv4-loopback-interface.cc
index 307533d6e..d3bc45207 100644
--- a/src/internet-node/ipv4-loopback-interface.cc
+++ b/src/internet-node/ipv4-loopback-interface.cc
@@ -19,7 +19,6 @@
  * Authors: 
  *  Mathieu Lacage <mathieu.lacage@sophia.inria.fr>,
  */
-#include "ns3/empty-trace-resolver.h"
 #include "ns3/net-device.h"
 #include "ns3/node.h"
 #include "ipv4-loopback-interface.h"
diff --git a/src/internet-node/udp-l4-protocol.cc b/src/internet-node/udp-l4-protocol.cc
index d9b5afe23..fc2a54dc9 100644
--- a/src/internet-node/udp-l4-protocol.cc
+++ b/src/internet-node/udp-l4-protocol.cc
@@ -21,7 +21,6 @@
 
 #include "ns3/assert.h"
 #include "ns3/packet.h"
-#include "ns3/empty-trace-resolver.h"
 #include "ns3/node.h"
 
 #include "udp-l4-protocol.h"