diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 0ecc777b87e..35311dc9f15 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-04 Mikhail Khodjaiants
+	Removed "Refresh" and "Auto-Refresh" actions support for registers.
+	* ICDebugConstants.java
+	* ICRegisterManager.java
+	* CRegisterManager.java
+
 2004-11-04 Mikhail Khodjaiants
 	No need of "ICSignalManager".
 	* ICSignalManager.java: removed
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConstants.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConstants.java
index fb2a3fa429e..175b42d3a69 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConstants.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDebugConstants.java
@@ -44,12 +44,6 @@ public interface ICDebugConstants
 	 */
 	public static final String PREF_SHARED_LIBRARIES_AUTO_REFRESH = PLUGIN_ID + "SharedLibraries.auto_refresh"; //$NON-NLS-1$
 
-	/**
-	 * Boolean preference controlling whether the register manager will be
-	 * refreshed every time when the execution of program stops.
-	 */
-	public static final String PREF_REGISTERS_AUTO_REFRESH = PLUGIN_ID + "Registers.auto_refresh"; //$NON-NLS-1$
-
 	/**
 	 * The identifier of the maximum number of instructions displayed in disassembly. 
 	 */
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICRegisterManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICRegisterManager.java
index a12eab473be..aa029e8fff3 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICRegisterManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICRegisterManager.java
@@ -16,7 +16,7 @@ import org.eclipse.debug.core.model.IRegisterGroup;
 /**
  * Provides the access to the register groups' management functions.
  */
-public interface ICRegisterManager extends ICUpdateManager, IAdaptable {
+public interface ICRegisterManager extends IAdaptable {
 
 	void addRegisterGroup( IRegisterGroup group );
 
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java
index cc7d59f0475..9a9cf6bdcfe 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java
@@ -14,10 +14,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import org.eclipse.cdt.debug.core.CDebugCorePlugin;
-import org.eclipse.cdt.debug.core.ICDebugConstants;
 import org.eclipse.cdt.debug.core.ICRegisterManager;
 import org.eclipse.cdt.debug.core.cdi.CDIException;
-import org.eclipse.cdt.debug.core.cdi.ICDIManager;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIRegisterGroup;
 import org.eclipse.cdt.debug.internal.core.model.CDebugTarget;
 import org.eclipse.cdt.debug.internal.core.model.CRegisterGroup;
@@ -28,7 +26,12 @@ import org.eclipse.debug.core.model.IRegisterGroup;
 /**
  * Manages all register groups in a debug target.
  */
-public class CRegisterManager extends CUpdateManager implements ICRegisterManager {
+public class CRegisterManager implements ICRegisterManager {
+
+	/**
+	 * The debug target associated with this manager.
+	 */
+	private CDebugTarget fDebugTarget;
 
 	/**
 	 * Collection of register groups added to this target. Values are of type <code>CRegisterGroup</code>.
@@ -44,7 +47,7 @@ public class CRegisterManager extends CUpdateManager implements ICRegisterManage
 	 * Constructor for CRegisterManager. 
 	 */
 	public CRegisterManager( CDebugTarget target ) {
-		super( target );
+		fDebugTarget = target;
 	}
 
 	/* (non-Javadoc)
@@ -55,13 +58,12 @@ public class CRegisterManager extends CUpdateManager implements ICRegisterManage
 			return this;
 		if ( CRegisterManager.class.equals( adapter ) )
 			return this;
-		return super.getAdapter( adapter );
+		return null;
 	}
 
 	public void dispose() {
 		setStackFrame( null );
 		removeAllRegisterGroups();
-		super.dispose();
 	}
 
 	/* (non-Javadoc)
@@ -77,11 +79,7 @@ public class CRegisterManager extends CUpdateManager implements ICRegisterManage
 	}
 
 	public void initialize() {
-		fRegisterGroups = new ArrayList( 20 );
-		boolean autoRefresh = CDebugCorePlugin.getDefault().getPluginPreferences().getBoolean( ICDebugConstants.PREF_REGISTERS_AUTO_REFRESH );
-		if ( getCDIManager() != null )
-			getCDIManager().setAutoUpdate( autoRefresh );
-		createMainRegisterGroup();
+		createRegisterGroups();
 	}
 
 	/* (non-Javadoc)
@@ -102,6 +100,11 @@ public class CRegisterManager extends CUpdateManager implements ICRegisterManage
 		fRegisterGroups.remove( group );
 	}
 
+	private void createRegisterGroups() {
+		fRegisterGroups = new ArrayList( 20 );
+		createMainRegisterGroup();
+	}
+
 	private void createMainRegisterGroup() {
 		ICDIRegisterGroup[] groups = null;
 		try {
@@ -115,10 +118,6 @@ public class CRegisterManager extends CUpdateManager implements ICRegisterManage
 		}
 	}
 
-	protected ICDIManager getCDIManager() {
-		return null;
-	}
-
 	public void targetSuspended() {
 		Iterator it = fRegisterGroups.iterator();
 		while( it.hasNext() ) {
@@ -133,4 +132,8 @@ public class CRegisterManager extends CUpdateManager implements ICRegisterManage
 	private void setStackFrame( CStackFrame stackFrame ) {
 		fStackFrame = stackFrame;
 	}
+
+	protected CDebugTarget getDebugTarget() {
+		return fDebugTarget;
+	}
 }