diff --git a/dsf/org.eclipse.cdt.dsf.ui/.settings/.api_filters b/dsf/org.eclipse.cdt.dsf.ui/.settings/.api_filters
index 8956dd93790..6dfc9ce04a6 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/.settings/.api_filters
+++ b/dsf/org.eclipse.cdt.dsf.ui/.settings/.api_filters
@@ -1,43 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.cdt.dsf.ui" version="2">
-    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.DisassemblyPart">
-        <filter id="571473929">
-            <message_arguments>
-                <message_argument value="WorkbenchPart"/>
-                <message_argument value="DisassemblyPart"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/DisassemblySelection.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.DisassemblySelection">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.DisassemblySelection"/>
-                <message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/IBreakpointLocationProvider.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IBreakpointLocationProvider">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IBreakpointLocationProvider"/>
-                <message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/IDisassemblyPart.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblyPart">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblyPart"/>
-                <message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/provisional/IDisassemblySelection.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblySelection">
-        <filter id="305365105">
-            <message_arguments>
-                <message_argument value="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblySelection"/>
-                <message_argument value="org.eclipse.cdt.dsf.ui_2.2.0"/>
-            </message_arguments>
-        </filter>
-    </resource>
-</component>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.cdt.dsf.ui" version="2">
+    <resource path="src/org/eclipse/cdt/dsf/debug/internal/ui/disassembly/DisassemblyPart.java" type="org.eclipse.cdt.dsf.debug.internal.ui.disassembly.DisassemblyPart">
+        <filter id="571473929">
+            <message_arguments>
+                <message_argument value="WorkbenchPart"/>
+                <message_argument value="DisassemblyPart"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
index 91069209aba..6fbd3346834 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
@@ -421,21 +421,6 @@
             type="org.eclipse.debug.ui.IDebugView">
       </propertyTester>
 
-      <propertyTester
-            class="org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.actions.UpdateScopesPropertyTester"
-            id="org.eclipse.cdt.dsf.debug.ui.selectionUpdateScopesTester"
-            namespace="org.eclipse.cdt.dsf.debug.ui"
-            properties="areUpdateScopesSupported,isUpdateScopeAvailable,isUpdateScopeActive"
-            type="org.eclipse.cdt.dsf.ui.viewmodel.IVMContext">
-      </propertyTester>
-      <propertyTester
-            class="org.eclipse.cdt.dsf.debug.internal.ui.viewmodel.actions.UpdateScopesPropertyTester"
-            id="org.eclipse.cdt.dsf.debug.ui.partUpdateScopesTester"
-            namespace="org.eclipse.cdt.dsf.debug.ui"
-            properties="areUpdateScopesSupported,isUpdateScopeAvailable,isUpdateScopeActive"
-            type="org.eclipse.debug.ui.IDebugView">
-      </propertyTester>
-
       <propertyTester
             class="org.eclipse.cdt.dsf.debug.ui.viewmodel.numberformat.NumberFormatsPropertyTester"
             id="org.eclipse.cdt.dsf.debug.ui.selectionNumberFormatsTester"