diff --git a/model/leo-mobility-model.cc b/model/leo-mobility-model.cc
deleted file mode 100644
index 50c9931..0000000
--- a/model/leo-mobility-model.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2007, 2008 University of Washington
- *
- * 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
- */
-
-#include "leo-mobility-model.h"
-
-namespace ns3 {
-
-NS_LOG_COMPONENT_DEFINE ("LeoMobilityModel");
-
-NS_OBJECT_ENSURE_REGISTERED (LeoMobilityModel);
-
-TypeId
-LeoMobilityModel::GetTypeId (void)
-{
-  static TypeId tid = TypeId ("ns3::LeoMobilityModel")
-    .SetParent<MobilityModel> ()
-    .SetGroupName ("Leo")
-    .AddConstructor<LeoMobilityModel> ()
-  ;
-  return tid;
-}
-
-LeoMobilityModel::~LeoMobilityModel ()
-{
-}
-
-Vector
-LeoMobilityModel::DoGetPosition (void) const
-{
-  // TODO
-  return Vector();
-}
-
-void
-LeoMobilityModel::DoSetPosition (const Vector &position)
-{
-  // TODO
-}
-
-Vector
-LeoMobilityModel::DoGetVelocity (void) const
-{
-  // TODO
-  return Vector();
-}
-
-int64_t
-LeoMobilityModel::DoAssignStreams (int64_t start)
-{
-  // TODO
-  return 0;
-}
-
-};
diff --git a/model/leo-mobility-model.h b/model/leo-mobility-model.h
deleted file mode 100644
index cd0f4c9..0000000
--- a/model/leo-mobility-model.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2007, 2008 University of Washington
- *
- * 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
- */
-
-#ifndef LEO_MOBILITY_MODEL_H
-#define LEO_MOBILITY_MODEL_H
-#include "ns3/log.h"
-#include "ns3/mobility-model.h"
-
-namespace ns3 {
-
-class LeoMobilityModel : public MobilityModel {
-public:
-  static TypeId GetTypeId (void);
-  virtual ~LeoMobilityModel ();
-
-private:
-  /**
-   * \return the current position.
-   *
-   * Concrete subclasses of this base class must
-   * implement this method.
-   */
-  virtual Vector DoGetPosition (void) const;
-  /**
-   * \param position the position to set.
-   *
-   * Concrete subclasses of this base class must
-   * implement this method.
-   */
-  virtual void DoSetPosition (const Vector &position);
-  /**
-   * \return the current velocity.
-   *
-   * Concrete subclasses of this base class must
-   * implement this method.
-   */
-  virtual Vector DoGetVelocity (void) const;
-  /**
-   * The default implementation does nothing but return the passed-in
-   * parameter.  Subclasses using random variables are expected to
-   * override this.
-   * \param start  starting stream index
-   * \return the number of streams used
-   */
-  virtual int64_t DoAssignStreams (int64_t start);
-  };
-};
-
-#endif /* LEO_MOBILITY_MODEL_H */
diff --git a/wscript b/wscript
index d60c9ef..e5231a7 100644
--- a/wscript
+++ b/wscript
@@ -14,7 +14,6 @@ def build(bld):
         'helper/isl-helper.cc',
         'model/leo.cc',
         'helper/leo-channel-helper.cc',
-        'model/leo-mobility-model.cc',
         'model/leo-mock-channel.cc',
         'model/leo-mock-net-device.cc',
         'helper/leo-helper.cc',
@@ -40,7 +39,6 @@ def build(bld):
         'helper/isl-helper.h',
         'model/leo.h',
         'helper/leo-channel-helper.h',
-        'model/leo-mobility-model.h',
         'model/leo-mock-channel.h',
         'model/leo-mock-net-device.h',
         'helper/leo-helper.h',