diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index 24251dce153..1ef10596118 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -27,9 +27,6 @@ BreakpointActionPage.name=Breakpoint Action UI Page
 RunMenu.label=&Run
 DebugActionSet.label=C/C++ Debug
 
-DisassemblyViewAction.label=Go to address...
-DisassemblyViewAction.tooltip=Enter memory address for the assembly code
-
 ToggleInstructionStepModeAction.label=Instruction Stepping Mode
 ToggleInstructionStepModeAction.tooltip=Instruction Stepping Mode
 
@@ -102,15 +99,7 @@ OldDefaultSourceLocator.name=Default C/C++ Source Locator (old)
 
 BreakpointMarkerPreference.label=Breakpoints
 
-DisassemblyView.name=Disassembly
-DisassemblyCurrentInstructionPointer=Disassembly Current Instruction Pointer
-DisassemblySecondaryInstructionPointer=Disassembly Secondary Instruction Pointer
-
 DebugPresentation.label=C/C++ Debug Appearance
-DisassemblySourceLineColor.label=Disassembly Source Line Text Color
-DisassemblySourceLineColor.description=The color used in the Disassembly view for source lines.
-DisassemblyFontDefinition.label=Disassembly View Text Font
-DisassemblyFontDefinition.description=The text font used in the Disassembly view.
 
 # new disassembly
 DisassemblyCategory.name = Disassembly
@@ -122,28 +111,6 @@ OpenDisassembly.tooltip = Open disassembly window
 DisassemblyEditor.name = Disassembly
 DisassemblyRendering.name = Disassembly
 
-DisassemblyDisplayMode.name = Disassembly Display Mode
-DisassemblyDisplayMode.description = Disassembly display mode
-InstructionsDisplayMode.label = Show Instructions
-InstructionsDisplayMode.tooltip = Show disassembly instructions
-SourceDisplayMode.label = Show Source
-SourceDisplayMode.tooltip = Show source code
-
-SteppingMode.name=Stepping Mode
-SteppingMode.description=Select Stepping Mode
-
-SteppingModeMenu.label=Stepping Mode
-SteppingModeMenu.tooltip=Select Stepping Mode
-
-ContextSteppingMode.label=Context
-ContextSteppingMode.tooltip=Context Dependent Stepping
-
-SourceSteppingMode.label=Source
-SourceSteppingMode.tooltip=Source Level Stepping
-
-InstructionSteppingMode.label=Instruction
-InstructionSteppingMode.tooltip=Instruction Level Stepping
-
 DisassemblyPreferencePage.name = Disassembly
 # new disassembly (end)
 
@@ -241,8 +208,6 @@ StopTracing.name=Stop Tracing
 SaveTraceData.description=Save Trace Data to File
 SaveTraceData.name=Save Trace Data 
 
-disassemblyViewMenu.label = disassemblyViewMenu
 sourceNotFoundEditor.name = C/C++ Source Not Found Editor
-displayMode.name = displayMode
 CastingCategory.description = Set of commands for displaying variables and expressions as other types or arrays.
 CastingCategory.name = Cast to Type or Array
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index d8aabedb828..08513444b9b 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -1231,14 +1231,6 @@
             super="org.eclipse.debug.core.breakpoint"
             name="org.eclipse.cdt.debug.core.breakpoint">
       </type>
-      <type
-            markerType="org.eclipse.cdt.debug.ui.disassemblyInstructionPointer.current"
-            name="org.eclipse.cdt.debug.ui.currentDisassemblyIP">
-      </type>
-      <type
-            markerType="org.eclipse.cdt.debug.ui.disassemblyInstructionPointer.secondary"
-            name="org.eclipse.cdt.debug.ui.secondaryDisassemblyIP">
-      </type>
    </extension>
    <extension
          point="org.eclipse.ui.editors.markerAnnotationSpecification">
@@ -1257,38 +1249,6 @@
             verticalRulerPreferenceKey="breakpointVerticalRuler"
             verticalRulerPreferenceValue="true">
       </specification>
-      <specification
-            colorPreferenceValue="198,219,174"
-            annotationType="org.eclipse.cdt.debug.ui.currentDisassemblyIP"
-            verticalRulerPreferenceValue="true"
-            colorPreferenceKey="currentDisassemblyIPColor"
-            highlightPreferenceKey="currentDisassemblyIPHighlight"
-            overviewRulerPreferenceValue="true"
-            highlightPreferenceValue="true"
-            presentationLayer="6"
-            icon="icons/obj16/inst_ptr_top.gif"
-            label="%DisassemblyCurrentInstructionPointer"
-            textPreferenceValue="false"
-            textPreferenceKey="currentDisassemblyIPIndication"
-            verticalRulerPreferenceKey="currentDisassemblyIPVerticalRuler"
-            overviewRulerPreferenceKey="currentDisassemblyIPOverviewRuler">
-      </specification>
-      <specification
-            colorPreferenceValue="219,235,204"
-            annotationType="org.eclipse.cdt.debug.ui.secondaryDisassemblyIP"
-            verticalRulerPreferenceValue="true"
-            colorPreferenceKey="secondaryDisassemblyIPColor"
-            highlightPreferenceKey="secondaryDisassemblyIPHighlight"
-            overviewRulerPreferenceValue="true"
-            highlightPreferenceValue="true"
-            presentationLayer="6"
-            icon="icons/obj16/inst_ptr.gif"
-            label="%DisassemblySecondaryInstructionPointer"
-            textPreferenceValue="false"
-            textPreferenceKey="secondaryDisassemblyIPIndication"
-            verticalRulerPreferenceKey="secondaryDisassemblyIPVerticalRuler"
-            overviewRulerPreferenceKey="secondaryDisassemblyIPOverviewRuler">
-      </specification>
    </extension>
    <extension
          point="org.eclipse.core.runtime.adapters">
@@ -1478,15 +1438,6 @@
    </extension>
    <extension
          point="org.eclipse.ui.themes">
-      <fontDefinition
-            label="%DisassemblyFontDefinition.label"
-            categoryId="org.eclipse.debug.ui.presentation"
-            defaultsTo="org.eclipse.jface.textfont"
-            id="org.eclipse.cdt.debug.ui.disassemblyFont">
-         <description>
-            %DisassemblyFontDefinition.description
-         </description>
-      </fontDefinition>
       <fontDefinition
             defaultsTo="org.eclipse.jface.textfont"
             label="%ModulesDetailPaneFontDefinition.label"
@@ -1738,7 +1689,6 @@
             <or>
                <instanceof value="org.eclipse.cdt.internal.ui.editor.CEditor"/>
                <instanceof value="org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor"/>
-               <instanceof value="org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyView"/>
                <instanceof value="org.eclipse.cdt.debug.internal.ui.disassembly.editor.DisassemblyEditor"/>
                <with variable="selection">
                   <count value="1"/>
@@ -1765,7 +1715,6 @@
                <or>
                   <instanceof value="org.eclipse.cdt.internal.ui.editor.CEditor"/>
                   <instanceof value="org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor"/>
-                  <instanceof value="org.eclipse.cdt.debug.internal.ui.views.disassembly.DisassemblyView"/>
                   <instanceof value="org.eclipse.cdt.debug.internal.ui.disassembly.editor.DisassemblyEditor"/>
                   <with variable="selection">
                      <count value="1"/>