diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFileInPlaceAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFileInPlaceAction.java
index 073e5a85a77..ad0ed065695 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFileInPlaceAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFileInPlaceAction.java
@@ -19,20 +19,15 @@ package org.eclipse.rse.files.ui.actions;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.files.ui.resources.ISystemRemoteEditConstants;
 import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
-import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.swt.widgets.Shell;
 
 
-public class SystemEditFileInPlaceAction extends SystemBaseAction implements ISystemRemoteEditConstants {
-
-
-
-	private RSEUIPlugin plugin;
-	
+public class SystemEditFileInPlaceAction extends SystemBaseAction
+{
+	//private RSEUIPlugin plugin;
 	
 	/**
 	 * Constructor for SystemEditFileAction
@@ -53,7 +48,7 @@ public class SystemEditFileInPlaceAction extends SystemBaseAction implements ISy
 		// had to add it in the group in the adapter
 		// setContextMenuGroup(ISystemContextMenuConstants.GROUP_OPENWITH);
 		
-		plugin = RSEUIPlugin.getDefault();
+		//plugin = RSEUIPlugin.getDefault();
 	}
 
 	
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFilePlatformAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFilePlatformAction.java
index 85978203232..9dba3525d47 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFilePlatformAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFilePlatformAction.java
@@ -19,20 +19,15 @@ package org.eclipse.rse.files.ui.actions;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.SystemBasePlugin;
-import org.eclipse.rse.files.ui.resources.ISystemRemoteEditConstants;
 import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
-import org.eclipse.rse.ui.RSEUIPlugin;
 import org.eclipse.rse.ui.actions.SystemBaseAction;
 import org.eclipse.swt.widgets.Shell;
 
 
-public class SystemEditFilePlatformAction extends SystemBaseAction implements ISystemRemoteEditConstants {
-
-
-
-	private RSEUIPlugin plugin;
-	
+public class SystemEditFilePlatformAction extends SystemBaseAction
+{
+	//private RSEUIPlugin plugin;
 	
 	/**
 	 * Constructor for SystemEditFileAction
@@ -53,7 +48,7 @@ public class SystemEditFilePlatformAction extends SystemBaseAction implements IS
 		// had to add it in the group in the adapter
 		// setContextMenuGroup(ISystemContextMenuConstants.GROUP_OPENWITH);
 		
-		plugin = RSEUIPlugin.getDefault();
+		//plugin = RSEUIPlugin.getDefault();
 	}
 
 	
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandEditor.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandEditor.java
index a250b93abdb..d80e3da22f5 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandEditor.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandEditor.java
@@ -159,8 +159,9 @@ public class SystemCommandEditor extends SourceViewer
 							doOperation(ISourceViewer.CONTENTASSIST_PROPOSALS);
 							//e.doit = false;
 							break;
+
+						case 'z' - 'a' + 1 :
 							// CTRL-Z
-						case (int) 'z' - (int) 'a' + 1 :
 							doOperation(ITextOperationTarget.UNDO);
 							//e.doit = false;
 							break;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java
index 034943bc245..e6e6d8dd6c3 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.java
@@ -60,7 +60,7 @@ public class SystemDeleteDialog extends SystemPromptDialog
     private String warningMessage, warningTip;
     private String promptLabel;
     private SystemDeleteTableProvider sdtp;
-    private Label prompt;
+    //private Label prompt;
     private Table table;
     private TableViewer tableViewer;    
     private GridData tableData;
@@ -103,7 +103,7 @@ public class SystemDeleteDialog extends SystemPromptDialog
 	 */
 	protected ISystemMessageLine createMessageLine(Composite c)
 	{
-		ISystemMessageLine msgLine = super.createMessageLine(c);
+		/*ISystemMessageLine msgLine =*/ super.createMessageLine(c);
 		return fMessageLine;
 	}
 	
@@ -150,19 +150,19 @@ public class SystemDeleteDialog extends SystemPromptDialog
         		int size = ((IStructuredSelection)input).size();
         		
         		if (size > 1) {
-        			prompt = SystemWidgetHelpers.createLabel(composite, SystemResources.RESID_DELETE_PROMPT, nbrColumns);
+        			/*prompt =*/ SystemWidgetHelpers.createLabel(composite, SystemResources.RESID_DELETE_PROMPT, nbrColumns);
         		}
         		else {
-        			prompt = SystemWidgetHelpers.createLabel(composite, SystemResources.RESID_DELETE_PROMPT_SINGLE, nbrColumns);
+        			/*prompt =*/ SystemWidgetHelpers.createLabel(composite, SystemResources.RESID_DELETE_PROMPT_SINGLE, nbrColumns);
         		}
         	}
         	// should never get here
         	else {
-        		prompt = SystemWidgetHelpers.createLabel(composite, SystemResources.RESID_DELETE_PROMPT, nbrColumns);       		
+        		/*prompt =*/ SystemWidgetHelpers.createLabel(composite, SystemResources.RESID_DELETE_PROMPT, nbrColumns);       		
         	}
         }
 		else {
-			prompt = SystemWidgetHelpers.createVerbiage(composite, promptLabel, nbrColumns, false, 200);
+			/*prompt =*/ SystemWidgetHelpers.createVerbiage(composite, promptLabel, nbrColumns, false, 200);
 		}
 
         // WARNING
@@ -186,7 +186,9 @@ public class SystemDeleteDialog extends SystemPromptDialog
           if (warningTip != null)
           {
           	warningLabel.setToolTipText(warningTip);
-          	imageLabel.setToolTipText(warningTip);
+          	if (imageLabel!=null) {
+              	imageLabel.setToolTipText(warningTip);
+          	}
           }
           // filler line
           SystemWidgetHelpers.createLabel(composite, "", nbrColumns);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java
index b1295419bc0..4a535ff325f 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java
@@ -35,7 +35,7 @@ import org.eclipse.rse.ui.SystemResources;
 public class RSENewConnectionWizard extends AbstractSystemWizard implements IRSENewConnectionWizard {
 	
 	private HashMap map;
-	private IRSESystemType systemType;
+	//private IRSESystemType systemType;
 	private IRSENewConnectionWizardDelegate delegate;
 	private RSENewConnectionWizardMainPage mainPage;
 	private IRSESystemType[] restrictedSystemTypes;
@@ -80,7 +80,7 @@ public class RSENewConnectionWizard extends AbstractSystemWizard implements IRSE
 	 * @see org.eclipse.rse.ui.wizards.IRSENewConnectionWizard#setSelectedSystemType(org.eclipse.rse.core.IRSESystemType)
 	 */
 	public void setSelectedSystemType(IRSESystemType systemType) {
-		this.systemType = systemType;
+		//this.systemType = systemType;
 		setDelegate(systemType);
 	}