diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalView.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalView.java
index 38cfea804a0..e3d7cecb54e 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalView.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/terminal/internal/view/TerminalView.java
@@ -19,17 +19,14 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.events.MenuEvent;
 import org.eclipse.swt.events.MenuListener;
-import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Menu;
@@ -38,6 +35,9 @@ import org.eclipse.tm.terminal.ITerminalConnector;
 import org.eclipse.tm.terminal.Logger;
 import org.eclipse.tm.terminal.TerminalConnectorExtension;
 import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.terminal.control.ITerminalListener;
+import org.eclipse.tm.terminal.control.ITerminalViewControl;
+import org.eclipse.tm.terminal.control.TerminalViewControlFactory;
 import org.eclipse.tm.terminal.internal.actions.TerminalAction;
 import org.eclipse.tm.terminal.internal.actions.TerminalActionClearAll;
 import org.eclipse.tm.terminal.internal.actions.TerminalActionConnect;
@@ -49,7 +49,6 @@ import org.eclipse.tm.terminal.internal.actions.TerminalActionPaste;
 import org.eclipse.tm.terminal.internal.actions.TerminalActionSelectAll;
 import org.eclipse.tm.terminal.internal.actions.TerminalActionSettings;
 import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IViewSite;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.IWorkbenchPage;
@@ -60,9 +59,6 @@ import org.eclipse.ui.contexts.IContextActivation;
 import org.eclipse.ui.contexts.IContextService;
 import org.eclipse.ui.internal.WorkbenchWindow;
 import org.eclipse.ui.part.ViewPart;
-import org.eclipse.tm.terminal.control.ITerminalListener;
-import org.eclipse.tm.terminal.control.ITerminalViewControl;
-import org.eclipse.tm.terminal.control.TerminalViewControlFactory;
 
 public class TerminalView extends ViewPart implements ITerminalView, ITerminalListener {
     public static final String  FONT_DEFINITION = "terminal.views.view.font.definition"; //$NON-NLS-1$
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalViewControl.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalViewControl.java
index 5a8b4f6e5e8..77f4e9955c4 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalViewControl.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/control/ITerminalViewControl.java
@@ -12,9 +12,9 @@
 package org.eclipse.tm.terminal.control;
 
 import org.eclipse.swt.custom.StyledText;
-import org.eclipse.tm.terminal.TerminalState;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.tm.terminal.ITerminalConnector;
+import org.eclipse.tm.terminal.TerminalState;
 
 /**
  * @author Michael Scharf
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalControl.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalControl.java
index 99c34f68402..4c743ffc798 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalControl.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalControl.java
@@ -45,12 +45,12 @@ import org.eclipse.tm.terminal.ITerminalConnector;
 import org.eclipse.tm.terminal.ITerminalControl;
 import org.eclipse.tm.terminal.Logger;
 import org.eclipse.tm.terminal.TerminalState;
+import org.eclipse.tm.terminal.control.ITerminalListener;
+import org.eclipse.tm.terminal.control.ITerminalViewControl;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.contexts.IContextActivation;
 import org.eclipse.ui.contexts.IContextService;
 import org.eclipse.ui.keys.IBindingService;
-import org.eclipse.tm.terminal.control.ITerminalListener;
-import org.eclipse.tm.terminal.control.ITerminalViewControl;
 
 /**
  *
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalText.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalText.java
index e32ed244347..e946bc2bafa 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalText.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/terminal/internal/control/TerminalText.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.core.runtime.Preferences;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyleRange;
 import org.eclipse.swt.custom.StyledText;