diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaClock.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaClock.java
index 7a2ef4c4e..6bbb395e7 100644
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaClock.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaClock.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaClock.java,v 1.6 2009/10/30 09:42:50 fros4943 Exp $
+ * $Id: MicaClock.java,v 1.7 2010/02/05 08:24:57 fros4943 Exp $
  */
 
 package se.sics.cooja.avrmote.interfaces;
@@ -84,10 +84,6 @@ public class MicaClock extends Clock {
   public void releaseInterfaceVisualizer(JPanel panel) {
   }
 
-  public double energyConsumption() {
-    return 0;
-  }
-
   public Collection<Element> getConfigXML() {
     return null;
   }
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZID.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZID.java
index 290700d0a..0dd8007ea 100644
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZID.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZID.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaZID.java,v 1.3 2009/11/17 14:30:26 joxe Exp $
+ * $Id: MicaZID.java,v 1.4 2010/02/05 08:24:57 fros4943 Exp $
  */
 
 package se.sics.cooja.avrmote.interfaces;
@@ -152,10 +152,6 @@ public class MicaZID extends MoteID {
     public void releaseInterfaceVisualizer(JPanel panel) {
     }
 
-    public double energyConsumption() {
-        return 0;
-    }
-
     public Collection<Element> getConfigXML() {
         Vector<Element> config = new Vector<Element>();
         Element element;
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.java
index 9286e597f..b1e29f978 100755
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZLED.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaZLED.java,v 1.4 2009/09/17 10:45:13 fros4943 Exp $
+ * $Id: MicaZLED.java,v 1.5 2010/02/05 08:24:57 fros4943 Exp $
  */
 
 package se.sics.cooja.avrmote.interfaces;
@@ -119,10 +119,6 @@ public class MicaZLED extends LED {
     return redOn;
   }
 
-  public double energyConsumption() {
-    return 0;
-  }
-
   public JPanel getInterfaceVisualizer() {
     final JPanel panel = new JPanel() {
       public void paintComponent(Graphics g) {
diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZRadio.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZRadio.java
index 5f6131557..2b3bcf340 100644
--- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZRadio.java
+++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/interfaces/MicaZRadio.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MicaZRadio.java,v 1.6 2009/11/10 12:56:20 joxe Exp $
+ * $Id: MicaZRadio.java,v 1.7 2010/02/05 08:24:57 fros4943 Exp $
  */
 
 package se.sics.cooja.avrmote.interfaces;
@@ -144,10 +144,6 @@ public class MicaZRadio extends Radio802154 {
     //cc2420.setRSSI((int) signalStrength);
   }
 
-  public double energyConsumption() {
-    return 1.0;
-  }
-
   protected void handleEndOfReception() {
       /* tell the receiver that the packet is ended */
       recv.nextByte(false, (byte)0);