diff --git a/src/GToolkit-Pharo-Coder-Method/GtPharoMethodCoder.class.st b/src/GToolkit-Pharo-Coder-Method/GtPharoMethodCoder.class.st
index 9838cf0d..342cfda5 100644
--- a/src/GToolkit-Pharo-Coder-Method/GtPharoMethodCoder.class.st
+++ b/src/GToolkit-Pharo-Coder-Method/GtPharoMethodCoder.class.st
@@ -161,11 +161,6 @@ GtPharoMethodCoder >> category: aSymbol [
 	self protocol: aSymbol
 ]
 
-{ #category : #'private - actions' }
-GtPharoMethodCoder >> changeManager [
-	^ RBRefactoryChangeManager instance
-]
-
 { #category : #private }
 GtPharoMethodCoder >> changedSourceForCurrentMethod: aRefactoryChange [
 	aRefactoryChange changes
diff --git a/src/GToolkit-Pharo-Coder/RBRefactoryChange.extension.st b/src/GToolkit-Pharo-Coder/RBRefactoryChange.extension.st
index 2c7d28f6..fcadca1e 100644
--- a/src/GToolkit-Pharo-Coder/RBRefactoryChange.extension.st
+++ b/src/GToolkit-Pharo-Coder/RBRefactoryChange.extension.st
@@ -9,15 +9,17 @@ RBRefactoryChange >> gtCompilationJob [
 RBRefactoryChange >> gtCompilationJobWithProgress: aBlock [
 	^ GtJob
 		block: [ :job | 
-			| totalCount current |
-			job label: 'Compiling ' , self name.
-			totalCount := self changesSize max: 1.
-			job max: totalCount.
-			current := 0.
-			self
-				executeNotifying: [ current := current + 1 min: totalCount.
-					job currentValue: current.
-					aBlock cull: current / totalCount ] ]
+			GtRefactoryChangeManager instance
+				ignoreChangesWhile: [ | totalCount current |
+					job label: 'Compiling ' , self name.
+					totalCount := self changesSize max: 1.
+					job max: totalCount.
+					current := 0.
+					GtRefactoryChangeManager instance
+						addUndo: (self
+								executeNotifying: [ current := current + 1 min: totalCount.
+									job currentValue: current.
+									aBlock cull: current / totalCount ]) ] ]
 ]
 
 { #category : #'*GToolkit-Pharo-Coder' }
diff --git a/src/GToolkit-Pharo-System/GtPharoCodeModifier.class.st b/src/GToolkit-Pharo-System/GtPharoCodeModifier.class.st
index 61c04dbb..dbca9e66 100644
--- a/src/GToolkit-Pharo-System/GtPharoCodeModifier.class.st
+++ b/src/GToolkit-Pharo-System/GtPharoCodeModifier.class.st
@@ -161,16 +161,7 @@ GtPharoCodeModifier >> initialize [
 
 { #category : #'api - refactoring' }
 GtPharoCodeModifier >> performRefactoryChange: aRefactoryChange [
-	^ self deferFlushDuring: [ RBRefactoryChangeManager instance performChange: aRefactoryChange ]
-]
-
-{ #category : #'api - refactoring' }
-GtPharoCodeModifier >> performRefactoryChange: aRefactoryChange andAddUndoPointer: aNumber [
-
-	^ self deferFlushDuring: [
-		RBRefactoryChangeManager instance
-			performChange: aRefactoryChange;
-			addUndoPointer: aNumber ]
+	^ self deferFlushDuring: [ GtRefactoryChangeManager instance performChange: aRefactoryChange ]
 ]
 
 { #category : #'api - package' }
@@ -205,7 +196,9 @@ GtPharoCodeModifier >> removeMethod: aMethod [
 
 { #category : #'api - method' }
 GtPharoCodeModifier >> removeMethodFrom: aBehavior selector: aSelector [
-	^ self critical: [ aBehavior removeSelector: aSelector ]
+	^ self
+		critical: [ GtRefactoryChangeManager instance
+				performChange: (RBRemoveMethodChange remove: aSelector from: aBehavior) ]
 ]
 
 { #category : #'api - package' }