diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java
index 7e64202ae..095a2f404 100755
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMote.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaZMote.java,v 1.13 2009/11/27 15:53:10 fros4943 Exp $
+ * $Id: MicaZMote.java,v 1.14 2010/02/03 16:04:44 fros4943 Exp $
  */
 
 package se.sics.cooja.avrmote;
@@ -192,10 +192,6 @@ public class MicaZMote extends AbstractEmulatedMote implements Mote {
     myMoteInterfaceHandler = moteInterfaceHandler;
   }
 
-  public boolean tick(long simTime) {
-    throw new RuntimeException("Obsolete method");
-  }
-
   private long cyclesExecuted = 0;
   private long cyclesUntil = 0;
   public void execute(long t) {
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
index ef5dd2db2..1fdedecd9 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspMote.java,v 1.39 2010/02/03 11:06:23 fros4943 Exp $
+ * $Id: MspMote.java,v 1.40 2010/02/03 16:04:44 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
@@ -308,10 +308,6 @@ public abstract class MspMote extends AbstractEmulatedMote implements Mote, Watc
    */
   protected abstract boolean initEmulator(File ELFFile);
 
-  public boolean tick(long simTime) {
-    throw new RuntimeException("Obsolete method");
-  }
-
   private long lastExecute = -1; /* Last time mote executed */
   private long nextExecute;
   public void execute(long t) {
diff --git a/tools/cooja/examples/appmote_rimeabc/RimeABC.java b/tools/cooja/examples/appmote_rimeabc/RimeABC.java
index 38de798a4..efeb5c3fb 100644
--- a/tools/cooja/examples/appmote_rimeabc/RimeABC.java
+++ b/tools/cooja/examples/appmote_rimeabc/RimeABC.java
@@ -129,10 +129,5 @@ public class RimeABC extends AbstractApplicationMote {
   public String toString() {
     return "App Rime ABC " + getID();
   }
-
-  public boolean tick(long simTime) {
-    /* Obsolete method */
-    return false;
-  }
 }
 
diff --git a/tools/cooja/java/se/sics/cooja/Mote.java b/tools/cooja/java/se/sics/cooja/Mote.java
index 223a333df..f29f40edb 100644
--- a/tools/cooja/java/se/sics/cooja/Mote.java
+++ b/tools/cooja/java/se/sics/cooja/Mote.java
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: Mote.java,v 1.7 2009/09/17 11:05:09 fros4943 Exp $
+ * $Id: Mote.java,v 1.8 2010/02/03 16:05:49 fros4943 Exp $
  */
 
 package se.sics.cooja;
@@ -119,24 +119,6 @@ public interface Mote {
    */
   public void setSimulation(Simulation simulation);
 
-  /**
-   * Ticks this mote and increases any internal time to given argument.
-   *
-   * Each mote implementation may handle calls to this method differently, but
-   * typically the simulated mote should at least handle one event.
-   *
-   * This method is responsible for updating the mote interfaces.
-   *
-   * A call to this method typically polls all interfaces, activates the memory,
-   * lets the underlying mote software handle one event, fetches the updated
-   * memory and finally polls all interfaces again.
-   *
-   * @param simTime
-   *          New simulation time
-   * @return True is mote accepts another immediate tick
-   */
-  public boolean tick(long simTime);
-
   /**
    * Returns XML elements representing the current config of this mote. This is
    * fetched by the simulator for example when saving a simulation configuration
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
index 38109081f..a38a1c7d6 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMote.java,v 1.16 2009/11/27 15:53:10 fros4943 Exp $
+ * $Id: ContikiMote.java,v 1.17 2010/02/03 16:06:21 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote;
@@ -229,7 +229,4 @@ public class ContikiMote extends AbstractWakeupMote implements Mote {
     return "Contiki " + getID();
   }
 
-  public boolean tick(long simTime) {
-    throw new RuntimeException("Obsolete method");
-  }
 }
diff --git a/tools/cooja/java/se/sics/cooja/motes/DisturberMoteType.java b/tools/cooja/java/se/sics/cooja/motes/DisturberMoteType.java
index 2550e778f..6c028ea81 100644
--- a/tools/cooja/java/se/sics/cooja/motes/DisturberMoteType.java
+++ b/tools/cooja/java/se/sics/cooja/motes/DisturberMoteType.java
@@ -111,10 +111,6 @@ public class DisturberMoteType extends AbstractApplicationMoteType {
       radio.startTransmittingPacket(radioPacket, DURATION);
     }
 
-    public boolean tick(long simTime) {
-      throw new RuntimeException("Obsolete method");
-    }
-
     public void receivedPacket(RadioPacket p) {
       /* Ignore */
     }