--- a/src/buildings/model/building-list.cc	Thu Jan 26 14:51:33 2012 +0100
+++ b/src/buildings/model/building-list.cc	Thu Jan 26 16:37:31 2012 +0100
@@ -151,7 +151,7 @@
 {
   NS_ASSERT_MSG (n < m_buildings.size (), "Building index " << n <<
                  " is out of range (only have " << m_buildings.size () << " buildings).");
-  return m_buildings[n];
+  return m_buildings.at (n);
 }
 
 }

--- a/src/lte/examples/wscript	Thu Jan 26 14:51:33 2012 +0100
+++ b/src/lte/examples/wscript	Thu Jan 26 16:37:31 2012 +0100
@@ -7,9 +7,6 @@
     obj = bld.create_ns3_program('lena-fading',
                                  ['lte'])
     obj.source = 'lena-fading.cc'
-    obj = bld.create_ns3_program('lena-gtpu-tunnel',
-                                 ['lte'])
-    obj.source = 'lena-gtpu-tunnel.cc'
     obj = bld.create_ns3_program('lena-intercell-interference',
                                  ['lte'])
     obj.source = 'lena-intercell-interference.cc'

--- a/src/lte/helper/epc-helper.cc	Thu Jan 26 14:51:33 2012 +0100
+++ b/src/lte/helper/epc-helper.cc	Thu Jan 26 16:37:31 2012 +0100
@@ -23,7 +23,6 @@
 #include <ns3/log.h>
 #include <ns3/inet-socket-address.h>
 #include <ns3/mac48-address.h>
-#include <ns3/epc-gtpu-tunnel-endpoint.h>
 #include <ns3/eps-bearer.h>
 #include <ns3/ipv4-address.h>
 #include <ns3/internet-stack-helper.h>

--- a/src/lte/model/epc-enb-application.h	Thu Jan 26 14:51:33 2012 +0100
+++ b/src/lte/model/epc-enb-application.h	Thu Jan 26 16:37:31 2012 +0100
@@ -25,7 +25,6 @@
 #include <ns3/address.h>
 #include <ns3/socket.h>
 #include <ns3/virtual-net-device.h>
-#include <ns3/epc-gtpu-l5-protocol.h>
 #include <ns3/traced-callback.h>
 #include <ns3/callback.h>
 #include <ns3/ptr.h>

--- a/src/lte/model/epc-sgw-pgw-application.h	Thu Jan 26 14:51:33 2012 +0100
+++ b/src/lte/model/epc-sgw-pgw-application.h	Thu Jan 26 16:37:31 2012 +0100
@@ -25,7 +25,6 @@
 #include <ns3/address.h>
 #include <ns3/socket.h>
 #include <ns3/virtual-net-device.h>
-#include <ns3/epc-gtpu-l5-protocol.h>
 #include <ns3/traced-callback.h>
 #include <ns3/callback.h>
 #include <ns3/ptr.h>

--- a/src/lte/wscript	Thu Jan 26 14:51:33 2012 +0100
+++ b/src/lte/wscript	Thu Jan 26 16:37:31 2012 +0100
@@ -34,7 +34,6 @@
         'model/lte-ue-net-device.cc',
         'model/ideal-control-messages.cc',
         'helper/lte-helper.cc',
-        'helper/gtpu-tunnel-helper.cc',
         'helper/lte-stats-calculator.cc',
         'helper/epc-helper.cc',
         'helper/radio-bearer-stats-calculator.cc',
@@ -59,8 +58,6 @@
         'model/pf-ff-mac-scheduler.cc',
         'model/epc-gtpu-header.cc',
         'model/trace-fading-loss-model.cc',
-        'model/epc-gtpu-l5-protocol.cc',
-        'model/epc-gtpu-tunnel-endpoint.cc',
         'model/epc-enb-application.cc',
         'model/epc-sgw-pgw-application.cc',
         'model/epc-tft.cc',
@@ -126,7 +123,6 @@
         'model/lte-ue-net-device.h',
         'model/ideal-control-messages.h',
         'helper/lte-helper.h',
-        'helper/gtpu-tunnel-helper.h',
         'helper/lte-stats-calculator.h',
         'helper/epc-helper.h',
         'helper/mac-stats-calculator.h',
@@ -152,8 +148,6 @@
         'model/pf-ff-mac-scheduler.h',
         'model/trace-fading-loss-model.h',
         'model/epc-gtpu-header.h',
-        'model/epc-gtpu-l5-protocol.h',
-        'model/epc-gtpu-tunnel-endpoint.h',
         'model/epc-enb-application.h',
         'model/epc-sgw-pgw-application.h',
         'test/lte-test-downlink-sinr.h',