diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityProperties.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityProperties.java
index b6e4c645e11..3f2a25ae415 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityProperties.java
+++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/UniversalSecurityProperties.java
@@ -51,10 +51,10 @@ public class UniversalSecurityProperties extends NLS
 	public static String RESID_SECURITY_ADD_LBL;
 	public static String RESID_SECURITY_REMOVE_LBL;
 	public static String RESID_SECURITY_RENAME_LBL;
-	public static String RESID_SECURITY_PREF_ALIAS_NAME;;
-	public static String RESID_SECURITY_PREF_ISSUED_TO;;
-	public static String RESID_SECURITY_PREF_ISSUED_FROM;;
-	public static String RESID_SECURITY_PREF_EXPIRES;;
+	public static String RESID_SECURITY_PREF_ALIAS_NAME;
+	public static String RESID_SECURITY_PREF_ISSUED_TO;
+	public static String RESID_SECURITY_PREF_ISSUED_FROM;
+	public static String RESID_SECURITY_PREF_EXPIRES;
 
 	public static String RESID_SECURITY_KEY_IO_ERROR_;
 	public static String RESID_SECURITY_KEY_LOAD_ERROR_;
@@ -92,4 +92,4 @@ public class UniversalSecurityProperties extends NLS
 		initializeMessages(BUNDLE_NAME, UniversalSecurityProperties.class);
 	}
 	
-};
\ No newline at end of file
+}
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableContentProvider.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableContentProvider.java
index 39615349769..a9da625fd36 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableContentProvider.java
+++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableContentProvider.java
@@ -17,7 +17,6 @@
 package org.eclipse.rse.dstore.security.preference;
 import java.util.ArrayList;
 
-import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java
index 52b1135de8c..ee3b6bab443 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java
+++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/preference/CertTableSorter.java
@@ -69,7 +69,7 @@ extends ViewerSorter
 
 				if(currentColumn >= 0)
 				{
-					TableColumn currentTableColumn = (TableColumn)tableViewer.getTable().getColumn(currentColumn);
+					TableColumn currentTableColumn = tableViewer.getTable().getColumn(currentColumn);
 					if(addDirectionSymbol && (currentTableColumn != null))
 					{
 						text = currentTableColumn.getText();
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java
index 68fae1bd150..b3685def2b0 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java
+++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizard.java
@@ -21,18 +21,15 @@ import java.security.cert.X509Certificate;
 import java.util.List;
 
 import org.eclipse.dstore.core.util.ssl.DStoreKeyStore;
-import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.rse.core.SystemBasePlugin;
 import org.eclipse.rse.core.comm.ISystemKeystoreProvider;
 import org.eclipse.rse.dstore.security.ImageRegistry;
 import org.eclipse.rse.dstore.security.UniversalSecurityProperties;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.wizards.AbstractSystemWizard;
 
 public class SystemImportCertWizard 
                   extends AbstractSystemWizard 
-                  implements  ISystemMessages 
 {	
 	
 	private SystemImportCertWizardMainPage  _mainPage;
@@ -60,10 +57,10 @@ public class SystemImportCertWizard
 	{
 	   try {
 	      _mainPage = createMainPage();	        
-	      addPage((WizardPage)_mainPage);
+	      addPage(_mainPage);
 		  
 		  _aliasPage = createAliasPage();
-		  addPage((WizardPage)_aliasPage);
+		  addPage(_aliasPage);
 	      //super.addPages();
 	   } catch (Exception exc)
 	   {
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java
index 899143ac717..40805021d7f 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java
+++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardAliasPage.java
@@ -27,7 +27,6 @@ import org.eclipse.rse.dstore.security.UniversalSecurityPlugin;
 import org.eclipse.rse.dstore.security.UniversalSecurityProperties;
 import org.eclipse.rse.dstore.security.preference.X509CertificateElement;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.validators.ISystemValidator;
@@ -44,7 +43,6 @@ import org.eclipse.swt.widgets.Text;
 
 public class SystemImportCertWizardAliasPage 
  	   extends AbstractSystemWizardPage
- 	   implements  ISystemMessages        
 {  
 
 
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java
index 38c8a267118..f7926c354bf 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java
+++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java
@@ -31,7 +31,6 @@ import org.eclipse.rse.dstore.security.preference.X509CertificateElement;
 import org.eclipse.rse.dstore.security.preference.X509CertificatePropertiesDialog;
 import org.eclipse.rse.dstore.security.util.GridUtil;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.ui.ISystemMessages;
 import org.eclipse.rse.ui.SystemWidgetHelpers;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
 import org.eclipse.rse.ui.validators.ISystemValidator;
@@ -50,10 +49,8 @@ import org.eclipse.swt.widgets.TableColumn;
 
 public class SystemImportCertWizardMainPage 
  	   extends AbstractSystemWizardPage
- 	   implements  ISystemMessages, Listener        
+ 	   implements  Listener        
 {  
-
-
 	protected SystemMessage errorMessage;
 	protected ISystemValidator nameValidator;
 	protected ISystemMessageLine msgLine;