--- a/src/simulator/simulator.h	Tue Jul 08 10:02:46 2008 -0700
+++ b/src/simulator/simulator.h	Tue Jul 08 10:02:57 2008 -0700
@@ -52,15 +52,10 @@
  * is shown below:
  * \include samples/main-simulator.cc
  */
-class Simulator {
+class Simulator 
+{
 public:
   /**
-   * Enable ParallelSimulation.
-   * This method must be invoked before every other method exported
-   * by the Simulator class.
-   */
-  static void EnableParallelSimulation (void);
-  /**
    * \param scheduler a new event scheduler
    *
    * The event scheduler can be set at any time: the events scheduled
@@ -70,13 +65,6 @@
   static void SetScheduler (Ptr<Scheduler> scheduler);
 
   /**
-   * Force the use of a user-provided event scheduler.
-   * This method must be invoked before any other method exported
-   * by the Simulator class.
-   */
-  static void SetExternal (const std::string &name);
-
-  /**
    * Enable logging to the file identified by filename. If the file
    * does not exist, it is created. If it exists, it is destroyed and
    * re-created. Every scheduling event is logged to this file in a