diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java
index a8bebf51032..1df140072af 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/PasswordPersistenceManager.java
@@ -543,11 +543,6 @@ public class PasswordPersistenceManager {
 	 */
 	public boolean isUserIDCaseSensitive(String systemType)
 	{
-		if (DEFAULT_SYSTEM_TYPE.equals(systemType))
-		{
-			systemType = RSEPreferencesManager.getSystemType();
-		}
-	
 		// First find the correct provider
 		for (int i = 0; i < systemTypes.length; i++)
 		{			
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java
index e78efc1049c..a05c477c98c 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/RSEPreferencesManager.java
@@ -40,10 +40,6 @@ public class RSEPreferencesManager {
 	 * The default value for the list of active user profiles. Value is "Team".
 	 */
 	private static final String DEFAULT_ACTIVEUSERPROFILES = "Team"; //$NON-NLS-1$
-	/**
-	 * The default value for the default system type. Value is "".
-	 */
-	private static final String DEFAULT_SYSTEMTYPE = ""; //$NON-NLS-1$
 
 	/**
 	 * @return the Hashtable where the key is a string identifying a particular object, and 
@@ -207,25 +203,6 @@ public class RSEPreferencesManager {
 		}
 	}
 
-	/**
-	 * @return the system type to default when no explicit system type is available.
-	 */
-	public static String getSystemType() {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		String result = store.getString(IRSEPreferenceNames.SYSTEMTYPE);
-		return result;
-	}
-
-	/**
-	 * Sets the system type to default when no explicit system type is available.
-	 * @param systemType the string giving the system type name.
-	 */
-	public static void setSystemType(String systemType) {
-		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		store.setValue(IRSEPreferenceNames.SYSTEMTYPE, systemType);
-		savePreferences();
-	}
-
 	/**
 	 * Sets if a system type is enabled.
 	 * @param systemType the system type to be enabled on this machine.
@@ -360,7 +337,6 @@ public class RSEPreferencesManager {
 		String userProfileName = getDefaultPrivateSystemProfileName();
 		defaultProfileNames += ";" + userProfileName; //$NON-NLS-1$
 		Preferences store = RSECorePlugin.getDefault().getPluginPreferences();
-		store.setDefault(IRSEPreferenceNames.SYSTEMTYPE, RSEPreferencesManager.DEFAULT_SYSTEMTYPE);
 		store.setDefault(IRSEPreferenceNames.ACTIVEUSERPROFILES, defaultProfileNames);
 		store.setDefault(IRSEPreferenceNames.USE_DEFERRED_QUERIES, RSEPreferencesManager.DEFAULT_USE_DEFERRED_QUERIES);
 		savePreferences();
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/RemoteSystemsPreferencePage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/RemoteSystemsPreferencePage.java
index 005d731a80d..08a28e14dd5 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/RemoteSystemsPreferencePage.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/propertypages/RemoteSystemsPreferencePage.java
@@ -98,22 +98,6 @@ public class RemoteSystemsPreferencePage
 	{
 		IPreferenceStore coreStore = new PreferencesMapper(RSECorePlugin.getDefault().getPluginPreferences());
 
-		List systemTypeLabels = new ArrayList();
-		IRSESystemType[] systemTypes = RSECorePlugin.getDefault().getRegistry().getSystemTypes();
-		for (int i = 0; i < systemTypes.length; i++) systemTypeLabels.add(systemTypes[i].getLabel());
-
-		// DEFAULT SYSTEM TYPE		
-		SystemComboBoxFieldEditor systemTypeEditor = new SystemComboBoxFieldEditor(
-			IRSEPreferenceNames.SYSTEMTYPE,
-			SystemResources.RESID_PREF_SYSTEMTYPE_PREFIX_LABEL,
-			(String[])systemTypeLabels.toArray(new String[systemTypeLabels.size()]),
-			true, // readonly
-			getFieldEditorParent()
-		);
-		systemTypeEditor.setPreferenceStore(coreStore);
-		systemTypeEditor.setToolTipText(SystemResources.RESID_PREF_SYSTEMTYPE_PREFIX_TOOLTIP);
-		addField(systemTypeEditor);
-
         // ENABLED STATE AND DEFAULT USERID PER SYSTEM TYPE 
         systemTypesEditor = new SystemTypeFieldEditor(
             ISystemPreferencesConstants.SYSTEMTYPE_VALUES,
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java
index d5b76a9ac0b..e03aee3a028 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemConnectionForm.java
@@ -634,9 +634,8 @@ public class SystemConnectionForm implements Listener, SelectionListener, Runnab
 		labelHostName.setToolTipText(SystemResources.RESID_CONNECTION_HOSTNAME_TIP);
 
 		if (!updateMode && (defaultSystemType == null)) {
-			defaultSystemType = RSEPreferencesManager.getSystemType();
-			if ((defaultSystemType == null) || (defaultSystemType.length() == 0))
-				defaultSystemType = lastSystemType;
+			defaultSystemType = lastSystemType;
+			
 			if ((defaultSystemType == null) || (defaultSystemType.length() == 0))
 				defaultSystemType = textSystemType.getItem(0);
 		}
@@ -900,9 +899,7 @@ public class SystemConnectionForm implements Listener, SelectionListener, Runnab
 		// ...selectable:
 		else {
 			if (defaultSystemType == null) {
-				defaultSystemType = RSEPreferencesManager.getSystemType();
-				if ((defaultSystemType == null) || (defaultSystemType.length() == 0))
-					defaultSystemType = lastSystemType;
+				defaultSystemType = lastSystemType;
 			}
 			if (defaultSystemType != null) {
 				int selIdx = textSystemType.indexOf(defaultSystemType);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemPreferencesManager.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemPreferencesManager.java
index 969260fdd55..682a16a5b3b 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemPreferencesManager.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemPreferencesManager.java
@@ -50,8 +50,7 @@ public class SystemPreferencesManager {
 
 	private static void migrateCorePreferences() {
 		String[] keys = {
-				IRSEPreferenceNames.ACTIVEUSERPROFILES, 
-				IRSEPreferenceNames.SYSTEMTYPE, 
+				IRSEPreferenceNames.ACTIVEUSERPROFILES,  
 				IRSEPreferenceNames.USE_DEFERRED_QUERIES, 
 				IRSEPreferenceNames.USERIDPERKEY
 		};