diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java
index 653a94806f4..88dad087701 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractContainerVMNode.java
@@ -271,11 +271,7 @@ public abstract class AbstractContainerVMNode extends AbstractDMVMNode
             }
         } else if (e instanceof IContainerSuspendedDMEvent) {
             return IModelDelta.NO_CHANGE;
-        } else if (e instanceof FullStackRefreshEvent) {
-            if (dmc instanceof IContainerDMContext) {
-                return IModelDelta.CONTENT;
-            }
-	    } else if (e instanceof SteppingTimedOutEvent) {
+        } else if (e instanceof SteppingTimedOutEvent) {
 	        if (dmc instanceof IContainerDMContext) 
 	        {
 	            return IModelDelta.CONTENT;
@@ -312,13 +308,6 @@ public abstract class AbstractContainerVMNode extends AbstractDMVMNode
             // Container suspended.  Do nothing here to give the stack the 
 		    // priority in updating. The container and threads will update as 
 		    // a result of FullStackRefreshEvent. 
-		} else if (e instanceof FullStackRefreshEvent) {
-		    // Full-stack refresh event is generated following a suspended event 
-		    // and a fixed delay.  If the suspended event was generated for the 
-		    // container refresh the whole container.
-		    if (dmc instanceof IContainerDMContext) {
-		        parentDelta.addNode(createVMContext(dmc), IModelDelta.CONTENT);
-		    }
 		} else if (e instanceof SteppingTimedOutEvent) {
 		    // Stepping time-out indicates that a step operation is taking 
 		    // a long time, and the view needs to be refreshed to show 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java
index a75e755a0fa..1be4a710286 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/AbstractThreadVMNode.java
@@ -336,8 +336,6 @@ public abstract class AbstractThreadVMNode extends AbstractDMVMNode
             return IModelDelta.CONTENT;            
         } else if (e instanceof ISuspendedDMEvent) {
             return IModelDelta.NO_CHANGE;
-        } else if (e instanceof FullStackRefreshEvent) {
-            return IModelDelta.CONTENT;
         } else if (e instanceof SteppingTimedOutEvent) {
             return IModelDelta.CONTENT;            
         } else if (e instanceof ModelProxyInstalledEvent || e instanceof DataModelInitializedEvent) {
@@ -372,11 +370,6 @@ public abstract class AbstractThreadVMNode extends AbstractDMVMNode
             // priority in updating. The thread will update as a result of 
             // FullStackRefreshEvent. 
         	rm.done();
-        } else if (e instanceof FullStackRefreshEvent) {
-            // Full-stack refresh event is generated following a suspended event 
-            // and a fixed delay.  Refresh the whole thread upon this event.
-            parentDelta.addNode(createVMContext(dmc), IModelDelta.CONTENT);
-            rm.done();
         } else if (e instanceof SteppingTimedOutEvent) {
             // Stepping time-out indicates that a step operation is taking 
             // a long time, and the view needs to be refreshed to show 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
index a2bb40b8f9e..4cfdf71347e 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/launch/StackFramesVMNode.java
@@ -544,7 +544,7 @@ public class StackFramesVMNode extends AbstractDMVMNode
         if (e instanceof ISuspendedDMEvent) {
             return IModelDelta.CONTENT | IModelDelta.EXPAND | IModelDelta.SELECT;
         } else if (e instanceof FullStackRefreshEvent) {
-        	return IModelDelta.CONTENT | IModelDelta.EXPAND;
+        	return IModelDelta.CONTENT;
         } else if (e instanceof SteppingTimedOutEvent) {
             return IModelDelta.CONTENT;
         } else if (e instanceof ModelProxyInstalledEvent || e instanceof DataModelInitializedEvent) {