diff --git a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
index 50188f0c8..aea380567 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
@@ -10,8 +10,6 @@
 import java.awt.event.*;
 import java.util.*;
 
-import javax.swing.*;
-
 import org.osgi.framework.*;
 
 import net.java.sip.communicator.impl.gui.*;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
index 33d006683..0ecb0ad38 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
@@ -8,7 +8,6 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.awt.image.*;
 import java.util.*;
 
 import javax.swing.*;
@@ -25,7 +24,6 @@
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.swing.*;
 
 import org.osgi.framework.*;
 
diff --git a/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java b/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java
index cb44a3c3a..7b9a506d5 100644
--- a/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java
+++ b/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java
@@ -6,10 +6,10 @@
  */
 package net.java.sip.communicator.impl.media.transform.zrtp;
 
-import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.impl.media.*;
+//import net.java.sip.communicator.service.resources.*;
+//import net.java.sip.communicator.impl.media.*;
 
-import org.osgi.framework.*;
+//import org.osgi.framework.*;
 
 /**
  * The <tt>Resources</tt> class manages the access to the internationalization
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
index 987493c54..11bde8e30 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.plugin.gibberishaccregwizz;
 
-import java.util.*;
-
 import java.awt.*;
 import javax.swing.*;
 import javax.swing.event.*;
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
index 6185285b7..125dfbf2e 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
@@ -12,8 +12,6 @@
  */
 package net.java.sip.communicator.plugin.sshaccregwizz;
 
-import java.util.*;
-
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
diff --git a/src/net/java/sip/communicator/service/gui/WizardPage.java b/src/net/java/sip/communicator/service/gui/WizardPage.java
index 84d928527..ac6ec3c29 100644
--- a/src/net/java/sip/communicator/service/gui/WizardPage.java
+++ b/src/net/java/sip/communicator/service/gui/WizardPage.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.service.gui;
 
-import net.java.sip.communicator.service.protocol.*;
-
 /**
  * The <tt>WizardPage</tt> represents a page in a <tt>WizardContainer</tt>.
  * A page has a unique identifier. Each page should specify the identifier