diff --git a/src/PharoLauncher-Core/PhLImage.class.st b/src/PharoLauncher-Core/PhLImage.class.st
index f73dfc8d2..2e78dae7f 100644
--- a/src/PharoLauncher-Core/PhLImage.class.st
+++ b/src/PharoLauncher-Core/PhLImage.class.st
@@ -392,12 +392,10 @@ PhLImage >> launchWithConfiguration: aPhLLaunchConfiguration [
 			^ self ].
 	architectureWarningEnabled := true.
 	continue := true.
-	[ [ | processWrapper|
+	[ | processWrapper|
 		processWrapper := (aPhLLaunchConfiguration launchProcess) runUnwatch.
 		self doNotRunInitializationScript. "Just run, image already initialized"
 		^ processWrapper ]
-	on: PhLImageVersionDeterminationError
-	do: [ :error | error uiAlert ] ]
 	on: PhLArchitectureMismatchWarning
 	do: [ :warning |
 		architectureWarningEnabled ifTrue: [ 	
diff --git a/src/PharoLauncher-Core/PhLImageVersionDeterminationError.class.st b/src/PharoLauncher-Core/PhLImageVersionDeterminationError.class.st
deleted file mode 100644
index d4125c168..000000000
--- a/src/PharoLauncher-Core/PhLImageVersionDeterminationError.class.st
+++ /dev/null
@@ -1,37 +0,0 @@
-"
-Error thrown when Pharo Launcher did not succeed to determine the Pharo version of the image to launch.
-Probably, the run command failed.
-I hold the command run to determoine the version so that it can be reused for debugging purposes.
-"
-Class {
-	#name : #PhLImageVersionDeterminationError,
-	#superclass : #PhLError,
-	#instVars : [
-		'command'
-	],
-	#category : #'PharoLauncher-Core-Download'
-}
-
-{ #category : #signalling }
-PhLImageVersionDeterminationError class >> signalCommand: aCommandString [
-	^ self new
-		setCommand: aCommandString;
-		signal
-]
-
-{ #category : #accessing }
-PhLImageVersionDeterminationError >> longDescription [
-	^ PhLImage versionFileName , 
-	' file was not found for your image, and probably your VMs are not up to date.
-Please, contact us at http://pharo.org/community'
-]
-
-{ #category : #accessing }
-PhLImageVersionDeterminationError >> name [
-	^ 'Cannot determine image version'
-]
-
-{ #category : #initialization }
-PhLImageVersionDeterminationError >> setCommand: aCommandString [
-	command := aCommandString reject: [ :c | c = Character cr ] "easier to run the copy/pasted command in a shell if command has only one line"
-]
diff --git a/src/PharoLauncher-Core/PhLImageVersionFileNotFound.class.st b/src/PharoLauncher-Core/PhLImageVersionFileNotFound.class.st
new file mode 100644
index 000000000..35bebd9dc
--- /dev/null
+++ b/src/PharoLauncher-Core/PhLImageVersionFileNotFound.class.st
@@ -0,0 +1,22 @@
+"
+Error thrown when Pharo Launcher did not succeed to determine the Pharo version of the image to launch.
+Probably, the run command failed.
+I hold the command run to determoine the version so that it can be reused for debugging purposes.
+"
+Class {
+	#name : #PhLImageVersionFileNotFound,
+	#superclass : #PhLError,
+	#category : #'PharoLauncher-Core-Download'
+}
+
+{ #category : #accessing }
+PhLImageVersionFileNotFound >> longDescription [
+	^ PhLImage versionFileName , 
+	' file was not found for your image, and probably your VMs are not up to date.
+Please, contact us at http://pharo.org/community'
+]
+
+{ #category : #accessing }
+PhLImageVersionFileNotFound >> name [
+	^ 'Image version file ', PhLImage versionFileName , ' not found!'
+]
diff --git a/src/PharoLauncher-Core/PhLLaunchConfiguration.class.st b/src/PharoLauncher-Core/PhLLaunchConfiguration.class.st
index 5c168effa..c637d20c1 100644
--- a/src/PharoLauncher-Core/PhLLaunchConfiguration.class.st
+++ b/src/PharoLauncher-Core/PhLLaunchConfiguration.class.st
@@ -92,7 +92,7 @@ PhLLaunchConfiguration >> commandString [
 
 { #category : #querying }
 PhLLaunchConfiguration >> defaultVm [
-	self image ensurePharoVersion.
+	self image pharoVersion.
 	^ self image vmManager virtualMachine
 ]
 
@@ -128,7 +128,8 @@ PhLLaunchConfiguration >> initializeWithImage: anImage [
 	image := anImage.
 	name := 'new configuration...'.
 	usePharoSettings := true.
-	imageArguments := anImage defaultArguments
+	imageArguments := anImage defaultArguments.
+	image ensurePharoVersion
 ]
 
 { #category : #testing }
@@ -168,7 +169,7 @@ PhLLaunchConfiguration >> printOn: aStream [
 { #category : #configuring }
 PhLLaunchConfiguration >> useSettings: aBoolean [
 	"Cannot skip Pharo settings before Pharo 3.0"
-	self image ensurePharoVersion asInteger < 30 ifTrue: [ ^ self ].
+	self image pharoVersion asInteger < 30 ifTrue: [ ^ self ].
 
 	usePharoSettings := aBoolean.
 ]
diff --git a/src/PharoLauncher-Core/PhLLaunchImageCommand.class.st b/src/PharoLauncher-Core/PhLLaunchImageCommand.class.st
index caf711ad8..a6f3c9419 100644
--- a/src/PharoLauncher-Core/PhLLaunchImageCommand.class.st
+++ b/src/PharoLauncher-Core/PhLLaunchImageCommand.class.st
@@ -129,8 +129,7 @@ PhLLaunchImageCommand >> launchConfigurationOfImage: aPhLImage [
 PhLLaunchImageCommand >> launchImage: aPhLImage [
 	| process launchConfig |
 	
-	[ 
-		launchConfig := self launchConfigurationOfImage: aPhLImage.
+	[  launchConfig := self launchConfigurationOfImage: aPhLImage.
 		launchConfig useSettings: useSettings.
 		process := aPhLImage launchWithConfiguration: launchConfig ]
 	on: PhLError
diff --git a/src/PharoLauncher-Core/PhLPrivateVirtualMachine.class.st b/src/PharoLauncher-Core/PhLPrivateVirtualMachine.class.st
deleted file mode 100644
index 07f6ac7ca..000000000
--- a/src/PharoLauncher-Core/PhLPrivateVirtualMachine.class.st
+++ /dev/null
@@ -1,27 +0,0 @@
-"
-I represent a Pharo virtual machine used to determine an image phar version by running it with a VM compatible with its image format.
-
-	ex: 6505 6521 68021
-
-"
-Class {
-	#name : #PhLPrivateVirtualMachine,
-	#superclass : #PhLVirtualMachine,
-	#category : #'PharoLauncher-Core-Download'
-}
-
-{ #category : #testing }
-PhLPrivateVirtualMachine class >> isSubclassForDirectory: aFileReference private: isPrivateVm [
-	^ isPrivateVm
-]
-
-{ #category : #querying }
-PhLPrivateVirtualMachine >> downloadUrl [
-	^ self manager compatibleVmUrls 
-		at: self name asInteger
-]
-
-{ #category : #accessing }
-PhLPrivateVirtualMachine >> vmStore [
-	^ self manager privateVmStore
-]
diff --git a/src/PharoLauncher-Core/PhLToggleVmPrivateVmCommand.class.st b/src/PharoLauncher-Core/PhLToggleVmPrivateVmCommand.class.st
deleted file mode 100644
index ae44681ba..000000000
--- a/src/PharoLauncher-Core/PhLToggleVmPrivateVmCommand.class.st
+++ /dev/null
@@ -1,28 +0,0 @@
-"
-Toggle between display of VMs used to launch Pharo images and ""private"" VMs used to determine Pharo version of an image (one VM per image format)
-"
-Class {
-	#name : #PhLToggleVmPrivateVmCommand,
-	#superclass : #PhLVmCommand,
-	#category : #'PharoLauncher-Core-Commands'
-}
-
-{ #category : #converting }
-PhLToggleVmPrivateVmCommand >> asSpecCommand [
-	^ super asSpecCommand
-		iconName: #remote;
-		beDisplayedOnRightSide;
-		configureAsToolBarToggleButton;
-		yourself
-]
-
-{ #category : #executing }
-PhLToggleVmPrivateVmCommand >> execute [
-	self vmsPresenter toggleShowVmPrivateVm.
-]
-
-{ #category : #initialization }
-PhLToggleVmPrivateVmCommand >> initialize [
-	super initialize.
-	self name: 'public'
-]
diff --git a/src/PharoLauncher-Core/PhLVirtualMachine.class.st b/src/PharoLauncher-Core/PhLVirtualMachine.class.st
index c1c681cda..4eb3d6e06 100644
--- a/src/PharoLauncher-Core/PhLVirtualMachine.class.st
+++ b/src/PharoLauncher-Core/PhLVirtualMachine.class.st
@@ -41,18 +41,14 @@ Class {
 
 { #category : #'instance creation' }
 PhLVirtualMachine class >> directory: aFileReference [
-	^ self 
-		directory: aFileReference
-		private: false
-]
 
-{ #category : #'instance creation' }
-PhLVirtualMachine class >> directory: aFileReference private: isPrivateVm [
 	| targetClass |
-	targetClass := self allSubclasses detect: [ :cls | cls isSubclassForDirectory: aFileReference private: isPrivateVm ] ifNone: [ self ].
-	^ targetClass new 
-		initializeOn: aFileReference;
-		yourself 
+	targetClass := self allSubclasses
+		               detect: [ :cls | cls isSubclassForDirectory: aFileReference ]
+		               ifNone: [ self ].
+	^ targetClass new
+		  initializeOn: aFileReference;
+		  yourself
 ]
 
 { #category : #accessing }
@@ -80,9 +76,9 @@ PhLVirtualMachine class >> id: aString [
 ]
 
 { #category : #testing }
-PhLVirtualMachine class >> isSubclassForDirectory: aFileReference private: isPrivateVm [
+PhLVirtualMachine class >> isSubclassForDirectory: aFileReference [
 
-	^ isPrivateVm not and: [ aFileReference basename beginsWith: self versionPrefix ]
+	^ aFileReference basename beginsWith: self versionPrefix
 ]
 
 { #category : #accessing }
diff --git a/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st b/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st
index 27f86c74c..f78f4b37f 100644
--- a/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st
+++ b/src/PharoLauncher-Core/PhLVirtualMachineManager.class.st
@@ -117,12 +117,6 @@ PhLVirtualMachineManager class >> pharoUnzip: aZipFileReference to: outputDirect
 					overwrite: true ]
 ]
 
-{ #category : #private }
-PhLVirtualMachineManager class >> privateVmStore [
-	"The private store is used to fetch one VM per image format and open image to determine their pharo version number (e.g. 6.0, 7.0, etc.). Then we download the latest stable VM for the given Pharo image version."
-	^ (self vmStore / 'private') ensureCreateDirectory
-]
-
 { #category : #initialization }
 PhLVirtualMachineManager class >> reset [
 	<script>
@@ -198,13 +192,6 @@ PhLVirtualMachineManager >> availableVirtualMachines [
 	^ self availableVirtualMachinesIn: self vmStore
 ]
 
-{ #category : #querying }
-PhLVirtualMachineManager >> availableVirtualMachinesByImageFormat [
-	^ [ self availableVirtualMachinesIn: self privateVmStore] 
-		on: PhLExecutableNotFoundError 
-		do: [ :ex | ex path asFileReference ensureDeleteAll. ex retry ]
-]
-
 { #category : #private }
 PhLVirtualMachineManager >> availableVirtualMachinesIn: aFileReference [
 	| vmsOnDisk |
@@ -213,7 +200,7 @@ PhLVirtualMachineManager >> availableVirtualMachinesIn: aFileReference [
 	aFileReference directories
 		reject: [ :entry | entry basename = 'private' ]
 		thenDo: [ :entry | | vm |
-			vm := PhLVirtualMachine directory: entry private: (aFileReference = self privateVmStore).
+			vm := PhLVirtualMachine directory: entry.
 			vm manager: self.
 			vm ifValid: [ vmsOnDisk at: entry basename put: vm ] ].
 	^ vmsOnDisk
@@ -229,47 +216,17 @@ PhLVirtualMachineManager >> checkImageArchitecture [
 		ifTrue: [ PhLArchitectureMismatchWarning signalLauncherArch: '64-bit' imageArch: '32-bit' ]
 ]
 
-{ #category : #private }
-PhLVirtualMachineManager >> compatibleVm [
-	"Do not get the exact VM for the given image but only a VM able to run the image to get its version number"
-
-	^ self availableVirtualMachinesByImageFormat
-		at: self imageFormatNumber asString
-		ifAbsent: [ self fetchCompatibleVm.
-			self fetchSourcesFileForCompatibleVm.
-			self availableVirtualMachinesByImageFormat at: self imageFormatNumber asString ]
-]
-
-{ #category : #private }
-PhLVirtualMachineManager >> compatibleVmUrl [
-	^ self compatibleVmUrls at: self imageFormatNumber
-]
-
-{ #category : #private }
-PhLVirtualMachineManager >> compatibleVmUrls [
-	| vmProvider |
-	vmProvider := PhLVmProviderUntilPharo80 new.
-	"50-preSpur stable is not the latest stable pre-Spur VM. 40 vm is the latest stable pre-Spur"
-	^ Dictionary newFromPairs: { 
-		self class imageFormat6504 . vmProvider compatibleUrlForPharo: '13' arch64: false .
-		self class imageFormatPreSpur . vmProvider compatibleUrlForPharo: '40' arch64: false .
-		self class imageFormat32bits . vmProvider compatibleUrlForPharo: '70' arch64: false .
-		self class imageFormat64bits . vmProvider compatibleUrlForPharo: '70' arch64: true
-	}
-	
-]
-
 { #category : #querying }
 PhLVirtualMachineManager >> defaultVirtualMachines [
 
 	^ { 
-		(PhLVirtualMachine id: '100-x64')
+		(PhLVirtualMachine id: '110-x64')
 			be64bits;
 			yourself.
-		(PhLVirtualMachine id: '90-x64')
+		(PhLVirtualMachine id: '100-x64')
 			be64bits;
 			yourself.
-		(PhLVirtualMachine id: '80-x64')
+		(PhLVirtualMachine id: '90-x64')
 			be64bits;
 			yourself.
 		(PhLVirtualMachine id: '80-x86')
@@ -277,25 +234,6 @@ PhLVirtualMachineManager >> defaultVirtualMachines [
 	}
 ]
 
-{ #category : #private }
-PhLVirtualMachineManager >> fetchCompatibleVm [
-	[ self class 
-		fetch: self compatibleVmUrl
-		to: self privateVmStore / (self imageFormatNumber asString , '.zip') ]
-	on: KeyNotFound
-	do: [ self error: 'No Virtual Machine available for ' , self imageFormatNumber asString, ' image format. Maybe you need to update known formats?' ]
-]
-
-{ #category : #private }
-PhLVirtualMachineManager >> fetchSourcesFileForCompatibleVm [
-	" We need to fetch the sources file to be able to determine the Pharo version of an image for Pharo versions < 2.0.
-	Indeed, a blocking warning (about missing sources file) prevents the execution of any command line evaluation ..."
-	(self imageFormatNumber = self class imageFormatPreSpur or: [ self imageFormatNumber = self class imageFormat6504 ])
-		ifTrue: [ self 
-			fetchSourcesFilesFor: '14' 
-			in: self privateVmStore / self imageFormatNumber asString ]
-]
-
 { #category : #private }
 PhLVirtualMachineManager >> fetchSourcesFiles [
 	| previousVersion |
@@ -377,14 +315,7 @@ PhLVirtualMachineManager >> imageFormatNumber: anInteger [
 PhLVirtualMachineManager >> imageVersion [
 	"get the Pharo version of the image"
 
-	^ imageVersion ifNil: 
-		[ [ self imageVersionFromFile ]
-			on: PhLImageVersionDeterminationError
-			do: [ "no version file, generate it"
-					[ self imageVersionFromFileWith: (self imageVersionCommandWithPreferences: false) ]
-						on: PhLImageVersionDeterminationError, PhLProcessTimeOut
-						do: [ "Command probably failed, try to run without --no-default-preferences option (only available since Pharo 3.0)"
-								self imageVersionFromFileWith: (self imageVersionCommandWithPreferences: true) ] ] ]
+	^ imageVersion ifNil: [ self imageVersionFromFile ]
 ]
 
 { #category : #accessing }
@@ -392,86 +323,6 @@ PhLVirtualMachineManager >> imageVersion: aString [
 	imageVersion := aString
 ]
 
-{ #category : #accessing }
-PhLVirtualMachineManager >> imageVersionCommandWithPreferences: shouldUsePreferences [
-	| process |
-	process := PhLProcessWrapper new.
-	process workingDirectory: self compatibleVm executableFolderPath.
-	Smalltalk os isUnix
-			ifTrue: [ process 
-							shellCommand;
-							addArguments: 'export SQUEAK_PLUGINS="" && ';
-							addArgument: self compatibleVm executablePath surroundedByDoubleQuotes. ]
-			ifFalse: [ process command: self compatibleVm executablePath ].
-	process 
-		addArgument: (Smalltalk os isUnix
-			ifTrue: [ '--nodisplay' ]
-			ifFalse: [ '--headless' ]);
-		addArgument: imageFile fullName surroundedByDoubleQuotes.
-	shouldUsePreferences ifFalse: [ process addArgument: '--no-default-preferences' ].
-	process addArgument: self imageVersionDeterminationScriptPath surroundedByDoubleQuotes.
-	^ process
-]
-
-{ #category : #private }
-PhLVirtualMachineManager >> imageVersionDeterminationScript [
-	| imageFolder |
-
-	SystemVersion current major isNil "Pharo 1.1"
-		ifTrue: [ SystemVersion current major: 1. 
-					SystemVersion current minor: 1 ]. 
-
-	(SystemVersion current major = 1 and: [ SystemVersion current minor < 4 ])
-		ifTrue: [ imageFolder := (Smalltalk at: #FileDirectory) on: Smalltalk imagePath.
-			imageFolder forceNewFileNamed: 'pharo.version' do: [ :stream |
-				stream 
-					<< SystemVersion current major;
-					<< SystemVersion current minor ] ]
-		ifFalse: [ imageFolder := Smalltalk imagePath asFileReference. 
-			SystemVersion current major = 1
-				ifFalse: [ imageFolder := imageFolder parent ].
-			imageFolder / 'pharo.version' 
-				writeStreamDo: [ :stream | |major minor|
-					major := SystemVersion current major.
-					minor := SystemVersion current minor.
-					"Pharo 6 images >= 60509 need 61 VM, even though the image states 60"
-					(major = 6 and: [ SystemVersion current highestUpdate >= 60509 ])
-						ifTrue: [ minor := 1 ].
-					stream 
-						<< major asString;
-						<< minor asString ] ].
-	Smalltalk snapshot: false andQuit: true
-]
-
-{ #category : #private }
-PhLVirtualMachineManager >> imageVersionDeterminationScriptFile [
-	^ self vmStore parent / 'pharo-version.st'
-]
-
-{ #category : #private }
-PhLVirtualMachineManager >> imageVersionDeterminationScriptFileNeedsUpdate [
-	| file |
-	file := self imageVersionDeterminationScriptFile.
-	^ (file exists and: [ file contents = self imageVersionDeterminationScriptSourceCode ]) not
-]
-
-{ #category : #private }
-PhLVirtualMachineManager >> imageVersionDeterminationScriptPath [
-	| file |
-	file := self imageVersionDeterminationScriptFile.
-	self imageVersionDeterminationScriptFileNeedsUpdate
-		ifTrue: [ file 
-						ensureDelete;
-						writeStreamDo: [ :stream | stream << self imageVersionDeterminationScriptSourceCode ] ].
-	^ file fullName
-]
-
-{ #category : #private }
-PhLVirtualMachineManager >> imageVersionDeterminationScriptSourceCode [
-	^ (self class >> #imageVersionDeterminationScript) sourceCode
-		allButFirst: #imageVersionDeterminationScript size	"remove method name"
-]
-
 { #category : #private }
 PhLVirtualMachineManager >> imageVersionFile [
 	^ imageFile parent / PhLImage versionFileName
@@ -481,20 +332,11 @@ PhLVirtualMachineManager >> imageVersionFile [
 PhLVirtualMachineManager >> imageVersionFromFile [
 	self imageVersionFile 
 			readStreamDo: [ :stream | imageVersion := stream contents asInteger asString ]
-			ifAbsent: [ PhLImageVersionDeterminationError signal: 
+			ifAbsent: [ PhLImageVersionFileNotFound signal: 
 				('Cannot determine image version: image version file "{1}" not found!' format: { self imageVersionFile pathString }) ].
 	^ imageVersion
 ]
 
-{ #category : #accessing }
-PhLVirtualMachineManager >> imageVersionFromFileWith: aPhLProcessWrapperCommand [
-	aPhLProcessWrapperCommand runAndWaitTimeOut: 10 seconds.
-	self imageVersionFile 
-			readStreamDo: [ :stream | imageVersion := stream contents asInteger asString ]
-			ifAbsent: [ PhLImageVersionDeterminationError signalCommand: aPhLProcessWrapperCommand printString ].
-	^ imageVersion
-]
-
 { #category : #testing }
 PhLVirtualMachineManager >> is64bit [ 
 	^ self class is64bits: self imageFormatNumber 
@@ -510,11 +352,6 @@ PhLVirtualMachineManager >> pharoVersion [
 	^ self imageVersion
 ]
 
-{ #category : #accessing }
-PhLVirtualMachineManager >> privateVmStore [
-	^ self class privateVmStore
-]
-
 { #category : #accessing }
 PhLVirtualMachineManager >> sourcesFileUrlFor: anImageVersionString [
 	"$1: IMAGE_VERSION"
diff --git a/src/PharoLauncher-Core/PhLVirtualMachinesDataSource.class.st b/src/PharoLauncher-Core/PhLVirtualMachinesDataSource.class.st
index 746fd8ab6..052532e7f 100644
--- a/src/PharoLauncher-Core/PhLVirtualMachinesDataSource.class.st
+++ b/src/PharoLauncher-Core/PhLVirtualMachinesDataSource.class.st
@@ -6,20 +6,16 @@ Class {
 	#name : #PhLVirtualMachinesDataSource,
 	#superclass : #Object,
 	#instVars : [
-		'vmsBlock',
-		'privateVmsBlock'
+		'vmsBlock'
 	],
 	#category : #'PharoLauncher-Core-Model'
 }
 
 { #category : #accessing }
-PhLVirtualMachinesDataSource class >> default [ 
-	| vmsBlock privateVmsBlock |
-	vmsBlock := [ PhLVirtualMachineManager new virtualMachines 
-		asSortedCollection: [ :vm1 :vm2 | vm1 > vm2 ] ].
-	privateVmsBlock := [ PhLVirtualMachineManager new availableVirtualMachinesByImageFormat 
-		asSortedCollection: [ :vm1 :vm2 | vm1 > vm2 ] ].
-	^ self vmsBlock: vmsBlock privateVmsBlock: privateVmsBlock 
+PhLVirtualMachinesDataSource class >> default [
+
+	^ self vmsBlock: [ PhLVirtualMachineManager new virtualMachines 
+								asSortedCollection: [ :vm1 :vm2 | vm1 > vm2 ] ]
 ]
 
 { #category : #'instance creation' }
@@ -29,25 +25,6 @@ PhLVirtualMachinesDataSource class >> vmsBlock: aBlock [
 		yourself
 ]
 
-{ #category : #'instance creation' }
-PhLVirtualMachinesDataSource class >> vmsBlock: vmsBlock privateVmsBlock: privateVmsBlock [
-	^ (self vmsBlock: vmsBlock)
-		privateVmsBlock: privateVmsBlock;
-		yourself
-]
-
-{ #category : #querying }
-PhLVirtualMachinesDataSource >> privateVirtualMachines [ 
-	^ privateVmsBlock 
-		ifNil: [ #() ]
-		ifNotNil: [ privateVmsBlock value ]
-]
-
-{ #category : #accessing }
-PhLVirtualMachinesDataSource >> privateVmsBlock: aBlock [
-	privateVmsBlock := aBlock
-]
-
 { #category : #querying }
 PhLVirtualMachinesDataSource >> virtualMachines [ 
 	^ vmsBlock value
diff --git a/src/PharoLauncher-Core/PhLVmProviderUntilPharo80.class.st b/src/PharoLauncher-Core/PhLVmProviderUntilPharo80.class.st
index 7ae18c3ed..d07d52a00 100644
--- a/src/PharoLauncher-Core/PhLVmProviderUntilPharo80.class.st
+++ b/src/PharoLauncher-Core/PhLVmProviderUntilPharo80.class.st
@@ -8,17 +8,6 @@ Class {
 	#category : #'PharoLauncher-Core-Download'
 }
 
-{ #category : #accessing }
-PhLVmProviderUntilPharo80 >> compatibleUrlForPharo: pharoVersion arch64: is64bit [  
-	^ self urlTemplate 
-		format: (Dictionary 
-			with: #IMAGE_VERSION -> pharoVersion
-			with: #IMAGE_ARCH -> (is64bit ifTrue: [ '64' ] ifFalse: [ '' ])
-			with: #OS_PATH_SEGMENT -> self downloadPathOSTypeSegment
-			with: #VM_FLAVOUR -> ''
-			with: #VM_STATUS -> 'stable')
-]
-
 { #category : #'private - accessing' }
 PhLVmProviderUntilPharo80 >> downloadPathOSTypeSegment [
 	| os |
diff --git a/src/PharoLauncher-Spec2/PhLVMPresenter.class.st b/src/PharoLauncher-Spec2/PhLVMPresenter.class.st
index ccd309970..01f407b3a 100644
--- a/src/PharoLauncher-Spec2/PhLVMPresenter.class.st
+++ b/src/PharoLauncher-Spec2/PhLVMPresenter.class.st
@@ -8,8 +8,6 @@ Class {
 	#classTraits : 'TPhLInteractionTrait classTrait',
 	#instVars : [
 		'vmTable',
-		'dataSource',
-		'shouldShowPrivateVms',
 		'rootCommandsGroup'
 	],
 	#category : #'PharoLauncher-Spec2'
@@ -42,7 +40,6 @@ PhLVMPresenter class >> buildToolbarGroup [
 				name: 'Show';
 				yourself);
 		register: PhLDeleteVmCommand forSpec;
-		register: PhLToggleVmPrivateVmCommand forSpec;
 		beDisplayedAsGroup;
 		yourself
 ]
@@ -53,14 +50,6 @@ PhLVMPresenter class >> example [
 	(self on: PhLVirtualMachinesDataSource default) open
 ]
 
-{ #category : #initialization }
-PhLVMPresenter >> connectPresenters [
-	super connectPresenters.
-	shouldShowPrivateVms := false.
-	
-
-]
-
 { #category : #accessing }
 PhLVMPresenter >> datasource [
 	^ self model
@@ -114,22 +103,6 @@ PhLVMPresenter >> initializeWindow: aWindowPresenter [
 		centered.
 
 	self rootCommandsGroup installShortcutsIn: aWindowPresenter.
-
-	self privateVmsTogglePresenter
-		whenDeactivatedDo: [ 
-			self privateVmsTogglePresenter
-				label: 'public';
-				icon: (self iconNamed: #remote) ];
-		whenActivatedDo: [ 
-			self privateVmsTogglePresenter
-				label: 'private';
-				icon: (self iconNamed: #smallLock) ];
-		beUnselected
-]
-
-{ #category : #initialization }
-PhLVMPresenter >> privateVmsTogglePresenter [
-	^ (self rootCommandsGroup / 'Toolbar') allCommands last presenter
 ]
 
 { #category : #private }
@@ -138,13 +111,9 @@ PhLVMPresenter >> readableDateFor: aTimestamp [
 
 ]
 
-{ #category : #accessing }
+{ #category : #refreshing }
 PhLVMPresenter >> refresh [ 
-	| vms |
-	vms := shouldShowPrivateVms
-		ifTrue: [ self datasource privateVirtualMachines ]
-		ifFalse: [ self datasource virtualMachines ].
-	vmTable items: vms.
+	vmTable items: self datasource virtualMachines
 ]
 
 { #category : #initialization }
@@ -156,21 +125,3 @@ PhLVMPresenter >> rootCommandsGroup [
 PhLVMPresenter >> selectedVms [
 	^ vmTable selectedItems
 ]
-
-{ #category : #configuring }
-PhLVMPresenter >> showPrivateVms [
-	shouldShowPrivateVms := true.
-	self refresh.
-]
-
-{ #category : #configuring }
-PhLVMPresenter >> showVms [
-	shouldShowPrivateVms := false.
-	self refresh.
-]
-
-{ #category : #configuring }
-PhLVMPresenter >> toggleShowVmPrivateVm [
-	shouldShowPrivateVms := shouldShowPrivateVms not.
-	self refresh
-]
diff --git a/src/PharoLauncher-Tests-Commands/PhLDeleteVmCommandTest.class.st b/src/PharoLauncher-Tests-Commands/PhLDeleteVmCommandTest.class.st
index 58a2e107e..61d0cdba9 100644
--- a/src/PharoLauncher-Tests-Commands/PhLDeleteVmCommandTest.class.st
+++ b/src/PharoLauncher-Tests-Commands/PhLDeleteVmCommandTest.class.st
@@ -19,24 +19,6 @@ PhLDeleteVmCommandTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : #tests }
-PhLDeleteVmCommandTest >> testCanDeleteAPrivateVM [
-	| command vms |		
-	command := PhLDeleteVmCommand new.
-	command context: presenter.
-	presenter 
-		showPrivateVms;
-		createVmNamed: 'Bar' private: true;
-		selection: { presenter vmFor: 'Bar' private: true }.
-	
-	command execute.
-	
-	vms := command vmsPresenter vmNames.
-	self
-		assertCollection: vms
-		hasSameElements: #().
-]
-
 { #category : #tests }
 PhLDeleteVmCommandTest >> testCanDeleteAVM [
 	| command vms |
@@ -52,27 +34,6 @@ PhLDeleteVmCommandTest >> testCanDeleteAVM [
 		hasSameElements: #('Foo').
 ]
 
-{ #category : #tests }
-PhLDeleteVmCommandTest >> testCanDeleteManyPrivateVms [
-	| command vms |		
-	command := PhLDeleteVmCommand new.
-	command context: presenter.
-	presenter 
-		showPrivateVms;
-		createVmNamed: 'Foo' private: true;
-		createVmNamed: 'Bar' private: true;
-		createVmNamed: 'Zee' private: true;
-		selection: { presenter vmFor: 'Foo' private: true .
-						presenter vmFor: 'Bar' private: true }.
-	
-	command execute.
-	
-	vms := command vmsPresenter vmNames.
-	self
-		assertCollection: vms
-		hasSameElements: #('Zee').
-]
-
 { #category : #tests }
 PhLDeleteVmCommandTest >> testCanDeleteManyVms [
 	| command vms |		
@@ -80,7 +41,7 @@ PhLDeleteVmCommandTest >> testCanDeleteManyVms [
 	command context: presenter.
 	presenter createVmNamed: 'Foo'.
 	vms := {presenter singleVmName . 'Foo'}
-		collect: [:each | presenter vmFor: each private: false ].
+		collect: [:each | presenter vmFor: each ].
 	presenter selection: vms.
 	
 	command execute.
diff --git a/src/PharoLauncher-Tests-Commands/PhLTestVirtualMachineManager.class.st b/src/PharoLauncher-Tests-Commands/PhLTestVirtualMachineManager.class.st
index f46b429cb..2cb1fab19 100644
--- a/src/PharoLauncher-Tests-Commands/PhLTestVirtualMachineManager.class.st
+++ b/src/PharoLauncher-Tests-Commands/PhLTestVirtualMachineManager.class.st
@@ -23,16 +23,8 @@ PhLTestVirtualMachineManager class >> vmStore [
 
 { #category : #adding }
 PhLTestVirtualMachineManager >> createVmNamed: aName [
-	self createVmNamed: aName private: false
-]
-
-{ #category : #initialization }
-PhLTestVirtualMachineManager >> createVmNamed: aName private: isPrivateVm [
-	| vmDirectory appDir root |
-	root := isPrivateVm 
-		ifTrue: [ self vmStore / 'private' ] 
-		ifFalse: [ self vmStore ].
-	vmDirectory := root / aName.
+	| vmDirectory appDir  |
+	vmDirectory := self vmStore / aName.
 	vmDirectory ensureCreateDirectory.
 	"needed on OS X"
 	appDir := (vmDirectory / 'Pharo.app') ensureCreateDirectory.
diff --git a/src/PharoLauncher-Tests-Commands/PhLTestVmPresenter.class.st b/src/PharoLauncher-Tests-Commands/PhLTestVmPresenter.class.st
index 3855adb5c..3a9c2f97b 100644
--- a/src/PharoLauncher-Tests-Commands/PhLTestVmPresenter.class.st
+++ b/src/PharoLauncher-Tests-Commands/PhLTestVmPresenter.class.st
@@ -15,16 +15,8 @@ Class {
 
 { #category : #adding }
 PhLTestVmPresenter >> createVmNamed: aName [
-	self createVmNamed: aName private: false
-]
-
-{ #category : #adding }
-PhLTestVmPresenter >> createVmNamed: aName private: isPrivateVm [
-	| vmDirectory appDir root |
-	root := isPrivateVm 
-		ifTrue: [ vmStoreRoot / 'private' ] 
-		ifFalse: [ vmStoreRoot ].
-	vmDirectory := root / aName.
+	| vmDirectory appDir |
+	vmDirectory := vmStoreRoot / aName.
 	vmDirectory ensureCreateDirectory.
 	"needed on OS X"
 	appDir := (vmDirectory / 'Pharo.app') ensureCreateDirectory.
@@ -42,8 +34,7 @@ PhLTestVmPresenter >> initialize [
 	(vmStoreRoot / 'private') ensureCreateDirectory.
 	datasource := PhLVirtualMachinesDataSource
 		vmsBlock:
-			[ vmStoreRoot directoryNames reject: [ :name | name = 'private' ] ]
-		privateVmsBlock: [ (vmStoreRoot / 'private') directoryNames ].
+			[ vmStoreRoot directoryNames reject: [ :name | name = 'private' ] ].
 	self model: datasource.
 	self createVmNamed: self singleVmName.
 	super initialize
@@ -58,7 +49,7 @@ PhLTestVmPresenter >> newConfirmation [
 PhLTestVmPresenter >> selectedVms [
 	^ selection 
 		ifNotNil: [ selection ]
-		ifNil: [ { self vmFor: self singleVmName private: false } ]
+		ifNil: [ { self vmFor: self singleVmName } ]
 ]
 
 { #category : #configuring }
@@ -72,21 +63,15 @@ PhLTestVmPresenter >> singleVmName [
 ]
 
 { #category : #private }
-PhLTestVmPresenter >> vmFor: aName private: isPrivateVm [
-	| root vm |
-	root := isPrivateVm 
-		ifTrue: [ vmStoreRoot / 'private' ] 
-		ifFalse: [ vmStoreRoot ].
-	vm := PhLVirtualMachine
-		directory: root / aName
-		private: isPrivateVm.
+PhLTestVmPresenter >> vmFor: aName [
+
+	| vm |
+	vm := PhLVirtualMachine directory: vmStoreRoot / aName.
 	vm manager: PhLTestVirtualMachineManager new.
 	^ vm
 ]
 
 { #category : #querying }
 PhLTestVmPresenter >> vmNames [
-	^ shouldShowPrivateVms 
-		ifTrue:[ self datasource privateVirtualMachines ]
-		ifFalse: [ self datasource virtualMachines ]
+	^ self datasource virtualMachines
 ]
diff --git a/src/PharoLauncher-Tests-Commands/PhLToggleVmPrivateVmCommandTest.class.st b/src/PharoLauncher-Tests-Commands/PhLToggleVmPrivateVmCommandTest.class.st
deleted file mode 100644
index 695b97a01..000000000
--- a/src/PharoLauncher-Tests-Commands/PhLToggleVmPrivateVmCommandTest.class.st
+++ /dev/null
@@ -1,68 +0,0 @@
-Class {
-	#name : #PhLToggleVmPrivateVmCommandTest,
-	#superclass : #TestCase,
-	#instVars : [
-		'presenter'
-	],
-	#category : #'PharoLauncher-Tests-Commands'
-}
-
-{ #category : #running }
-PhLToggleVmPrivateVmCommandTest >> setUp [
-	super setUp.
-	presenter := PhLTestVmPresenter new
-]
-
-{ #category : #running }
-PhLToggleVmPrivateVmCommandTest >> tearDown [
-	PhLTestVirtualMachineManager reset.
-	super tearDown
-]
-
-{ #category : #tests }
-PhLToggleVmPrivateVmCommandTest >> testPrivateVmsShownWhenButtonToggledOnce [
-	| command vms |
-	command := PhLToggleVmPrivateVmCommand new.
-	command context: presenter.
-	presenter createVmNamed: 'PrivateTestVM' private: true.
-	
-	command execute.
-	
-	vms := command vmsPresenter vmNames.
-	self
-		assertCollection: vms
-		hasSameElements: #('PrivateTestVM').
-]
-
-{ #category : #tests }
-PhLToggleVmPrivateVmCommandTest >> testVmsShownAtStartup [
-	| command vms |
-	command := PhLToggleVmPrivateVmCommand new.
-	command context: presenter.
-	presenter createVmNamed: 'PrivateTestVM' private: true.
-	
-	"NOOP we are testing the initial state"
-	
-	vms := command vmsPresenter vmNames.
-	self
-		assertCollection: vms
-		hasSameElements: {presenter singleVmName}.
-]
-
-{ #category : #tests }
-PhLToggleVmPrivateVmCommandTest >> testVmsShownWhenButtonToggledTwice [
-	| command vms |
-	command := PhLToggleVmPrivateVmCommand new.
-	command context: presenter.
-	presenter createVmNamed: 'Foo'.
-	presenter createVmNamed: 'PrivateTestVM' private: true.
-	
-	command
-		execute;
-		execute.
-	
-	vms := command vmsPresenter vmNames.
-	self
-		assertCollection: vms
-		hasSameElements: {presenter singleVmName . 'Foo'}.
-]
diff --git a/src/PharoLauncher-Tests-Commands/PhLUpdateVmCommandTest.class.st b/src/PharoLauncher-Tests-Commands/PhLUpdateVmCommandTest.class.st
index 32b6f467d..95070f37f 100644
--- a/src/PharoLauncher-Tests-Commands/PhLUpdateVmCommandTest.class.st
+++ b/src/PharoLauncher-Tests-Commands/PhLUpdateVmCommandTest.class.st
@@ -19,31 +19,6 @@ PhLUpdateVmCommandTest >> tearDown [
 	super tearDown
 ]
 
-{ #category : #tests }
-PhLUpdateVmCommandTest >> testCanUpdateManyPrivateVms [
-	| command vms vmFolderEntries |
-	command := PhLUpdateVmCommand new.
-	command context: presenter.
-	presenter 
-		showPrivateVms;
-		createVmNamed: '6504' private: true;
-		createVmNamed: '68021' private: true;
-		selection: { 
-			presenter vmFor: '6504' private: true .
-			presenter vmFor: '68021' private: true }.
-	
-	command execute.
-	
-	vms := presenter vmNames.
-	self
-		assertCollection: vms
-		hasSameElements: #('68021' '6504').
-	vmFolderEntries := (presenter selectedVms first vmStore / '68021') entries.
-	self 
-		assertCollection: (vmFolderEntries collect: #name)
-		hasSameElements: #('pharo' 'Pharo.app' 'fetched!').
-]
-
 { #category : #tests }
 PhLUpdateVmCommandTest >> testCanUpdateManyVms [
 	| command fooVmName vms vmFolderEntries |
@@ -52,7 +27,7 @@ PhLUpdateVmCommandTest >> testCanUpdateManyVms [
 	fooVmName := '90-Foo'.
 	presenter createVmNamed: fooVmName.
 	vms := {fooVmName . presenter singleVmName}
-		collect: [:each | presenter vmFor: each private: false ].
+		collect: [:each | presenter vmFor: each ].
 	presenter selection: vms.
 	
 	command execute.
diff --git a/src/PharoLauncher-Tests-Core/PhLImage.extension.st b/src/PharoLauncher-Tests-Core/PhLImage.extension.st
new file mode 100644
index 000000000..2472db258
--- /dev/null
+++ b/src/PharoLauncher-Tests-Core/PhLImage.extension.st
@@ -0,0 +1,7 @@
+Extension { #name : #PhLImage }
+
+{ #category : #'*PharoLauncher-Tests-Core' }
+PhLImage >> pharoVersion: aVersionString [
+	"only to be used by tests"
+	pharoVersion := aVersionString
+]
diff --git a/src/PharoLauncher-Tests-Core/PhLImageTest.class.st b/src/PharoLauncher-Tests-Core/PhLImageTest.class.st
index e28c6eb44..569511b67 100644
--- a/src/PharoLauncher-Tests-Core/PhLImageTest.class.st
+++ b/src/PharoLauncher-Tests-Core/PhLImageTest.class.st
@@ -29,7 +29,8 @@ PhLImageTest >> setUp [
 	fs := FileSystem memory root.
 	imageFileRef := fs / 'foo.image'.
 	imageFileRef binaryWriteStreamDo: [ :stream | (ZnEndianessReadWriteStream on: stream) nextLittleEndianNumber: 4 put: 68021 ].
-	image := PhLImage location: imageFileRef
+	image := PhLImage location: imageFileRef.
+	image pharoVersion: '110'
 ]
 
 { #category : #tests }
@@ -199,6 +200,7 @@ PhLImageTest >> testPharoVersionIsSetWhenNoVersionInMetadataButPharoVersionFileE
 	| version |
 	
 	version := '60'.
+	image pharoVersion: nil.
 	image versionFile 
 		writeStreamDo: [ :stream | stream nextPutAll: version ].
 
diff --git a/src/PharoLauncher-Tests-Core/PhLLaunchConfigurationTest.class.st b/src/PharoLauncher-Tests-Core/PhLLaunchConfigurationTest.class.st
index ef2891c23..f639e1320 100644
--- a/src/PharoLauncher-Tests-Core/PhLLaunchConfigurationTest.class.st
+++ b/src/PharoLauncher-Tests-Core/PhLLaunchConfigurationTest.class.st
@@ -14,15 +14,6 @@ PhLLaunchConfigurationTest >> pharo80HeadlessVm [
 			yourself
 ]
 
-{ #category : #running }
-PhLLaunchConfigurationTest >> setUp [
-	super setUp.
-	(fs / PhLImage versionFileName)
-		binaryWriteStreamDo: [ :stream | stream nextPutAll: '70' ].
-	
-
-]
-
 { #category : #helper }
 PhLLaunchConfigurationTest >> stripExportFrom: arguments [ 
 	^ arguments first = 'export'
@@ -40,15 +31,14 @@ PhLLaunchConfigurationTest >> testCanGetDefaultVm [
 	self assert: (vm isKindOf: PhLVirtualMachine).
 	self 
 		assert: vm id
-		equals: '70-x64'.
+		equals: image pharoVersion, '-x64'.
 ]
 
 { #category : #tests }
 PhLLaunchConfigurationTest >> testCanGetDefaultVmWhenVMNotListedInVmManager [
 	| launchConfig vm |
+	image pharoVersion: '770'.
 	launchConfig := PhLLaunchConfiguration defaultWithImage: image.
-	(fs / PhLImage versionFileName)
-		binaryWriteStreamDo: [ :stream | stream nextPutAll: '770' ].
 
 	vm := launchConfig vm.
 	
diff --git a/src/PharoLauncher-Tests-Download/PhLVirtualMachineManagerTest.class.st b/src/PharoLauncher-Tests-Download/PhLVirtualMachineManagerTest.class.st
index 2ce150519..9bf6b26d4 100644
--- a/src/PharoLauncher-Tests-Download/PhLVirtualMachineManagerTest.class.st
+++ b/src/PharoLauncher-Tests-Download/PhLVirtualMachineManagerTest.class.st
@@ -94,25 +94,7 @@ PhLVirtualMachineManagerTest >> testGetExceptionWhenRunningImageVersionFromFileW
 		
 	self
 		should: [ vmManager imageVersionFromFile ]
-		raise: PhLImageVersionDeterminationError 
-]
-
-{ #category : #tests }
-PhLVirtualMachineManagerTest >> testImageVersionDeterminationScriptIsUpdatedWhenFileContentDifferentFromScriptInImage [
-	| vmManager scriptPath |
-	vmManager := PhLVirtualMachineManager new.
-	scriptPath := vmManager imageVersionDeterminationScriptPath.
-	
-	scriptPath asFileReference
-		ensureDelete;
-		writeStreamDo: [ :stream | stream nextPutAll: 'foo' ].
-	self 
-		assert: scriptPath asFileReference contents 
-		equals: 'foo'.	
-	
-	vmManager imageVersionDeterminationScriptPath. "Should update the file with right content"
-	
-	self deny: (scriptPath asFileReference contents includesSubstring: 'foo')
+		raise: PhLImageVersionFileNotFound 
 ]
 
 { #category : #tests }
diff --git a/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st b/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st
index b3b3e003e..c7df9637f 100644
--- a/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st
+++ b/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st
@@ -81,7 +81,7 @@ PhLLaunchImageTest >> tearDown [
 { #category : #tests }
 PhLLaunchImageTest >> testArchitectureErrorSignaledWhenTryingToRun32BitImageOn64BitOnlyOS [
 	| image |
-	image := PhLOsXMojaveTestImage example32.
+	image := PhLOsXCatalinaTestImage example32.
 	
 	self 
 		should: [ process := image launchWithConfiguration: nil ]
@@ -118,12 +118,11 @@ PhLLaunchImageTest >> testCanLaunchImageWithNonAsciiCharactersUsingLoginShell [
 { #category : #tests }
 PhLLaunchImageTest >> testCanRun64bitImageOn64BitOnlyOS [
 	| image config commandToEval |
-	image := PhLOsXMojaveTestImage example.
+	image := PhLOsXCatalinaTestImage example.
+	image pharoVersion: '80'.
 	commandToEval := '"''' , imageDir fullName , '/result'' asFileReference writeStreamDo:[ :s | s nextPutAll: (1 + 1) asString ]"'.
 	config := image defaultLaunchConfiguration.
-	config
-		vm: self pharo80x86Vm;
-		imageArguments: {'eval' . commandToEval}.
+	config	 imageArguments: {'eval' . commandToEval}.
 	
 	self 
 		shouldnt: [ process := image launchWithConfiguration: config ]
diff --git a/src/PharoLauncher-Tests-Functional/PhLOsXCatalinaTestImage.class.st b/src/PharoLauncher-Tests-Functional/PhLOsXCatalinaTestImage.class.st
new file mode 100644
index 000000000..35bbc7a52
--- /dev/null
+++ b/src/PharoLauncher-Tests-Functional/PhLOsXCatalinaTestImage.class.st
@@ -0,0 +1,20 @@
+"
+Class used for test purpose.
+I override the default OS to return Mac Os Catalina 10.15.
+It is used to test support of 32-bit app as  Mac Os Catalina is the first Mac Os version to drop support of 32-bit apps.
+"
+Class {
+	#name : #PhLOsXCatalinaTestImage,
+	#superclass : #PhLImage,
+	#category : #'PharoLauncher-Tests-Functional'
+}
+
+{ #category : #testing }
+PhLOsXCatalinaTestImage class >> isSubclassForLocation: aFileReference [ 
+	^ false
+]
+
+{ #category : #'private - accessing' }
+PhLOsXCatalinaTestImage >> os [
+	^ TestMacOSXCatalinaPlatform new
+]
diff --git a/src/PharoLauncher-Tests-Functional/PhLOsXMojaveTestImage.class.st b/src/PharoLauncher-Tests-Functional/PhLOsXMojaveTestImage.class.st
deleted file mode 100644
index ea9623616..000000000
--- a/src/PharoLauncher-Tests-Functional/PhLOsXMojaveTestImage.class.st
+++ /dev/null
@@ -1,19 +0,0 @@
-"
-Class used for test purpose.
-I override the default OS to return OS X Mojave 10.15 (used to test support of 32-bit app)
-"
-Class {
-	#name : #PhLOsXMojaveTestImage,
-	#superclass : #PhLImage,
-	#category : #'PharoLauncher-Tests-Functional'
-}
-
-{ #category : #testing }
-PhLOsXMojaveTestImage class >> isSubclassForLocation: aFileReference [ 
-	^ false
-]
-
-{ #category : #'private - accessing' }
-PhLOsXMojaveTestImage >> os [
-	^ TestMacOSXMojavePlatform new
-]
diff --git a/src/PharoLauncher-Tests-Functional/PhLPrivateVirtualMachineTest.class.st b/src/PharoLauncher-Tests-Functional/PhLPrivateVirtualMachineTest.class.st
deleted file mode 100644
index a50872a20..000000000
--- a/src/PharoLauncher-Tests-Functional/PhLPrivateVirtualMachineTest.class.st
+++ /dev/null
@@ -1,18 +0,0 @@
-Class {
-	#name : #PhLPrivateVirtualMachineTest,
-	#superclass : #TestCase,
-	#traits : 'TPhLVirtualMachineTestUtil',
-	#classTraits : 'TPhLVirtualMachineTestUtil classTrait',
-	#category : 'PharoLauncher-Tests-Functional'
-}
-
-{ #category : #tests }
-PhLPrivateVirtualMachineTest >> testCanGetDownloadUrl [
-	| vm |
-	vm := PhLPrivateVirtualMachine new 
-		basicInitializeOn: FileSystem memory / '6521';
-		yourself.
-	self 
-		assert: (self replaceOSByMacIn: vm downloadUrl)
-		equals: 'https://files.pharo.org/get-files/70/pharo-mac-stable.zip'
-]
diff --git a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerFunctionalTest.class.st b/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerFunctionalTest.class.st
index c7f3add70..0d548ee5a 100644
--- a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerFunctionalTest.class.st
+++ b/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerFunctionalTest.class.st
@@ -45,88 +45,16 @@ PhLVirtualMachineManagerFunctionalTest >> testCanDetectSystemUnzip [
 { #category : #tests }
 PhLVirtualMachineManagerFunctionalTest >> testCanGetImageVersion [
 
-	| version |
-	self timeLimit: 30 seconds.
-
-	PhLVirtualMachineManagerTestResource current 
-		withCopyOfPharo90ImageDo: [ :imageRef | 
-			version := (PhLVirtualMachineManager forImage: imageRef)
-				           imageVersion.
-			self assert: version equals: '90' ]
-]
-
-{ #category : #tests }
-PhLVirtualMachineManagerFunctionalTest >> testCanGetImageVersionFromFileWhenRunningExtraVM [
-
-	| vmManager |
-	self timeLimit: 30 seconds.
-
-	PhLVirtualMachineManagerTestResource current
-		withCopyOfPharo90ImageDo: [ :imageRef | 
-			vmManager := PhLVirtualMachineManager forImage: imageRef.
-			vmManager imageVersionFile ensureDelete.
-
-			self assert: vmManager imageVersion equals: '90' ]
-]
-
-{ #category : #tests }
-PhLVirtualMachineManagerFunctionalTest >> testCanGetImageVersionFromFileWithRightCommand [
-	| vmManager command |
-	self timeLimit: 30 seconds.
-	
-	vmManager := PhLVirtualMachineManager forImage: Smalltalk image lastImagePath.
-	vmManager imageVersionFile ensureDelete.
-	command := PhLProcessWrapper new 
-		shellCommand;
-		addArguments: 'echo 60 >';
-		addArgument: vmManager imageVersionFile fullName surroundedByDoubleQuotes.
-		
-	self
-		assert: (vmManager imageVersionFromFileWith: command)
-		equals: '60'
-]
-
-{ #category : #tests }
-PhLVirtualMachineManagerFunctionalTest >> testCanGetImageVersionFromPharo14Image [
-
-	| vmManager |
-	self skip: 'skip this test for now to allow a release soon'.
-	self timeLimit: 60 seconds.
-
-	PhLVirtualMachineManagerTestResource current 
-		withCopyOfPharo14ImageDo: [ :imageRef | 
-			vmManager := PhLVirtualMachineManager forImage: imageRef.
-			vmManager imageVersionFile ensureDelete.
-
-			self assert: vmManager imageVersion equals: '14' ]
-]
-
-{ #category : #tests }
-PhLVirtualMachineManagerFunctionalTest >> testGetExceptionWhenRunningImageVersionFromFileWithBadCommand [
-
-	| vmManager command |
-	command := PhLProcessWrapper new
-		           shellCommand;
-		           addArgument: 'foo'.
-
-	PhLVirtualMachineManagerTestResource current 
-		withCopyOfPharo90ImageDo: [ :imageRef | 
-			vmManager := PhLVirtualMachineManager forImage: imageRef.
-			vmManager imageVersionFile ensureDelete.
-
-			self
-				should: [ vmManager imageVersionFromFileWith: command ]
-				raise: PhLImageVersionDeterminationError ]
-]
-
-{ #category : #tests }
-PhLVirtualMachineManagerFunctionalTest >> testImageVersionDeterminationIsRunWithoutSettings [
-	| manager command |
-	manager := PhLVirtualMachineManager forImage: Smalltalk image lastImagePath.
+	| vmManager expectedVersion imageRef |
 	
-	command := manager imageVersionCommandWithPreferences: false.
 	
-	self assert: (command arguments includes: '--no-default-preferences')
+	expectedVersion := '110'.
+	imageRef :=  PhLVirtualMachineManagerTestResource current workspace / 'Pharo.image'.
+	vmManager := PhLVirtualMachineManager forImage: imageRef.
+	vmManager imageVersionFile ensureDelete.
+	vmManager imageVersionFile writeStreamDo: [ :stream | stream nextPutAll: expectedVersion ].
+			
+	self assert: vmManager imageVersion equals: expectedVersion
 ]
 
 { #category : #tests }
diff --git a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerTestResource.class.st b/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerTestResource.class.st
index b6ea71144..379c52275 100644
--- a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerTestResource.class.st
+++ b/src/PharoLauncher-Tests-Functional/PhLVirtualMachineManagerTestResource.class.st
@@ -31,15 +31,6 @@ PhLVirtualMachineManagerTestResource >> cleanWorkspace [
 		ensureCreateDirectory.
 ]
 
-{ #category : #downloading }
-PhLVirtualMachineManagerTestResource >> downloadCompatibleVm64Bit [
-	| vmManager |
-	vmManager := PhLVirtualMachineManager forImage: self pharo90image.
-	vmManager availableVirtualMachinesByImageFormat
-		at: vmManager imageFormatNumber asString
-		ifAbsent: [ vmManager fetchCompatibleVm ]  
-]
-
 { #category : #downloading }
 PhLVirtualMachineManagerTestResource >> downloadPharo14Image [
 
diff --git a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineTest.class.st b/src/PharoLauncher-Tests-Functional/PhLVirtualMachineTest.class.st
index c9c35124d..aee3fb13b 100644
--- a/src/PharoLauncher-Tests-Functional/PhLVirtualMachineTest.class.st
+++ b/src/PharoLauncher-Tests-Functional/PhLVirtualMachineTest.class.st
@@ -32,6 +32,7 @@ PhLVirtualMachineTest >> testCanDetect64BitArchPath [
 PhLVirtualMachineTest >> testCanDetectExecutablePath [
 	"WARNING: this test is Linux specific!"
 	| vm vmFolder |
+	self onPharoCITestingEnvironment ifFalse: [ self skip ].
 	Smalltalk os isWindows ifTrue: [ self skip. ^ self  ].
 	
 	vmFolder := FileLocator imageDirectory asFileReference / 'pharo-vm'.
@@ -43,8 +44,9 @@ PhLVirtualMachineTest >> testCanDetectExecutablePath [
 
 { #category : #tests }
 PhLVirtualMachineTest >> testCanDetectVMDirectory [
-	"WARNING: this test is Linux specific!"
+	"WARNING: this test is CI and Linux specific!"
 	| vm |
+	self onPharoCITestingEnvironment ifFalse: [ self skip ].
 	Smalltalk os isWindows ifTrue: [ self skip. ^ self  ].
 	
 	vm := PhLVirtualMachine directory: FileLocator imageDirectory asFileReference / 'pharo-vm'.
diff --git a/src/PharoLauncher-Tests-Functional/TestMacOSXCatalinaPlatform.class.st b/src/PharoLauncher-Tests-Functional/TestMacOSXCatalinaPlatform.class.st
new file mode 100644
index 000000000..1f72479dc
--- /dev/null
+++ b/src/PharoLauncher-Tests-Functional/TestMacOSXCatalinaPlatform.class.st
@@ -0,0 +1,13 @@
+"
+I'm used to represent a Mac OS X Catalina operating system for test purposes.
+"
+Class {
+	#name : #TestMacOSXCatalinaPlatform,
+	#superclass : #MacOSXPlatform,
+	#category : #'PharoLauncher-Tests-Functional'
+}
+
+{ #category : #accessing }
+TestMacOSXCatalinaPlatform >> version [ 
+	^ '1015.1'
+]
diff --git a/src/PharoLauncher-Tests-Functional/TestMacOSXMojavePlatform.class.st b/src/PharoLauncher-Tests-Functional/TestMacOSXMojavePlatform.class.st
deleted file mode 100644
index 3db72a4fd..000000000
--- a/src/PharoLauncher-Tests-Functional/TestMacOSXMojavePlatform.class.st
+++ /dev/null
@@ -1,13 +0,0 @@
-"
-I'm used to represent a Mac OS X Mojave operating system for test purposes
-"
-Class {
-	#name : #TestMacOSXMojavePlatform,
-	#superclass : #MacOSXPlatform,
-	#category : #'PharoLauncher-Tests-Functional'
-}
-
-{ #category : #accessing }
-TestMacOSXMojavePlatform >> version [ 
-	^ '1015.1'
-]