diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml b/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml
index dbf8b2677fd..d654957fa42 100644
--- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2006 IBM Corporation. All rights reserved.
+Copyright (c) 2006, 2007 IBM Corporation. All rights reserved.
 This program and the accompanying materials are made available under the terms
 of the Eclipse Public License v1.0 which accompanies this distribution, and is 
 available at http://www.eclipse.org/legal/epl-v10.html
@@ -32,48 +32,6 @@ Contributors:
        label="RSE">
       </filesystemContributor>
    </extension>
-   
-   <!--
-   <extension
-         id="org.eclipse.rse.eclipse.filesystem"
-         point="org.eclipse.core.filesystem.filesystems">
-      <filesystem scheme="rse">
-         <run class="org.eclipse.rse.eclipse.filesystem.SSHFileSystem"/>
-      </filesystem>
-   </extension>
-   <extension
-         id="org.eclipse.rse.eclipse.filesystemSupport"
-         point="org.eclipse.ui.ide.filesystemSupport">
-      <filesystemContributor 
-       scheme="rse"
-       class="org.eclipse.rse.eclipse.filesystem.SSHFileSystemContributor"
-       label="RSE">
-      </filesystemContributor>
-   </extension>
-   -->
-   
-   <!-- remote eclipse filesystem not properly supported yet-->
-   <!--
-      <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution  
-      		adaptable="false" 
-   			id="org.eclipse.rse.eclipse.filesystem.createproject.">
-            <visibility> 
-                <objectClass name="org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile"/>   
-            </visibility>
-            
-         <action
-               label="Create Remote Project"
-               tooltip="%ImportToProject.tooltip"
-               class="org.eclipse.rse.eclipse.filesystem.ui.actions.CreateRemoteProjectActionDelegate"
-               menubarPath="group.importexport"
-               enablesFor="1"
-               id="importToProject">
-         </action>
-       </objectContribution>
-      </extension>
-      -->
       
       <extension point="org.eclipse.ui.popupMenus">
 	      <objectContribution
@@ -92,7 +50,5 @@ Contributors:
          </action>
       </objectContribution>
       </extension>
-      
-      
- <!--  -->     
-</plugin>
+    
+</plugin>
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java b/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java
index b6e3b151f98..4c2c519084c 100644
--- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java
+++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/src/org/eclipse/rse/eclipse/filesystem/RSEFileStoreRemoteFileWrapper.java
@@ -19,9 +19,6 @@ package org.eclipse.rse.eclipse.filesystem;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -33,11 +30,9 @@ import org.eclipse.core.filesystem.IFileInfo;
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.filesystem.provider.FileInfo;
 import org.eclipse.core.filesystem.provider.FileStore;
-import org.eclipse.core.internal.filesystem.Messages;
 import org.eclipse.core.internal.filesystem.Policy;
 import org.eclipse.core.internal.resources.ModelObjectWriter;
 import org.eclipse.core.internal.resources.ProjectDescription;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -47,17 +42,13 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.rse.core.subsystems.RemoteChildrenContentsType;
-import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
-import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
 import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSystem;
 import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
-import org.eclipse.rse.subsystems.files.core.subsystems.RemoteFileEmpty;
 import org.eclipse.rse.ui.RSEUIPlugin;
 
 
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java
index c1d707fcc14..5b683e04085 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java
+++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/files/SftpFileService.java
@@ -807,7 +807,7 @@ public class SftpFileService extends AbstractFileService implements IFileService
 	}
 
 	/**
-	 * Gets the input stream to access the contents of a remote file. Clients should call {@link #disconnect()} after closing the input stream.
+	 * Gets the input stream to access the contents of a remote file.
 	 * @since 2.0
 	 * @see org.eclipse.rse.services.files.AbstractFileService#getInputStream(IProgressMonitor, String, String, boolean) 
 	 */
@@ -817,8 +817,6 @@ public class SftpFileService extends AbstractFileService implements IFileService
 		
 		try {
 			String remotePath = remoteParent + '/' + remoteFile;
-			int mode = ChannelSftp.OVERWRITE;
-			MyProgressMonitor sftpMonitor = new MyProgressMonitor(monitor);
 			ChannelSftp channel = getChannel("SftpFileService.getInputStream " + remoteFile); //check the session is healthy //$NON-NLS-1$
 			
 			stream = channel.get(remotePath);
@@ -833,7 +831,7 @@ public class SftpFileService extends AbstractFileService implements IFileService
 	}
 
 	/**
-	 * Gets the output stream to write to a remote file. Clients should call {@link #disconnect()} after closing the output stream.
+	 * Gets the output stream to write to a remote file.
 	 * @since 2.0
 	 * @see org.eclipse.rse.services.files.AbstractFileService#getOutputStream(IProgressMonitor, String, String, boolean)
 	 */