diff --git a/src/NewTools-Debugger/StDebuggerContext.class.st b/src/NewTools-Debugger/StDebuggerContext.class.st
index af0091db6..b67b45ad8 100644
--- a/src/NewTools-Debugger/StDebuggerContext.class.st
+++ b/src/NewTools-Debugger/StDebuggerContext.class.st
@@ -127,8 +127,7 @@ StDebuggerContext >> printOn: aStream [
 { #category : 'nodes' }
 StDebuggerContext >> receiverNodes [
 
-	^ self context receiver allInspectorNodes reject: [ :node | 
-		  node label = 'self' ]
+	^ self context receiver inspectorNodes
 ]
 
 { #category : 'nodes' }
diff --git a/src/NewTools-Debugger/StDebuggerInspector.class.st b/src/NewTools-Debugger/StDebuggerInspector.class.st
index e31fdb1ac..a4369821d 100644
--- a/src/NewTools-Debugger/StDebuggerInspector.class.st
+++ b/src/NewTools-Debugger/StDebuggerInspector.class.st
@@ -12,7 +12,6 @@ Class {
 		'inspector',
 		'model',
 		'label',
-		'rawInspectionSelectionCache',
 		'assertionFailure',
 		'lateralToolbar',
 		'currentLayoutSelector',
@@ -187,46 +186,6 @@ StDebuggerInspector >> model: aModel [
 	inspector model: model
 ]
 
-{ #category : 'accessing' }
-StDebuggerInspector >> rawInspectionSelectionCache [
-	^ rawInspectionSelectionCache ifNil: [ 
-		  rawInspectionSelectionCache := Dictionary new ]
-]
-
-{ #category : 'private' }
-StDebuggerInspector >> restoreRawInspectionSelectionForContext: aContext [
-	aContext ifNil: [ ^ self ].
-	self getRawInspectorPresenterOrNil
-		ifNotNil: [ :raw | 
-			| receiverClass selector path |
-			receiverClass := aContext receiver class.
-			selector := aContext selector.
-			path := self rawInspectionSelectionCache
-				at: receiverClass -> selector
-				ifAbsent: [ #() ].
-			path ifEmpty: [ self rawInspectionSelectionCache at: receiverClass ifAbsent: [ #() ] ].
-			path ifEmpty: [ | roots pathStart |
-					roots := raw attributeTable roots.
-					pathStart := 1.
-					1 to: roots size do: [ :i | 
-						(roots at: i) key = 'Temps' ifTrue: [ pathStart := i ] ].
-					path := {pathStart. 1} ].
-			raw selectPath: path ]
-]
-
-{ #category : 'private' }
-StDebuggerInspector >> saveRawInspectionSelectionForContext: aContext [
-	| selectionPath |
-	aContext ifNil: [ ^ self ].
-	selectionPath := self getRawInspectorSelectedPath.
-	self rawInspectionSelectionCache
-		at: aContext receiver class -> aContext selector
-		put: selectionPath.
-	self rawInspectionSelectionCache
-		at: aContext receiver class
-		put: selectionPath
-]
-
 { #category : 'layout' }
 StDebuggerInspector >> setAssertionLayout [
 	currentLayoutSelector := self assertionLayoutSelector.
@@ -298,14 +257,13 @@ StDebuggerInspector >> updateLayoutForContexts: aContext isAssertionFailure: isT
 StDebuggerInspector >> updateWith: inspectedObject [
 
 	| oldContext newContext |
-	oldContext := self model inspectedObject ifNotNil: [ :dbgCtx | 
+	oldContext := self model inspectedObject ifNotNil: [ :dbgCtx |
 		              dbgCtx context ].
 	newContext := inspectedObject ifNotNil: [ :dbgCtx | dbgCtx context ].
-	(self shouldUpdateContext: oldContext with: newContext) ifFalse: [ ^ self ].
+	(self shouldUpdateContext: oldContext with: newContext) ifFalse: [
+		^ self ].
 
 	shouldBeUpdated := false.
-	self saveRawInspectionSelectionForContext: oldContext.
 	self model: (self debuggerInspectorModelClass on: inspectedObject).
-	self updateEvaluationPaneReceiver.
-	self restoreRawInspectionSelectionForContext: newContext
+	self updateEvaluationPaneReceiver
 ]