diff --git a/se/sics/mspsim/core/Chip.java b/se/sics/mspsim/core/Chip.java
index 01e4b7e..e23901c 100644
--- a/se/sics/mspsim/core/Chip.java
+++ b/se/sics/mspsim/core/Chip.java
@@ -69,9 +69,6 @@ public abstract class Chip implements Loggable, EventSource {
 
   public Chip(String id, MSP430Core cpu) {
     this(id, id, cpu);
-    if (cpu != null) {
-        logger = cpu.getLogger();
-    }
   }
 
   public Chip(String id, String name, MSP430Core cpu) {
diff --git a/se/sics/mspsim/core/IOUnit.java b/se/sics/mspsim/core/IOUnit.java
index 71bb834..876ef3a 100644
--- a/se/sics/mspsim/core/IOUnit.java
+++ b/se/sics/mspsim/core/IOUnit.java
@@ -36,9 +36,6 @@
  */
 
 package se.sics.mspsim.core;
-
-import java.io.PrintStream;
-
 import se.sics.mspsim.core.EmulationLogger.WarningType;
 
 public abstract class IOUnit implements InterruptHandler, Loggable {
@@ -53,11 +50,10 @@ public abstract class IOUnit implements InterruptHandler, Loggable {
   private StateChangeListener stateListener;
   private int ioState;
   protected int logLevel;
-  
-  protected EmulationLogger logger;
-  private PrintStream log;
   protected boolean DEBUG = false;
 
+  protected EmulationLogger logger;
+
   public IOUnit(String id, MSP430Core cpu, int[] memory, int offset) {
     this(id, id, cpu, memory, offset);
   }
@@ -79,8 +75,9 @@ public abstract class IOUnit implements InterruptHandler, Loggable {
   @Override 
   public void setLogLevel(int l) {
       logLevel = l;
+      DEBUG = logLevel == Loggable.DEBUG;
   }
-  
+
   public void addStateChangeListener(StateChangeListener listener) {
       stateListener = StateChangeListener.Proxy.INSTANCE.add(stateListener, listener);
   }