diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicConnectorService.java
index a0a8c885eaa..7bbd56b088a 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicConnectorService.java
@@ -47,11 +47,10 @@ import org.eclipse.rse.core.model.IHost;
  * 
  * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager
  */
-public abstract class BasicConnectorService extends AuthenticatingConnectorService {
+public abstract class BasicConnectorService extends SuperAbstractConnectorService {
 	
 	public BasicConnectorService(String name, String description, IHost host, int port) {
 		super(name, description, host, port);
-		setCredentialsProvider(new BasicCredentialsProvider(this));
 	}
 	
 	public boolean supportsPassword() {
@@ -70,4 +69,57 @@ public abstract class BasicConnectorService extends AuthenticatingConnectorServi
 		return false;
 	}
 	
+	public void acquireCredentials(boolean refresh) throws InterruptedException {
+	}
+	
+	public void clearCredentials() {
+	}
+	
+	public void clearPassword(boolean persist, boolean propagate) {
+	}
+	
+	public String getUserId() {
+		return null;
+	}
+	
+	public boolean hasPassword(boolean onDisk) {
+		return false;
+	}
+	
+	public boolean inheritsCredentials() {
+		return false;
+	}
+	
+	public boolean isSuppressed() {
+		return false;
+	}
+	
+	protected void postDisconnect() {
+	}
+	
+	public void removePassword() {
+	}
+	
+	public void removeUserId() {
+	}
+	
+	public void savePassword() {
+	}
+	
+	public void saveUserId() {
+	}
+	
+	public void setPassword(String matchingUserId, String password, boolean persist, boolean propagate) {
+	}
+	
+	public boolean sharesCredentials() {
+		return false;
+	}
+
+	public void setSuppressed(boolean suppress) {
+	}
+
+	public void setUserId(String userId) {
+	}
+	
 }
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicCredentialsProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicCredentialsProvider.java
deleted file mode 100644
index b674121ada7..00000000000
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/BasicCredentialsProvider.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/********************************************************************************
- * Copyright (c) 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
- * 
- * Contributors:
- * David Dykstal (IBM) - 168977: refactoring IConnectorService
- ********************************************************************************/
-package org.eclipse.rse.core.subsystems;
-
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-
-/**
- * The {@link BasicCredentialsProvider} provides a simple implementation of the {@link ICredentialsProvider}
- * interface. It is suitable for use with a connector service that needs to provide
- * no special authentication to connect to its target system.
- * <p>
- * This class is not meant to be subclassed.
- */
-public class BasicCredentialsProvider extends AbstractCredentialsProvider {
-	
-	public BasicCredentialsProvider(IConnectorService connectorService) {
-		super(connectorService);
-	}
-	
-	public void acquireCredentials(boolean reacquire) {
-	}
-
-	public void clearCredentials() {
-	}
-
-	public void clearPassword() {
-	}
-
-	public ICredentials getCredentials() {
-		return null;
-	}
-
-	public String getUserId() {
-		return null;
-	}
-
-	public void repairCredentials(SystemMessage message) throws InterruptedException {
-	}
-
-	public void setPassword(String password) {
-	}
-
-	public void setUserId(String userId) {
-	}
-
-}