--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py	Fri Nov 20 13:14:56 2009 +0300
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_global_routing.py	Sat Nov 21 16:33:39 2009 -0800
@@ -109,16 +109,6 @@
     return
 
 def register_Ns3GlobalRouteManager_methods(root_module, cls):
-    ## global-route-manager.h: static void ns3::GlobalRouteManager::PopulateRoutingTables() [member function]
-    cls.add_method('PopulateRoutingTables', 
-                   'void', 
-                   [], 
-                   is_static=True, deprecated=True)
-    ## global-route-manager.h: static void ns3::GlobalRouteManager::RecomputeRoutingTables() [member function]
-    cls.add_method('RecomputeRoutingTables', 
-                   'void', 
-                   [], 
-                   is_static=True, deprecated=True)
     ## global-route-manager.h: static uint32_t ns3::GlobalRouteManager::AllocateRouterId() [member function]
     cls.add_method('AllocateRouterId', 
                    'uint32_t', 

--- a/bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py	Fri Nov 20 13:14:56 2009 +0300
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_global_routing.py	Sat Nov 21 16:33:39 2009 -0800
@@ -109,16 +109,6 @@
     return
 
 def register_Ns3GlobalRouteManager_methods(root_module, cls):
-    ## global-route-manager.h: static void ns3::GlobalRouteManager::PopulateRoutingTables() [member function]
-    cls.add_method('PopulateRoutingTables', 
-                   'void', 
-                   [], 
-                   is_static=True, deprecated=True)
-    ## global-route-manager.h: static void ns3::GlobalRouteManager::RecomputeRoutingTables() [member function]
-    cls.add_method('RecomputeRoutingTables', 
-                   'void', 
-                   [], 
-                   is_static=True, deprecated=True)
     ## global-route-manager.h: static uint32_t ns3::GlobalRouteManager::AllocateRouterId() [member function]
     cls.add_method('AllocateRouterId', 
                    'uint32_t', 

--- a/src/routing/global-routing/global-route-manager.cc	Fri Nov 20 13:14:56 2009 +0300
+++ b/src/routing/global-routing/global-route-manager.cc	Sat Nov 21 16:33:39 2009 -0800
@@ -33,21 +33,6 @@
 // ---------------------------------------------------------------------------
 
   void
-GlobalRouteManager::PopulateRoutingTables (void) 
-{
-  BuildGlobalRoutingDatabase ();
-  InitializeRoutes ();
-}
-
-  void
-GlobalRouteManager::RecomputeRoutingTables ()
-{
-  DeleteGlobalRoutes ();
-  BuildGlobalRoutingDatabase ();
-  InitializeRoutes ();
-}
-
-  void
 GlobalRouteManager::DeleteGlobalRoutes ()
 {
   SimulationSingleton<GlobalRouteManagerImpl>::Get ()->

--- a/src/routing/global-routing/global-route-manager.h	Fri Nov 20 13:14:56 2009 +0300
+++ b/src/routing/global-routing/global-route-manager.h	Sat Nov 21 16:33:39 2009 -0800
@@ -41,37 +41,6 @@
 {
 public:
 /**
- * @brief Build a routing database and initialize the routing tables of
- * the nodes in the simulation.  Makes all nodes in the simulation into
- * routers.
- *
- * All this function does is call the functions
- * BuildGlobalRoutingDatabase () and  InitializeRoutes ().
- *
- * @see BuildGlobalRoutingDatabase ();
- * @see InitializeRoutes ();
- */
-  static void PopulateRoutingTables () NS_DEPRECATED;
-
- /**
-  *@brief Remove all routes that were previously installed in a prior call
- * to either PopulateRoutingTables() or RecomputeRoutingTables(), and 
- * add a new set of routes.  
- * 
- * This method does not change the set of nodes
- * over which GlobalRouting is being used, but it will dynamically update
- * its representation of the global topology before recomputing routes.
- * Users must first call PopulateRoutingTables() and then may subsequently
- * call RecomputeRoutingTables() at any later time in the simulation.
- *
- * @see DeleteGlobalRoutes ();
- * @see BuildGlobalRoutingDatabase ();
- * @see InitializeRoutes ();
- */
- static void RecomputeRoutingTables () NS_DEPRECATED;
-
-public:
-/**
  * @brief Allocate a 32-bit router ID from monotonically increasing counter.
  */
   static uint32_t AllocateRouterId ();