diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/asm/editor/AssemblerBreakpoinDebugModelPresentation.java b/com.wudsn.ide.asm/src/com/wudsn/ide/asm/editor/AssemblerBreakpoinDebugModelPresentation.java
index c6c65832..c803d723 100644
--- a/com.wudsn.ide.asm/src/com/wudsn/ide/asm/editor/AssemblerBreakpoinDebugModelPresentation.java
+++ b/com.wudsn.ide.asm/src/com/wudsn/ide/asm/editor/AssemblerBreakpoinDebugModelPresentation.java
@@ -29,10 +29,9 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.ide.IDE;
 
-import com.wudsn.ide.asm.AssemblerPlugin;
-
 /**
  * Implementation class for extension
  * "com.wudsn.ide.asm.editor.AssemblerBreakpoinDebugModelPresentation". This is
@@ -66,7 +65,7 @@ public class AssemblerBreakpoinDebugModelPresentation implements IDebugModelPres
 	AssemblerBreakpoint assemblerBreakpoint = (AssemblerBreakpoint) element;
 	IEditorInput result = assemblerBreakpoint.getEditorInput();
 	if (result == null) {
-	    IWorkbenchWindow activeWindow = AssemblerPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow();
+	    IWorkbenchWindow activeWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 	    if (activeWindow == null) {
 		return null;
 	    }
diff --git a/com.wudsn.ide.base/src/com/wudsn/ide/base/gui/Application.java b/com.wudsn.ide.base/src/com/wudsn/ide/base/gui/Application.java
index a43aceae..f26c6082 100644
--- a/com.wudsn.ide.base/src/com/wudsn/ide/base/gui/Application.java
+++ b/com.wudsn.ide.base/src/com/wudsn/ide/base/gui/Application.java
@@ -19,8 +19,6 @@
 
 package com.wudsn.ide.base.gui;
 
-import com.wudsn.ide.base.gui.MessageManager;
-
 /**
  * Interface to be implemented by applications.
  * 
diff --git a/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorClipboardCommandHandler.java b/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorClipboardCommandHandler.java
index 32d55829..a824d461 100644
--- a/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorClipboardCommandHandler.java
+++ b/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorClipboardCommandHandler.java
@@ -27,7 +27,6 @@ import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.ui.IWorkbenchSite;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import com.wudsn.ide.hex.Texts;
 import com.wudsn.ide.base.common.HexUtility;
 import com.wudsn.ide.base.common.NumberUtility;
 
diff --git a/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorFonts.java b/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorFonts.java
index 5572f9c3..6539ad7a 100644
--- a/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorFonts.java
+++ b/com.wudsn.ide.hex/src/com/wudsn/ide/hex/HexEditorFonts.java
@@ -10,6 +10,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
 
 final class HexEditorFonts {
 
@@ -21,7 +22,7 @@ final class HexEditorFonts {
     }
 
     public void init() {
-	Display display = HexPlugin.getInstance().getWorkbench().getDisplay();
+	Display display = PlatformUI.getWorkbench().getDisplay();
 
 	// From http://members.bitstream.net/~marksim/atarimac/fonts.html
 	atari8Font = loadFont(display, "fonts/atari8/ATARCC__.TTF", "");
diff --git a/com.wudsn.ide.snd/src/resid_builder/resid/Voice.java b/com.wudsn.ide.snd/src/resid_builder/resid/Voice.java
index 25ae3e30..7b1c1e74 100644
--- a/com.wudsn.ide.snd/src/resid_builder/resid/Voice.java
+++ b/com.wudsn.ide.snd/src/resid_builder/resid/Voice.java
@@ -21,9 +21,6 @@
  */
 package resid_builder.resid;
 
-import resid_builder.resid.EnvelopeGenerator;
-import resid_builder.resid.WaveformGenerator;
-
 /**
  * Representation of SID voice block.
  *