diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index f67668a78a8..b0fc9849d5a 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-04 Mikhail Khodjaiants
+	Removed "Refresh" and "Auto-Refresh" actions from the registers view.
+	* AutoRefreshRegistersActionDelegate.java: removed
+	* RefreshRegistersAction.java: removed
+	* CDebugPreferencePage.java
+	* plugin.xml
+	
 2004-10-29 Mikhail Khodjaiants
 	Use the new expression API of CDI.
 	* CDebugUIMessages.properties
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 63b91d5776d..0dbeafebd83 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -721,36 +721,6 @@
             <separator name="refreshGroup"/>
             <separator name="emptyRefreshGroup"/>
          </menu>
-         <action
-               helpContextId="refresh_registers_context"
-               label="%RefreshAction.label"
-               tooltip="%RefreshAction.tooltip"
-               icon="icons/full/elcl16/refresh_co.gif"
-               class="org.eclipse.cdt.debug.internal.ui.actions.RefreshRegistersAction"
-               style="push"
-               menubarPath="refreshGroup"
-               id="org.eclipse.cdt.debug.internal.ui.actions.RefreshRegistersAction">
-            <enablement>
-               <pluginState
-                     value="activated"
-                     id="org.eclipse.cdt.debug.ui"/>
-            </enablement>
-         </action>
-         <action
-               helpContextId="auto_refresh_registers_context"
-               label="%AutoRefreshAction.label"
-               tooltip="%AutoRefreshAction.tooltip"
-               icon="icons/full/elcl16/auto_refresh_co.gif"
-               class="org.eclipse.cdt.debug.internal.ui.actions.AutoRefreshRegistersActionDelegate"
-               style="toggle"
-               menubarPath="refreshGroup"
-               id="org.eclipse.cdt.debug.internal.ui.actions.AutoRefreshRegistersActionDelegate">
-            <enablement>
-               <pluginState
-                     value="activated"
-                     id="org.eclipse.cdt.debug.ui"/>
-            </enablement>
-         </action>
          <action
                label="%DisableVariablesAction.label"
                icon="icons/full/clcl16/disabled_co.gif"
@@ -988,41 +958,6 @@
             <separator name="refreshGroup"/>
             <separator name="emptyRefreshGroup"/>
          </menu>
-         <action
-               helpContextId="refresh_registers_context"
-               disabledIcon="icons/full/dlcl16/refresh_co.gif"
-               hoverIcon="icons/full/clcl16/refresh_co.gif"
-               toolbarPath="refreshGroup"
-               label="%RefreshAction.label"
-               tooltip="%RefreshAction.tooltip"
-               icon="icons/full/elcl16/refresh_co.gif"
-               class="org.eclipse.cdt.debug.internal.ui.actions.RefreshRegistersAction"
-               style="push"
-               id="org.eclipse.cdt.debug.internal.ui.actions.RefreshRegistersAction">
-            <enablement>
-               <pluginState
-                     value="activated"
-                     id="org.eclipse.cdt.debug.ui"/>
-            </enablement>
-         </action>
-         <action
-               helpContextId="auto_refresh_registers_context"
-               disabledIcon="icons/full/dlcl16/auto_refresh_co.gif"
-               hoverIcon="icons/full/clcl16/auto_refresh_co.gif"
-               toolbarPath="refreshGroup"
-               label="%AutoRefreshAction.label"
-               tooltip="%AutoRefreshAction.tooltip"
-               icon="icons/full/elcl16/auto_refresh_co.gif"
-               class="org.eclipse.cdt.debug.internal.ui.actions.AutoRefreshRegistersActionDelegate"
-               style="toggle"
-               state="false"
-               id="org.eclipse.cdt.debug.internal.ui.actions.AutoRefreshRegistersActionDelegate">
-            <enablement>
-               <pluginState
-                     value="activated"
-                     id="org.eclipse.cdt.debug.ui"/>
-            </enablement>
-         </action>
       </viewContribution>
    </extension>
    <extension
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshRegistersActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshRegistersActionDelegate.java
deleted file mode 100644
index c8531ebc6b8..00000000000
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshRegistersActionDelegate.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * QNX Software Systems - Initial API and implementation
- ***********************************************************************/ 
-package org.eclipse.cdt.debug.internal.ui.actions; 
-
-import org.eclipse.cdt.debug.core.ICRegisterManager;
-import org.eclipse.cdt.debug.core.ICUpdateManager;
-import org.eclipse.debug.core.model.IDebugElement;
-
-/**
- * A delegate for the "Auto-Refresh" action of the Registers view.
- */
-public class AutoRefreshRegistersActionDelegate extends AbstractAutoRefreshActionDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractAutoRefreshActionDelegate#getUpdateManager(java.lang.Object)
-	 */
-	protected ICUpdateManager getUpdateManager( Object element ) {
-		if ( element instanceof IDebugElement ) {
-			return (ICUpdateManager)((IDebugElement)element).getDebugTarget().getAdapter( ICRegisterManager.class );
-		}
-		return null;
-	}
-}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RefreshRegistersAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RefreshRegistersAction.java
deleted file mode 100644
index 1dc0bf9fb09..00000000000
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/RefreshRegistersAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * QNX Software Systems - Initial API and implementation
- ***********************************************************************/ 
-package org.eclipse.cdt.debug.internal.ui.actions; 
-
-import org.eclipse.cdt.debug.core.ICRegisterManager;
-import org.eclipse.cdt.debug.core.ICUpdateManager;
-import org.eclipse.debug.core.model.IDebugElement;
- 
-/**
- * The delegate for the "Refresh" action of the Registers view.
- */
-public class RefreshRegistersAction extends AbstractRefreshActionDelegate {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractRefreshActionDelegate#getUpdateManager(java.lang.Object)
-	 */
-	protected ICUpdateManager getUpdateManager( Object element ) {
-		if ( element instanceof IDebugElement ) {
-			return (ICUpdateManager)((IDebugElement)element).getDebugTarget().getAdapter( ICRegisterManager.class );
-		}
-		return null;
-	}
-}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java
index a682195eeb9..44a744f6227 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java
@@ -56,8 +56,6 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr
 	// View setting widgets
 	private Button fPathsButton;
 
-	private Button fRefreshRegistersButton;
-
 	private Button fRefreshSolibsButton;
 
 	private Combo fVariableFormatCombo;
@@ -156,7 +154,6 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr
 	private void setValues() {
 		IPreferenceStore store = getPreferenceStore();
 		fPathsButton.setSelection( store.getBoolean( ICDebugPreferenceConstants.PREF_SHOW_FULL_PATHS ) );
-		fRefreshRegistersButton.setSelection( CDebugCorePlugin.getDefault().getPluginPreferences().getBoolean( ICDebugConstants.PREF_REGISTERS_AUTO_REFRESH ) );
 		fRefreshSolibsButton.setSelection( CDebugCorePlugin.getDefault().getPluginPreferences().getBoolean( ICDebugConstants.PREF_SHARED_LIBRARIES_AUTO_REFRESH ) );
 		getMaxNumberOfInstructionsText().setStringValue( new Integer( CDebugCorePlugin.getDefault().getPluginPreferences().getInt( ICDebugConstants.PREF_MAX_NUMBER_OF_INSTRUCTIONS ) ).toString() );
 		getDisassemblySourceColor().load();
@@ -207,7 +204,6 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr
 	private void createViewSettingPreferences( Composite parent ) {
 		Composite comp = createGroupComposite( parent, 1, PreferenceMessages.getString( "CDebugPreferencePage.4" ) ); //$NON-NLS-1$
 		fPathsButton = createCheckButton( comp, PreferenceMessages.getString( "CDebugPreferencePage.5" ) ); //$NON-NLS-1$
-		fRefreshRegistersButton = createCheckButton( comp, PreferenceMessages.getString( "CDebugPreferencePage.6" ) ); //$NON-NLS-1$
 		fRefreshSolibsButton = createCheckButton( comp, PreferenceMessages.getString( "CDebugPreferencePage.7" ) ); //$NON-NLS-1$
 		Composite formatComposite = ControlFactory.createCompositeEx( comp, 2, 0 );
 		((GridLayout)formatComposite.getLayout()).makeColumnsEqualWidth = true;
@@ -340,7 +336,6 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr
 	private void storeValues() {
 		IPreferenceStore store = getPreferenceStore();
 		store.setValue( ICDebugPreferenceConstants.PREF_SHOW_FULL_PATHS, fPathsButton.getSelection() );
-		CDebugCorePlugin.getDefault().getPluginPreferences().setValue( ICDebugConstants.PREF_REGISTERS_AUTO_REFRESH, fRefreshRegistersButton.getSelection() );
 		CDebugCorePlugin.getDefault().getPluginPreferences().setValue( ICDebugConstants.PREF_SHARED_LIBRARIES_AUTO_REFRESH, fRefreshSolibsButton.getSelection() );
 		CDebugCorePlugin.getDefault().getPluginPreferences().setValue( ICDebugConstants.PREF_MAX_NUMBER_OF_INSTRUCTIONS, getMaxNumberOfInstructionsText().getIntValue() );
 		CDebugCorePlugin.getDefault().getPluginPreferences().setValue( ICDebugConstants.PREF_DEFAULT_VARIABLE_FORMAT, getFormatId( fVariableFormatCombo.getSelectionIndex() ) );
@@ -362,7 +357,6 @@ public class CDebugPreferencePage extends PreferencePage implements IWorkbenchPr
 	private void setDefaultValues() {
 		IPreferenceStore store = getPreferenceStore();
 		fPathsButton.setSelection( store.getDefaultBoolean( ICDebugPreferenceConstants.PREF_SHOW_FULL_PATHS ) );
-		fRefreshRegistersButton.setSelection( CDebugCorePlugin.getDefault().getPluginPreferences().getDefaultBoolean( ICDebugConstants.PREF_REGISTERS_AUTO_REFRESH ) );
 		fRefreshSolibsButton.setSelection( CDebugCorePlugin.getDefault().getPluginPreferences().getDefaultBoolean( ICDebugConstants.PREF_SHARED_LIBRARIES_AUTO_REFRESH ) );
 		getMaxNumberOfInstructionsText().setStringValue( new Integer( CDebugCorePlugin.getDefault().getPluginPreferences().getDefaultInt( ICDebugConstants.PREF_MAX_NUMBER_OF_INSTRUCTIONS ) ).toString() );
 		getDisassemblySourceColor().loadDefault();