diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html
index b4c8ac4444a..bdcb1b47afc 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html
+++ b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html
@@ -21,7 +21,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;</strong>
 import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
 <strong>import org.eclipse.rse.filters.ISystemFilterPool;
 import org.eclipse.rse.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.internal.filters.SystemFilter;
+import org.eclipse.rse.filters.ISystemFilter;
 import org.eclipse.rse.model.IHost;</strong>
 
 <strong>import samples.RSESamplesPlugin;</strong>
@@ -77,7 +77,7 @@ public class DeveloperSubSystemConfiguration extends SubSystemConfiguration {
 	 *
 	 * Requires this line in rseSamplesResources.properties: property.type.teamfilter=Team filter
 	 */
-	<strong>public String getTranslatedFilterTypeProperty(SystemFilter selectedFilter)
+	<strong>public String getTranslatedFilterTypeProperty(ISystemFilter selectedFilter)
 	{
 	   	return RSESamplesPlugin.getResourceString("property.type.teamfilter");
 	}</strong>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html
index 07336a81f12..f87f368e612 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html
+++ b/rse/doc/org.eclipse.rse.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html
@@ -22,7 +22,7 @@ import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
 import org.eclipse.rse.filters.ISystemFilter;
 import org.eclipse.rse.filters.ISystemFilterPool;
 import org.eclipse.rse.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.internal.filters.SystemFilter;
+import org.eclipse.rse.filters.ISystemFilter;
 import org.eclipse.rse.model.IHost;
 
 import samples.RSESamplesPlugin;
@@ -81,7 +81,7 @@ public class DeveloperSubSystemConfiguration extends SubSystemConfiguration {
 	 *
 	 * Requires this line in rseSamplesResources.properties: property.type.teamfilter=Team filter
 	 */
-	public String getTranslatedFilterTypeProperty(SystemFilter selectedFilter)
+	public String getTranslatedFilterTypeProperty(ISystemFilter selectedFilter)
 	{
 	   	<strong>String type = selectedFilter.getType();
 	   	if (type == null)
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java
index 4b2aea55aaf..52763278420 100644
--- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java
+++ b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfiguration.java
@@ -24,7 +24,6 @@ import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
 import org.eclipse.rse.filters.ISystemFilter;
 import org.eclipse.rse.filters.ISystemFilterPool;
 import org.eclipse.rse.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.internal.filters.SystemFilter;
 import org.eclipse.rse.model.IHost;
 
 import samples.RSESamplesPlugin;
@@ -86,7 +85,7 @@ public class DeveloperSubSystemConfiguration extends SubSystemConfiguration {
 	 *
 	 * Requires this line in rseSamplesResources.properties: property.type.teamfilter=Team filter
 	 */
-	public String getTranslatedFilterTypeProperty(SystemFilter selectedFilter)
+	public String getTranslatedFilterTypeProperty(ISystemFilter selectedFilter)
 	{
 		//--tutorial part 1
 	   	//return RSESamplesPlugin.getResourceString("property.type.teamfilter"); //$NON-NLS-1$
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java
index 56851b921b6..a206fb79923 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java
@@ -23,7 +23,6 @@ import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -261,7 +260,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 		return super.performOk();
 	}
 
-	public class ClearTempFilesRunnable implements IRunnableWithProgress
+	private class ClearTempFilesRunnable implements IRunnableWithProgress
 	{
 		public void run(IProgressMonitor monitor)
 		{
@@ -277,7 +276,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
 			{
 				try
 				{
-					IWorkspace workspace = SystemBasePlugin.getWorkspace();
+//					IWorkspace workspace = SystemBasePlugin.getWorkspace();
 					IResource[] members = tempFiles.members();
 					if (members != null)
 					{
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubsystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubsystemConfigurationAdapter.java
index 1a216382441..5f5e943a9a8 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubsystemConfigurationAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubsystemConfigurationAdapter.java
@@ -39,7 +39,10 @@ import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Shell;
 
-
+/**
+ * Defines the interface that must be implemented for adapters of for subsystem configurations.
+ * This adapter is used when creating wizard pages for new connections.
+ */
 public interface ISubsystemConfigurationAdapter
 {	
 	
diff --git a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java
index 33697fc1de7..c02a6c5d778 100644
--- a/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/PasswordPersistenceManager.java
@@ -81,7 +81,7 @@ public class PasswordPersistenceManager {
 	/**
 	 * Inner class used for storing registered system types 
 	 */
-	protected class RegisteredSystemType
+	private class RegisteredSystemType
 	{
 		private String _systemType;
 		private boolean _userIDCaseSensitive;