diff --git a/.github/workflows/check_profiles.yml b/.github/workflows/check_profiles.yml
index e8404d9e4e6..3b0e69b81a8 100644
--- a/.github/workflows/check_profiles.yml
+++ b/.github/workflows/check_profiles.yml
@@ -41,7 +41,7 @@ jobs:
           curl -L -o OrcaSlicer_profile_validator https://github.com/OrcaSlicer/OrcaSlicer/releases/download/nightly-builds/OrcaSlicer_profile_validator_Linux_Ubuntu2404_nightly
           chmod +x ./OrcaSlicer_profile_validator
 
-      # validate profiles
+      # Validate all system profiles.
       - name: validate system profiles
         id: validate_system
         continue-on-error: true
@@ -57,20 +57,6 @@ jobs:
           set +e
           ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 -v BBL -f 2>&1 | tee ${{ runner.temp }}/validate_filament_subtypes.log
           exit ${PIPESTATUS[0]}
-      # Flag inherits/compatible_printers/compatible_prints references that point at a deleted or
-      # renamed preset. Opt-in per vendor for now (via -r); enabled for BBL and Qidi until other
-      # vendors' profiles are cleaned up. Runs before the custom-preset injection below.
-      - name: validate preset references for BBL and Qidi profiles
-        id: validate_preset_references
-        continue-on-error: true
-        run: |
-          set +e
-          rc=0
-          for v in BBL Qidi; do
-            ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 -v "$v" -r 2>&1 | tee -a ${{ runner.temp }}/validate_preset_references.log
-            [ ${PIPESTATUS[0]} -ne 0 ] && rc=1
-          done
-          exit $rc
 
       - name: validate custom presets
         id: validate_custom
@@ -180,7 +166,7 @@ jobs:
           echo "${{ github.event.pull_request.number }}" > ${{ runner.temp }}/profile-check-results/pr_number.txt
 
       - name: Prepare comment artifact
-        if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_preset_references.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
+        if: ${{ always() && github.event_name == 'pull_request' && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
         run: |
           {
             # Marker matched by check_profiles_comment.yml to delete prior comments.
@@ -215,15 +201,6 @@ jobs:
               echo ""
             fi
 
-            if [ "${{ steps.validate_preset_references.outcome }}" = "failure" ]; then
-              echo "### BBL/Qidi Preset Reference Validation Failed"
-              echo ""
-              echo '```'
-              head -c 30000 ${{ runner.temp }}/validate_preset_references.log || echo "No output captured"
-              echo '```'
-              echo ""
-            fi
-
             if [ "${{ steps.validate_custom.outcome }}" = "failure" ]; then
               echo "### Custom Preset Validation Failed"
               echo ""
@@ -246,7 +223,7 @@ jobs:
           retention-days: 1
 
       - name: Fail if any check failed
-        if: ${{ always() && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_preset_references.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
+        if: ${{ always() && (steps.extra_json_check.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
         run: |
           echo "One or more profile checks failed. See above for details."
           exit 1
diff --git a/resources/profiles/Afinia.json b/resources/profiles/Afinia.json
index 1ffbbcdb616..a11cc0ecf68 100644
--- a/resources/profiles/Afinia.json
+++ b/resources/profiles/Afinia.json
@@ -1,6 +1,6 @@
 {
 	"name": "Afinia",
-	"version": "02.04.00.01",
+	"version": "02.04.00.02",
 	"force_update": "0",
 	"description": "Afinia configurations",
 	"machine_model_list": [
@@ -124,14 +124,6 @@
 			"name": "fdm_filament_tpu",
 			"sub_path": "filament/fdm_filament_tpu.json"
 		},
-		{
-			"name": "Afinia ABS",
-			"sub_path": "filament/Afinia ABS.json"
-		},
-		{
-			"name": "Afinia ABS+",
-			"sub_path": "filament/Afinia ABS+.json"
-		},
 		{
 			"name": "Afinia ABS+@HS",
 			"sub_path": "filament/Afinia ABS+@HS.json"
@@ -140,34 +132,18 @@
 			"name": "Afinia ABS@HS",
 			"sub_path": "filament/Afinia ABS@HS.json"
 		},
-		{
-			"name": "Afinia Value ABS",
-			"sub_path": "filament/Afinia Value ABS.json"
-		},
 		{
 			"name": "Afinia Value ABS@HS",
 			"sub_path": "filament/Afinia Value ABS@HS.json"
 		},
-		{
-			"name": "Afinia PLA",
-			"sub_path": "filament/Afinia PLA.json"
-		},
 		{
 			"name": "Afinia PLA@HS",
 			"sub_path": "filament/Afinia PLA@HS.json"
 		},
-		{
-			"name": "Afinia Value PLA",
-			"sub_path": "filament/Afinia Value PLA.json"
-		},
 		{
 			"name": "Afinia Value PLA@HS",
 			"sub_path": "filament/Afinia Value PLA@HS.json"
 		},
-		{
-			"name": "Afinia TPU",
-			"sub_path": "filament/Afinia TPU.json"
-		},
 		{
 			"name": "Afinia TPU@HS",
 			"sub_path": "filament/Afinia TPU@HS.json"
diff --git a/resources/profiles/Afinia/filament/Afinia ABS+.json b/resources/profiles/Afinia/filament/Afinia ABS+.json
deleted file mode 100644
index 74308bad42a..00000000000
--- a/resources/profiles/Afinia/filament/Afinia ABS+.json	
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB00",
-	"setting_id": "i5tf9foHnTVNmA2r",
-	"name": "Afinia ABS+",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "fdm_filament_abs",
-	"filament_flow_ratio": [
-		"0.95"
-	],
-	"filament_cost": [
-		"24.99"
-	],
-	"filament_vendor": [
-		"Afinia"
-	],
-	"fan_max_speed": [
-		"60"
-	],
-	"filament_max_volumetric_speed": [
-		"16"
-	],
-	"nozzle_temperature": [
-		"275"
-	],
-	"nozzle_temperature_initial_layer": [
-		"275"
-	],
-	"slow_down_layer_time": [
-		"12"
-	],
-	"compatible_printers": [
-		"Afinia H400 Pro 0.4 nozzle",
-		"Afinia H400 Pro 0.6 nozzle"
-	]
-}
diff --git a/resources/profiles/Afinia/filament/Afinia ABS.json b/resources/profiles/Afinia/filament/Afinia ABS.json
deleted file mode 100644
index d51254c1b93..00000000000
--- a/resources/profiles/Afinia/filament/Afinia ABS.json	
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB00",
-	"setting_id": "LhDHvMepbh8ecfQT",
-	"name": "Afinia ABS",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "fdm_filament_abs",
-	"filament_flow_ratio": [
-		"0.95"
-	],
-	"filament_cost": [
-		"24.99"
-	],
-	"filament_vendor": [
-		"Afinia"
-	],
-	"fan_max_speed": [
-		"60"
-	],
-	"filament_max_volumetric_speed": [
-		"16"
-	],
-	"slow_down_layer_time": [
-		"12"
-	],
-	"compatible_printers": [
-		"Afinia H400 Pro 0.4 nozzle",
-		"Afinia H400 Pro 0.6 nozzle"
-	]
-}
diff --git a/resources/profiles/Afinia/filament/Afinia PLA.json b/resources/profiles/Afinia/filament/Afinia PLA.json
deleted file mode 100644
index c04d368e42e..00000000000
--- a/resources/profiles/Afinia/filament/Afinia PLA.json	
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFA00",
-	"setting_id": "1qEFsay7kjYIUkpG",
-	"name": "Afinia PLA",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "fdm_filament_pla",
-	"filament_cost": [
-		"24.99"
-	],
-	"filament_density": [
-		"1.26"
-	],
-	"filament_flow_ratio": [
-		"0.98"
-	],
-	"filament_max_volumetric_speed": [
-		"21"
-	],
-	"filament_vendor": [
-		"Afinia"
-	],
-	"filament_long_retractions_when_cut": [
-		"1"
-	],
-	"filament_retraction_distances_when_cut": [
-		"18"
-	],
-	"compatible_printers": [
-		"Afinia H400 Pro 0.4 nozzle",
-		"Afinia H400 Pro 0.6 nozzle"
-	]
-}
diff --git a/resources/profiles/Afinia/filament/Afinia TPU.json b/resources/profiles/Afinia/filament/Afinia TPU.json
deleted file mode 100644
index d4310612b34..00000000000
--- a/resources/profiles/Afinia/filament/Afinia TPU.json	
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"type": "filament",
-	"name": "Afinia TPU",
-	"inherits": "fdm_filament_tpu",
-	"from": "system",
-	"setting_id": "E7WBTARZ971LaDMj",
-	"filament_id": "GFU01",
-	"instantiation": "true",
-	"filament_vendor": [
-		"Afinia"
-	],
-	"filament_density": [
-		"1.22"
-	],
-	"nozzle_temperature_initial_layer": [
-		"230"
-	],
-	"filament_cost": [
-		"41.99"
-	],
-	"nozzle_temperature": [
-		"230"
-	],
-	"compatible_printers": [
-		"Afinia H400 Pro 0.4 nozzle",
-		"Afinia H400 Pro 0.6 nozzle"
-	]
-}
diff --git a/resources/profiles/Afinia/filament/Afinia Value ABS.json b/resources/profiles/Afinia/filament/Afinia Value ABS.json
deleted file mode 100644
index 0036bea580c..00000000000
--- a/resources/profiles/Afinia/filament/Afinia Value ABS.json	
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFB00",
-	"setting_id": "jEYVpOPBjFtQ0DXn",
-	"name": "Afinia Value ABS",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "fdm_filament_abs",
-	"filament_flow_ratio": [
-		"0.95"
-	],
-	"filament_cost": [
-		"24.99"
-	],
-	"filament_vendor": [
-		"Afinia"
-	],
-	"fan_max_speed": [
-		"60"
-	],
-	"filament_max_volumetric_speed": [
-		"16"
-	],
-	"nozzle_temperature": [
-		"245"
-	],
-	"nozzle_temperature_initial_layer": [
-		"245"
-	],
-	"slow_down_layer_time": [
-		"12"
-	],
-	"compatible_printers": [
-		"Afinia H400 Pro 0.4 nozzle",
-		"Afinia H400 Pro 0.6 nozzle"
-	]
-}
diff --git a/resources/profiles/Afinia/filament/Afinia Value PLA.json b/resources/profiles/Afinia/filament/Afinia Value PLA.json
deleted file mode 100644
index 52d27a1f8c8..00000000000
--- a/resources/profiles/Afinia/filament/Afinia Value PLA.json	
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-	"type": "filament",
-	"filament_id": "GFA00",
-	"setting_id": "oNBk0IxmW7C99WI3",
-	"name": "Afinia Value PLA",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "fdm_filament_pla",
-	"filament_cost": [
-		"24.99"
-	],
-	"filament_density": [
-		"1.26"
-	],
-	"filament_flow_ratio": [
-		"0.98"
-	],
-	"filament_max_volumetric_speed": [
-		"21"
-	],
-	"filament_vendor": [
-		"Afinia"
-	],
-	"filament_long_retractions_when_cut": [
-		"1"
-	],
-	"filament_retraction_distances_when_cut": [
-		"18"
-	],
-	"nozzle_temperature": [
-		"190"
-	],
-	"nozzle_temperature_initial_layer": [
-		"190"
-	],
-	"compatible_printers": [
-		"Afinia H400 Pro 0.4 nozzle",
-		"Afinia H400 Pro 0.6 nozzle"
-	]
-}
diff --git a/resources/profiles/Blocks.json b/resources/profiles/Blocks.json
index 46df2204ef3..269391c4c3e 100644
--- a/resources/profiles/Blocks.json
+++ b/resources/profiles/Blocks.json
@@ -1,6 +1,6 @@
 {
 	"name": "Blocks",
-	"version": "02.04.00.01",
+	"version": "02.04.00.02",
 	"force_update": "0",
 	"description": "Blocks configurations",
 	"machine_model_list": [
diff --git a/resources/profiles/Blocks/filament/Blocks Generic ABS.json b/resources/profiles/Blocks/filament/Blocks Generic ABS.json
index abb5c988dc8..db6ee6f3c91 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic ABS.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic ABS.json	
@@ -85,10 +85,8 @@
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json b/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json
index d6d5a092efb..6836bee45e1 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic ASA-CF.json	
@@ -85,10 +85,8 @@
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/filament/Blocks Generic ASA.json b/resources/profiles/Blocks/filament/Blocks Generic ASA.json
index a3fa2a86e83..5601ef2264e 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic ASA.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic ASA.json	
@@ -85,10 +85,8 @@
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/filament/Blocks Generic PA-CF.json b/resources/profiles/Blocks/filament/Blocks Generic PA-CF.json
index 47732a6c9d4..a145a7f31d1 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic PA-CF.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic PA-CF.json	
@@ -91,10 +91,8 @@
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/filament/Blocks Generic PA.json b/resources/profiles/Blocks/filament/Blocks Generic PA.json
index edaee826f48..9c385d7cdb8 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic PA.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic PA.json	
@@ -16,10 +16,8 @@
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/filament/Blocks Generic PC.json b/resources/profiles/Blocks/filament/Blocks Generic PC.json
index a6519b1c0de..9d4e153f279 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic PC.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic PC.json	
@@ -16,10 +16,8 @@
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/filament/Blocks Generic PETG.json b/resources/profiles/Blocks/filament/Blocks Generic PETG.json
index 0c38a3155d7..8bfeaed6b9a 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic PETG.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic PETG.json	
@@ -87,14 +87,11 @@
 		"BLOCKS Pro S100 0.8 nozzle",
 		"BLOCKS Pro S100 1.0 nozzle",
 		"BLOCKS Pro S100 1.2 nozzle",
-		"BLOCKS Pro S100",
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json b/resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json
index 7568cdf5af4..5928bc953e1 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic PLA-CF.json	
@@ -22,10 +22,8 @@
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/filament/Blocks Generic PLA.json b/resources/profiles/Blocks/filament/Blocks Generic PLA.json
index 3f3838e22f4..bc8c34fc262 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic PLA.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic PLA.json	
@@ -45,14 +45,11 @@
 		"BLOCKS Pro S100 0.8 nozzle",
 		"BLOCKS Pro S100 1.0 nozzle",
 		"BLOCKS Pro S100 1.2 nozzle",
-		"BLOCKS Pro S100",
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/filament/Blocks Generic PVA.json b/resources/profiles/Blocks/filament/Blocks Generic PVA.json
index 2719cfe661a..becd53db6cf 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic PVA.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic PVA.json	
@@ -16,10 +16,8 @@
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/filament/Blocks Generic TPU.json b/resources/profiles/Blocks/filament/Blocks Generic TPU.json
index 5c04853ee8d..decdf2eaf10 100644
--- a/resources/profiles/Blocks/filament/Blocks Generic TPU.json	
+++ b/resources/profiles/Blocks/filament/Blocks Generic TPU.json	
@@ -60,14 +60,11 @@
 		"BLOCKS Pro S100 0.8 nozzle",
 		"BLOCKS Pro S100 1.0 nozzle",
 		"BLOCKS Pro S100 1.2 nozzle",
-		"BLOCKS Pro S100",
 		"BLOCKS RD50 V2 0.4 nozzle",
 		"BLOCKS RD50 V2 0.6 nozzle",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RF50 0.4 nozzle",
 		"BLOCKS RF50 0.6 nozzle",
-		"BLOCKS RF50 0.8 nozzle",
-		"BLOCKS RF50"
+		"BLOCKS RF50 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RD50_V2.json
index f59ea805165..8e2a5a26efa 100644
--- a/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "6",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RF50.json
index a91302462b9..86f9cb5adb3 100644
--- a/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.12mm Fine 0.4 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "6",
 	"top_shell_layers": "6",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.4 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RD50_V2.json
index 9858a56f29f..fa173b2bba2 100644
--- a/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "5",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json
index 76da4b89430..ae773410b3f 100644
--- a/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.16mm Optimal 0.4 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "5",
 	"top_shell_layers": "5",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.4 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RD50_V2.json
index 05c2f38cc11..2c390931899 100644
--- a/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "4",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RF50.json
index a9a24ad0428..7c02d847bcf 100644
--- a/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.20mm Optimal 0.6 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "4",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.6 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks.json
index 03c89e4f9d3..9f661962790 100644
--- a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "5",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RD50_V2.json
index 823ba2be234..ec45900e1e1 100644
--- a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "5",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json
index a0d141e2cd6..32beb61fe95 100644
--- a/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.20mm Standard 0.4 nozzle @Blocks_RF50.json	
@@ -14,7 +14,6 @@
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "5",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.4 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks.json
index b1d1fafd58f..2bc124f2dc9 100644
--- a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "5",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RD50_V2.json
index e6e44642ead..9a9bfb2f495 100644
--- a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "5",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RF50.json
index e6ff123bcd9..d9d6895c3d3 100644
--- a/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.24mm Draft 0.4 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "5",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.4 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RD50_V2.json
index 53086d13f2a..4a21f695353 100644
--- a/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "4",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json
index 50391de058f..67445549093 100644
--- a/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.26mm Standard 0.6 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "4",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.6 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RD50_V2.json
index e6d345c9572..7f4af4528f7 100644
--- a/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "4",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json
index 65cab8c4dc8..0b3b3246646 100644
--- a/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.28mm Extra Draft 0.4 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "4",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.4 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks.json
index 52b7bee4029..0cef66fb5a8 100644
--- a/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.30mm Extra Draft 0.4 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "4",
 	"layer_height": "0.30",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks.json
index f26d3e9dbde..bbb74c97a9c 100644
--- a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "3",
 	"layer_height": "0.3",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RD50_V2.json
index 0d6d4237487..26c4b0773b8 100644
--- a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "4",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RF50.json
index 6aaf2e307cd..704d3552218 100644
--- a/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.30mm Optimal 0.8 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "4",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.8 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks.json
index 8569bca91a6..8820018b9dd 100644
--- a/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.30mm Optimal 1.0 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "4",
 	"layer_height": "0.30",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 1.0 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks.json
index be91067ae84..d2a815e8493 100644
--- a/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.30mm Standard 0.6 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "3",
 	"layer_height": "0.30",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RD50_V2.json
index 934c3d265b0..ebecec49b8f 100644
--- a/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "4",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RF50.json
index 1e0a5ca06c1..05c4c06e22d 100644
--- a/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.32mm Draft 0.6 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "4",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.6 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RD50_V2.json
index 8dcca94dc5f..91311d8009d 100644
--- a/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "4",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json
index a2589181e46..18d38c7c34e 100644
--- a/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.38mm Extra Draft 0.6 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "3",
 	"top_shell_layers": "4",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.6 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RD50_V2.json
index 244963461b9..6aec880584c 100644
--- a/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "4",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json
index b2b329f234f..b4359ae9906 100644
--- a/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.38mm Standard 0.8 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "4",
 	"top_shell_layers": "4",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.8 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks.json
index 985ba6b5348..45fdd61179b 100644
--- a/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.40mm Draft 0.6 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "2",
 	"layer_height": "0.40",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks.json
index 16a65d9d337..177b620e518 100644
--- a/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.40mm Standard 0.8 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "4",
 	"layer_height": "0.40",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RD50_V2.json
index 65d693fb6a6..c5909e2b215 100644
--- a/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "4",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json
index 4b73f9d9a30..6e286f33099 100644
--- a/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.46mm Draft 0.8 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "3",
 	"top_shell_layers": "4",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.8 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks.json
index 29e1cde1911..fc1a875d671 100644
--- a/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.50mm Draft 0.8 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "4",
 	"layer_height": "0.50",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks.json
index d3308312a35..6b59b1c1013 100644
--- a/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.50mm Optimal 1.2 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "3",
 	"layer_height": "0.50",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 1.2 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks.json
index 9090e3fa212..80e3ba5649f 100644
--- a/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.50mm Standard 1.0 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "3",
 	"layer_height": "0.50",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 1.0 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RD50_V2.json b/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RD50_V2.json
index 955a530165e..d9e56aa672b 100644
--- a/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RD50_V2.json	
+++ b/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RD50_V2.json	
@@ -10,7 +10,6 @@
 	"top_shell_layers": "4",
 	"top_solid_infill_flow_ratio": "0.96",
 	"compatible_printers": [
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json b/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json
index 861ceb43e42..e0d5a486de6 100644
--- a/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json	
+++ b/resources/profiles/Blocks/process/0.54mm Extra Draft 0.8 nozzle @Blocks_RF50.json	
@@ -10,7 +10,6 @@
 	"bottom_shell_layers": "3",
 	"top_shell_layers": "4",
 	"compatible_printers": [
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.8 nozzle"
 	],
 	"sparse_infill_speed": "300",
diff --git a/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks.json
index a78632274cf..e59174620f1 100644
--- a/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.60mm Draft 1.0 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "3",
 	"layer_height": "0.60",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 1.0 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks.json
index 3baa554cbc9..598534c0505 100644
--- a/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.60mm Standard 1.2 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "3",
 	"layer_height": "0.60",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 1.2 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks.json
index 1b94ce0260d..905bb32a489 100644
--- a/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.70mm Draft 1.2 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "3",
 	"layer_height": "0.70",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 1.2 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks.json
index fa7cc6f49e9..49eaf2c7b91 100644
--- a/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.70mm Extra Draft 1.0 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "3",
 	"layer_height": "0.70",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 1.0 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks.json b/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks.json
index 7d8d9cad654..df6d97a9d7b 100644
--- a/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks.json	
+++ b/resources/profiles/Blocks/process/0.80mm Extra Draft 1.2 nozzle @Blocks.json	
@@ -9,7 +9,6 @@
 	"top_shell_layers": "2",
 	"layer_height": "0.80",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 1.2 nozzle"
 	]
 }
diff --git a/resources/profiles/Blocks/process/fdm_process_common 0.6 nozzle.json b/resources/profiles/Blocks/process/fdm_process_common 0.6 nozzle.json
index d9eb0a45085..51ecf6c3063 100644
--- a/resources/profiles/Blocks/process/fdm_process_common 0.6 nozzle.json	
+++ b/resources/profiles/Blocks/process/fdm_process_common 0.6 nozzle.json	
@@ -9,11 +9,8 @@
 	"bridge_flow": "0.95",
 	"brim_width": "5",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 0.6 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.6 nozzle",
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.6 nozzle"
 	],
 	"print_sequence": "by layer",
diff --git a/resources/profiles/Blocks/process/fdm_process_common 0.8 nozzle.json b/resources/profiles/Blocks/process/fdm_process_common 0.8 nozzle.json
index 79303aa65c7..10089234ee6 100644
--- a/resources/profiles/Blocks/process/fdm_process_common 0.8 nozzle.json	
+++ b/resources/profiles/Blocks/process/fdm_process_common 0.8 nozzle.json	
@@ -5,11 +5,8 @@
 	"from": "system",
 	"instantiation": "false",
 	"compatible_printers": [
-		"BLOCKS Pro S100",
 		"BLOCKS Pro S100 0.8 nozzle",
-		"BLOCKS RD50 V2",
 		"BLOCKS RD50 V2 0.8 nozzle",
-		"BLOCKS RF50",
 		"BLOCKS RF50 0.8 nozzle"
 	],
 	"sparse_infill_line_width": "0.82",
diff --git a/resources/profiles/Chuanying.json b/resources/profiles/Chuanying.json
index 31cc614a2dc..19d5c9b7b5d 100644
--- a/resources/profiles/Chuanying.json
+++ b/resources/profiles/Chuanying.json
@@ -1,7 +1,7 @@
 {
 	"name": "Chuanying",
 	"url": "",
-	"version": "02.04.00.01",
+	"version": "02.04.00.02",
 	"force_update": "0",
 	"description": "Chuanying configurations",
 	"machine_model_list": [
diff --git a/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json b/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json
index d9a05782e40..5ff81a93e12 100644
--- a/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json	
+++ b/resources/profiles/Chuanying/filament/Chuanying Generic TPU.json	
@@ -19,13 +19,7 @@
 	"compatible_printers": [
 		"Chuanying X1 0.4 Nozzle",
 		"Chuanying X1 0.6 Nozzle",
-		"Chuanying X1 0.8 Nozzle",
-		"Chuanying Adventurer 5M 0.4 Nozzle",
-		"Chuanying Adventurer 5M 0.6 Nozzle",
-		"Chuanying Adventurer 5M 0.8 Nozzle",
-		"Chuanying Adventurer 5M Pro 0.4 Nozzle",
-		"Chuanying Adventurer 5M Pro 0.6 Nozzle",
-		"Chuanying Adventurer 5M Pro 0.8 Nozzle"
+		"Chuanying X1 0.8 Nozzle"
 	],
 	"compatible_printers_condition": "",
 	"compatible_prints": [],
diff --git a/resources/profiles/Comgrow.json b/resources/profiles/Comgrow.json
index 51ca3951e39..da7d0e29f63 100644
--- a/resources/profiles/Comgrow.json
+++ b/resources/profiles/Comgrow.json
@@ -1,6 +1,6 @@
 {
 	"name": "Comgrow",
-	"version": "02.04.00.02",
+	"version": "02.04.00.03",
 	"force_update": "0",
 	"description": "Comgrow configurations",
 	"machine_model_list": [
@@ -50,10 +50,6 @@
 			"name": "0.20mm Standard @Comgrow T500 0.6",
 			"sub_path": "process/0.20mm Standard @Comgrow T500 0.6.json"
 		},
-		{
-			"name": "0.20mm Standard @Comgrow T500 1.0",
-			"sub_path": "process/0.20mm Standard @Comgrow T500 1.0.json"
-		},
 		{
 			"name": "0.24mm Draft @Comgrow T500 0.4",
 			"sub_path": "process/0.24mm Draft @Comgrow T500 0.4.json"
diff --git a/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 1.0.json b/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 1.0.json
deleted file mode 100644
index 483335cda9a..00000000000
--- a/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 1.0.json	
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-	"type": "process",
-	"name": "0.20mm Standard @Comgrow T500 1.0",
-	"inherits": "fdm_process_comgrow_common",
-	"from": "system",
-	"setting_id": "2lOjEPJ5JELGadG3",
-	"instantiation": "true",
-	"adaptive_layer_height": "1",
-	"reduce_crossing_wall": "0",
-	"layer_height": "0.24",
-	"max_travel_detour_distance": "0",
-	"bottom_surface_pattern": "monotonic",
-	"bottom_shell_layers": "2",
-	"bottom_shell_thickness": "0",
-	"bridge_flow": "0.85",
-	"bridge_speed": "25",
-	"brim_width": "0",
-	"brim_object_gap": "0",
-	"compatible_printers_condition": "",
-	"print_sequence": "by layer",
-	"bridge_no_support": "0",
-	"draft_shield": "disabled",
-	"elefant_foot_compensation": "0.1",
-	"enable_arc_fitting": "0",
-	"outer_wall_line_width": "1.0",
-	"wall_infill_order": "inner wall/outer wall/infill",
-	"line_width": "1.0",
-	"infill_direction": "45",
-	"sparse_infill_density": "15%",
-	"sparse_infill_pattern": "crosshatch",
-	"initial_layer_line_width": "1.0",
-	"initial_layer_print_height": "0.28",
-	"infill_combination": "0",
-	"sparse_infill_line_width": "1.0",
-	"infill_wall_overlap": "23%",
-	"interface_shells": "0",
-	"ironing_flow": "15%",
-	"ironing_spacing": "0.25",
-	"ironing_speed": "15",
-	"ironing_type": "no ironing",
-	"reduce_infill_retraction": "1",
-	"detect_overhang_wall": "1",
-	"overhang_1_4_speed": "0",
-	"overhang_2_4_speed": "20",
-	"overhang_3_4_speed": "15",
-	"overhang_4_4_speed": "10",
-	"inner_wall_line_width": "1.0",
-	"wall_loops": "2",
-	"print_settings_id": "",
-	"raft_layers": "0",
-	"seam_position": "aligned",
-	"skirt_distance": "3",
-	"skirt_height": "2",
-	"skirt_loops": "2",
-	"minimum_sparse_infill_area": "10",
-	"internal_solid_infill_line_width": "0",
-	"spiral_mode": "0",
-	"standby_temperature_delta": "-5",
-	"enable_support": "0",
-	"resolution": "0.012",
-	"support_type": "normal(auto)",
-	"support_style": "grid",
-	"support_on_build_plate_only": "0",
-	"support_top_z_distance": "0.15",
-	"support_filament": "0",
-	"support_line_width": "1.0",
-	"support_interface_loop_pattern": "0",
-	"support_interface_filament": "0",
-	"support_interface_top_layers": "3",
-	"support_interface_bottom_layers": "-1",
-	"support_interface_spacing": "0.2",
-	"support_interface_speed": "100%",
-	"support_base_pattern": "rectilinear",
-	"support_base_pattern_spacing": "0.2",
-	"support_speed": "60",
-	"support_threshold_angle": "30",
-	"support_object_xy_distance": "60%",
-	"tree_support_branch_angle": "40",
-	"tree_support_wall_count": "0",
-	"detect_thin_wall": "1",
-	"top_surface_pattern": "monotonicline",
-	"top_surface_line_width": "1.0",
-	"top_shell_layers": "2",
-	"top_shell_thickness": "0.8",
-	"initial_layer_speed": "25",
-	"initial_layer_infill_speed": "80",
-	"outer_wall_speed": "50",
-	"inner_wall_speed": "60",
-	"internal_solid_infill_speed": "60",
-	"top_surface_speed": "40",
-	"gap_infill_speed": "60",
-	"sparse_infill_speed": "50",
-	"travel_speed": "80",
-	"enable_prime_tower": "1",
-	"wipe_tower_no_sparse_layers": "0",
-	"prime_tower_width": "60",
-	"xy_hole_compensation": "0",
-	"xy_contour_compensation": "0",
-	"seam_gap": "5%",
-	"compatible_printers": [
-		"Comgrow T500 1.0 nozzle"
-	]
-}
diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json
index 8f4afaceb50..f90648d256e 100644
--- a/resources/profiles/Creality.json
+++ b/resources/profiles/Creality.json
@@ -1,6 +1,6 @@
 {
 	"name": "Creality",
-	"version": "02.03.02.74",
+	"version": "02.03.02.75",
 	"force_update": "0",
 	"description": "Creality configurations",
 	"machine_model_list": [
@@ -4034,6 +4034,14 @@
 			"name": "Creality Ender-5 Max 0.4 nozzle",
 			"sub_path": "machine/Creality Ender-5 Max 0.4 nozzle.json"
 		},
+		{
+			"name": "Creality Ender-5 Max 0.6 nozzle",
+			"sub_path": "machine/Creality Ender-5 Max 0.6 nozzle.json"
+		},
+		{
+			"name": "Creality Ender-5 Max 0.8 nozzle",
+			"sub_path": "machine/Creality Ender-5 Max 0.8 nozzle.json"
+		},
 		{
 			"name": "Creality Ender-5 Plus 0.4 nozzle",
 			"sub_path": "machine/Creality Ender-5 Plus 0.4 nozzle.json"
diff --git a/resources/profiles/Creality/filament/CR-PETG @Ender-5 Max-all.json b/resources/profiles/Creality/filament/CR-PETG @Ender-5 Max-all.json
index c85a9ed7fb1..0514484af82 100644
--- a/resources/profiles/Creality/filament/CR-PETG @Ender-5 Max-all.json	
+++ b/resources/profiles/Creality/filament/CR-PETG @Ender-5 Max-all.json	
@@ -153,6 +153,7 @@
     "material_flow_dependent_temperature": "0",
     "material_flow_temp_graph": "[[3.0,220],[5.0,240],[10.0,250]]",
     "pressure_advance": "0.05",
+    "filament_id": "06101",
     "support_material_interface_fan_speed": "-1",
     "compatible_printers": [
         "Creality Ender-5 Max 0.4 nozzle",
diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality CR10SE 0.2.json b/resources/profiles/Creality/process/0.12mm Fine @Creality CR10SE 0.2.json
index fb8b684ca22..420946637ae 100644
--- a/resources/profiles/Creality/process/0.12mm Fine @Creality CR10SE 0.2.json	
+++ b/resources/profiles/Creality/process/0.12mm Fine @Creality CR10SE 0.2.json	
@@ -113,6 +113,6 @@
 	"initial_layer_jerk": "7",
 	"travel_jerk": "7",
 	"compatible_printers": [
-		"Creality CR-10SE 0.2 nozzle"
+		"Creality CR-10 SE 0.2 nozzle"
 	]
 }
diff --git a/resources/profiles/MagicMaker.json b/resources/profiles/MagicMaker.json
index aa542ca7f6b..ede555b66c1 100644
--- a/resources/profiles/MagicMaker.json
+++ b/resources/profiles/MagicMaker.json
@@ -1,6 +1,6 @@
 {
 	"name": "MagicMaker",
-	"version": "02.04.00.01",
+	"version": "02.04.00.02",
 	"force_update": "0",
 	"description": "MagicMaker configurations",
 	"machine_model_list": [
diff --git a/resources/profiles/MagicMaker/process/0.20mm Standard Fast @MM hqs SF.json b/resources/profiles/MagicMaker/process/0.20mm Standard Fast @MM hqs SF.json
index bb0eeafbc17..b56e29914f6 100644
--- a/resources/profiles/MagicMaker/process/0.20mm Standard Fast @MM hqs SF.json	
+++ b/resources/profiles/MagicMaker/process/0.20mm Standard Fast @MM hqs SF.json	
@@ -110,6 +110,6 @@
 	"travel_acceleration": "10000",
 	"travel_speed": "300",
 	"compatible_printers": [
-		"MM hqs sf 0.4 nozzle"
+		"MM hqs SF 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena.json b/resources/profiles/OrcaArena.json
index 1a31ac393e5..c649cf3e6bb 100644
--- a/resources/profiles/OrcaArena.json
+++ b/resources/profiles/OrcaArena.json
@@ -1,7 +1,7 @@
 {
 	"name": "Orca Arena Printer",
 	"url": "",
-	"version": "02.04.00.01",
+	"version": "02.04.00.02",
 	"force_update": "0",
 	"description": "Orca Arena configuration files",
 	"machine_model_list": [
diff --git a/resources/profiles/OrcaArena/process/0.06mm Standard @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/process/0.06mm Standard @Arena X1C 0.2 nozzle.json
index c523f9d118f..6094cd87480 100644
--- a/resources/profiles/OrcaArena/process/0.06mm Standard @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.06mm Standard @Arena X1C 0.2 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "8hA0aiO1Qtv9IfeR",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.2 nozzle",
-		"Orca Arena X1 0.2 nozzle"
+		"Orca Arena X1 Carbon 0.2 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.08mm Extra Fine @Arena X1C.json b/resources/profiles/OrcaArena/process/0.08mm Extra Fine @Arena X1C.json
index 7eeb047bade..bf86dc0727b 100644
--- a/resources/profiles/OrcaArena/process/0.08mm Extra Fine @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/process/0.08mm Extra Fine @Arena X1C.json	
@@ -6,7 +6,6 @@
 	"setting_id": "t6ZUh6RIxH5i7Ju0",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.4 nozzle",
-		"Orca Arena X1 0.4 nozzle"
+		"Orca Arena X1 Carbon 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.08mm Standard @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/process/0.08mm Standard @Arena X1C 0.2 nozzle.json
index 3cd96eb8344..3fc7023735a 100644
--- a/resources/profiles/OrcaArena/process/0.08mm Standard @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.08mm Standard @Arena X1C 0.2 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "AnDHc3M6fQLAl6VE",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.2 nozzle",
-		"Orca Arena X1 0.2 nozzle"
+		"Orca Arena X1 Carbon 0.2 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.10mm Standard @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/process/0.10mm Standard @Arena X1C 0.2 nozzle.json
index 738a5b15e5a..88e6fcc7ad5 100644
--- a/resources/profiles/OrcaArena/process/0.10mm Standard @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.10mm Standard @Arena X1C 0.2 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "Z4u3mxJ72aSZDIxB",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.2 nozzle",
-		"Orca Arena X1 0.2 nozzle"
+		"Orca Arena X1 Carbon 0.2 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.12mm Fine @Arena X1C.json b/resources/profiles/OrcaArena/process/0.12mm Fine @Arena X1C.json
index 0e4eb56c4b6..6247866b62f 100644
--- a/resources/profiles/OrcaArena/process/0.12mm Fine @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/process/0.12mm Fine @Arena X1C.json	
@@ -6,7 +6,6 @@
 	"setting_id": "orfsZJWNnKXKdxaZ",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.4 nozzle",
-		"Orca Arena X1 0.4 nozzle"
+		"Orca Arena X1 Carbon 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.12mm Standard @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/process/0.12mm Standard @Arena X1C 0.2 nozzle.json
index 83870674185..07bc4c2c109 100644
--- a/resources/profiles/OrcaArena/process/0.12mm Standard @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.12mm Standard @Arena X1C 0.2 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "GO4dmyDkhygncuJZ",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.2 nozzle",
-		"Orca Arena X1 0.2 nozzle"
+		"Orca Arena X1 Carbon 0.2 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.14mm Standard @Arena X1C 0.2 nozzle.json b/resources/profiles/OrcaArena/process/0.14mm Standard @Arena X1C 0.2 nozzle.json
index aaa79777077..8aed2634100 100644
--- a/resources/profiles/OrcaArena/process/0.14mm Standard @Arena X1C 0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.14mm Standard @Arena X1C 0.2 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "MVY5JxFxbdSUWTOW",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.2 nozzle",
-		"Orca Arena X1 0.2 nozzle"
+		"Orca Arena X1 Carbon 0.2 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.16mm Optimal @Arena X1C.json b/resources/profiles/OrcaArena/process/0.16mm Optimal @Arena X1C.json
index 48b9a73569b..41fa924295c 100644
--- a/resources/profiles/OrcaArena/process/0.16mm Optimal @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/process/0.16mm Optimal @Arena X1C.json	
@@ -6,7 +6,6 @@
 	"setting_id": "KGSeKT36RuDzR3E6",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.4 nozzle",
-		"Orca Arena X1 0.4 nozzle"
+		"Orca Arena X1 Carbon 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.18mm Standard @Arena X1C 0.6 nozzle.json b/resources/profiles/OrcaArena/process/0.18mm Standard @Arena X1C 0.6 nozzle.json
index 17870034562..77dadbf5382 100644
--- a/resources/profiles/OrcaArena/process/0.18mm Standard @Arena X1C 0.6 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.18mm Standard @Arena X1C 0.6 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "IbPMWoSXjuZxo5po",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.6 nozzle",
-		"Orca Arena X1 0.6 nozzle"
+		"Orca Arena X1 Carbon 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.20mm Bambu Support W @Arena X1C.json b/resources/profiles/OrcaArena/process/0.20mm Bambu Support W @Arena X1C.json
index 08900994219..53ea2b1a9e2 100644
--- a/resources/profiles/OrcaArena/process/0.20mm Bambu Support W @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/process/0.20mm Bambu Support W @Arena X1C.json	
@@ -15,7 +15,6 @@
 	"support_interface_filament": "0",
 	"enable_prime_tower": "1",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.4 nozzle",
-		"Orca Arena X1 0.4 nozzle"
+		"Orca Arena X1 Carbon 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.20mm Standard @Arena X1C.json b/resources/profiles/OrcaArena/process/0.20mm Standard @Arena X1C.json
index 8065a312e50..d0c2031acd2 100644
--- a/resources/profiles/OrcaArena/process/0.20mm Standard @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/process/0.20mm Standard @Arena X1C.json	
@@ -6,7 +6,6 @@
 	"setting_id": "vKHHMGciyRPz96ys",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.4 nozzle",
-		"Orca Arena X1 0.4 nozzle"
+		"Orca Arena X1 Carbon 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.20mm Strength @Arena X1C.json b/resources/profiles/OrcaArena/process/0.20mm Strength @Arena X1C.json
index 1341747d287..ee901caa2ec 100644
--- a/resources/profiles/OrcaArena/process/0.20mm Strength @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/process/0.20mm Strength @Arena X1C.json	
@@ -9,7 +9,6 @@
 	"wall_loops": "6",
 	"sparse_infill_density": "25%",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.4 nozzle",
-		"Orca Arena X1 0.4 nozzle"
+		"Orca Arena X1 Carbon 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.24mm Draft @Arena X1C.json b/resources/profiles/OrcaArena/process/0.24mm Draft @Arena X1C.json
index 1032f70b45e..699f45deee5 100644
--- a/resources/profiles/OrcaArena/process/0.24mm Draft @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/process/0.24mm Draft @Arena X1C.json	
@@ -6,7 +6,6 @@
 	"setting_id": "A3tBfYESL5BUa6az",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.4 nozzle",
-		"Orca Arena X1 0.4 nozzle"
+		"Orca Arena X1 Carbon 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.24mm Standard @Arena X1C 0.6 nozzle.json b/resources/profiles/OrcaArena/process/0.24mm Standard @Arena X1C 0.6 nozzle.json
index 6533c7b6a16..32786a465d2 100644
--- a/resources/profiles/OrcaArena/process/0.24mm Standard @Arena X1C 0.6 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.24mm Standard @Arena X1C 0.6 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "EHZbaCSjWI2NuLBb",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.6 nozzle",
-		"Orca Arena X1 0.6 nozzle"
+		"Orca Arena X1 Carbon 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.24mm Standard @Arena X1C 0.8 nozzle.json b/resources/profiles/OrcaArena/process/0.24mm Standard @Arena X1C 0.8 nozzle.json
index 444689ccb0e..95ed3be57d0 100644
--- a/resources/profiles/OrcaArena/process/0.24mm Standard @Arena X1C 0.8 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.24mm Standard @Arena X1C 0.8 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "YUmFXao5txOnlhO6",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.8 nozzle",
-		"Orca Arena X1 0.8 nozzle"
+		"Orca Arena X1 Carbon 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.28mm Extra Draft @Arena X1C.json b/resources/profiles/OrcaArena/process/0.28mm Extra Draft @Arena X1C.json
index c2f4fb1869f..9a38db80af8 100644
--- a/resources/profiles/OrcaArena/process/0.28mm Extra Draft @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/process/0.28mm Extra Draft @Arena X1C.json	
@@ -6,7 +6,6 @@
 	"setting_id": "Q03WAuYXUC4h4Vyk",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.4 nozzle",
-		"Orca Arena X1 0.4 nozzle"
+		"Orca Arena X1 Carbon 0.4 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.30mm Strength @Arena X1C 0.6 nozzle.json b/resources/profiles/OrcaArena/process/0.30mm Strength @Arena X1C 0.6 nozzle.json
index 24710670e88..20d5bc0dcae 100644
--- a/resources/profiles/OrcaArena/process/0.30mm Strength @Arena X1C 0.6 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.30mm Strength @Arena X1C 0.6 nozzle.json	
@@ -8,7 +8,6 @@
 	"wall_loops": "4",
 	"sparse_infill_density": "25%",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.6 nozzle",
-		"Orca Arena X1 0.6 nozzle"
+		"Orca Arena X1 Carbon 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.32mm Standard @Arena X1C 0.8 nozzle.json b/resources/profiles/OrcaArena/process/0.32mm Standard @Arena X1C 0.8 nozzle.json
index a0673a65ec4..2438ba8d710 100644
--- a/resources/profiles/OrcaArena/process/0.32mm Standard @Arena X1C 0.8 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.32mm Standard @Arena X1C 0.8 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "B1M42JYHlcp5aUoq",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.8 nozzle",
-		"Orca Arena X1 0.8 nozzle"
+		"Orca Arena X1 Carbon 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.36mm Standard @Arena X1C 0.6 nozzle.json b/resources/profiles/OrcaArena/process/0.36mm Standard @Arena X1C 0.6 nozzle.json
index 486db25408f..04a6431b1fc 100644
--- a/resources/profiles/OrcaArena/process/0.36mm Standard @Arena X1C 0.6 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.36mm Standard @Arena X1C 0.6 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "N5ONn0pY2DO8xlFq",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.6 nozzle",
-		"Orca Arena X1 0.6 nozzle"
+		"Orca Arena X1 Carbon 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.42mm Standard @Arena X1C 0.6 nozzle.json b/resources/profiles/OrcaArena/process/0.42mm Standard @Arena X1C 0.6 nozzle.json
index cfe7f6cdc52..ea6aed50dc8 100644
--- a/resources/profiles/OrcaArena/process/0.42mm Standard @Arena X1C 0.6 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.42mm Standard @Arena X1C 0.6 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "aKOq8cZ3LHNl61tR",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.6 nozzle",
-		"Orca Arena X1 0.6 nozzle"
+		"Orca Arena X1 Carbon 0.6 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.48mm Standard @Arena X1C 0.8 nozzle.json b/resources/profiles/OrcaArena/process/0.48mm Standard @Arena X1C 0.8 nozzle.json
index c3346b84fd4..079f2d6c0fb 100644
--- a/resources/profiles/OrcaArena/process/0.48mm Standard @Arena X1C 0.8 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.48mm Standard @Arena X1C 0.8 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "ZcviTCabCemJLEEa",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.8 nozzle",
-		"Orca Arena X1 0.8 nozzle"
+		"Orca Arena X1 Carbon 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/OrcaArena/process/0.56mm Standard @Arena X1C 0.8 nozzle.json b/resources/profiles/OrcaArena/process/0.56mm Standard @Arena X1C 0.8 nozzle.json
index a33f4875ce2..49de0404c69 100644
--- a/resources/profiles/OrcaArena/process/0.56mm Standard @Arena X1C 0.8 nozzle.json	
+++ b/resources/profiles/OrcaArena/process/0.56mm Standard @Arena X1C 0.8 nozzle.json	
@@ -6,7 +6,6 @@
 	"setting_id": "tqiu1hNVhXEsBBig",
 	"instantiation": "true",
 	"compatible_printers": [
-		"Orca Arena X1 Carbon 0.8 nozzle",
-		"Orca Arena X1 0.8 nozzle"
+		"Orca Arena X1 Carbon 0.8 nozzle"
 	]
 }
diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json
index 935de537be7..113b085c961 100644
--- a/resources/profiles/Prusa.json
+++ b/resources/profiles/Prusa.json
@@ -1,6 +1,6 @@
 {
 	"name": "Prusa",
-	"version": "02.04.00.02",
+	"version": "02.04.00.03",
 	"force_update": "0",
 	"description": "Prusa configurations",
 	"machine_model_list": [
diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json
index 248fec014ee..1a7cb2de7f2 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json	
+++ b/resources/profiles/Prusa/filament/Prusa Generic PLA Silk @MK4S.json	
@@ -11,8 +11,6 @@
 		"Prusa MK4S 0.3 nozzle",
 		"Prusa MK4S 0.4 nozzle",
 		"Prusa MK4S 0.5 nozzle",
-		"Prusa MK4S HF0.25 nozzle",
-		"Prusa MK4S HF0.3 nozzle",
 		"Prusa MK4S HF0.4 nozzle",
 		"Prusa MK4S HF0.5 nozzle"
 	],
diff --git a/resources/profiles/Wanhao France.json b/resources/profiles/Wanhao France.json
index 92fc62c4bdd..92694fe4767 100644
--- a/resources/profiles/Wanhao France.json	
+++ b/resources/profiles/Wanhao France.json	
@@ -1,6 +1,6 @@
 {
 	"name": "Wanhao France",
-	"version": "02.04.00.01",
+	"version": "02.04.00.02",
 	"force_update": "0",
 	"description": "Wanhao France D12 configurations",
 	"machine_model_list": [
diff --git a/resources/profiles/Wanhao France/filament/YUMI PETG.json b/resources/profiles/Wanhao France/filament/YUMI PETG.json
index b8046df21ff..ca5eb1b5c95 100644
--- a/resources/profiles/Wanhao France/filament/YUMI PETG.json	
+++ b/resources/profiles/Wanhao France/filament/YUMI PETG.json	
@@ -263,11 +263,11 @@
 		"D12 500 PRO M2 DIRECT 0.4 nozzle",
 		"D12 500 PRO SMARTPAD DIRECT 0.4 nozzle",
 		"D12 230 PRO M2 MONO DUAL 0.4 nozzle",
-		"D12 230 PRO M2 MONO DUAL PoopTool 0.4 nozzle",
+		"D12 230 PRO M2 MONO DUAL 0.4 nozzle PoopTool",
 		"D12 300 PRO M2 MONO DUAL PoopTool 0.4 nozzle",
 		"D12 500 PRO M2 MONO DUAL PoopTool 0.4 nozzle",
 		"D12 230 PRO SMARTPAD MONO DUAL 0.4 nozzle",
-		"D12 230 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle",
+		"D12 230 PRO SMARTPAD MONO DUAL 0.4 nozzle PoopTool",
 		"D12 300 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle",
 		"D12 500 PRO SMARTPAD MONO DUAL PoopTool 0.4 nozzle",
 		"D12 300 PRO M2 MONO DUAL 0.4 nozzle",
diff --git a/resources/profiles/re3D.json b/resources/profiles/re3D.json
index aff4e932aab..e0acc669d06 100644
--- a/resources/profiles/re3D.json
+++ b/resources/profiles/re3D.json
@@ -1,6 +1,6 @@
 {
 	"name": "re3D",
-	"version": "02.04.00.02",
+	"version": "02.04.00.03",
 	"force_update": "0",
 	"description": "re3D configurations",
 	"machine_model_list": [
diff --git a/resources/profiles/re3D/filament/re3D Greengate rPETG.json b/resources/profiles/re3D/filament/re3D Greengate rPETG.json
index 5111e5b9511..de56af4f02c 100644
--- a/resources/profiles/re3D/filament/re3D Greengate rPETG.json	
+++ b/resources/profiles/re3D/filament/re3D Greengate rPETG.json	
@@ -10,9 +10,12 @@
 		"re3D Greengate rPETG"
 	],
 	"compatible_printers": [
-		"re3D GigabotX 2",
-		"re3D GigabotX 2 XLT",
-		"re3D TerabotX 2"
+		"re3D GigabotX 2 0.8 nozzle",
+		"re3D GigabotX 2 XLT 0.8 nozzle",
+		"re3D TerabotX 2 0.8 nozzle",
+		"re3D GigabotX 2 1.75 nozzle",
+		"re3D GigabotX 2 XLT 1.75 nozzle",
+		"re3D TerabotX 2 1.75 nozzle"
 	],
 	"filament_vendor": [
 		"re3D"
diff --git a/resources/profiles/re3D/filament/re3D PC.json b/resources/profiles/re3D/filament/re3D PC.json
index 36e475e4e9e..d24b00d482f 100644
--- a/resources/profiles/re3D/filament/re3D PC.json	
+++ b/resources/profiles/re3D/filament/re3D PC.json	
@@ -10,9 +10,12 @@
 		"re3D PC"
 	],
 	"compatible_printers": [
-		"re3D Gigabot 4",
-		"re3D Gigabot 4 XLT",
-		"re3D Terabot 4"
+		"re3D Gigabot 4 0.4 nozzle",
+		"re3D Gigabot 4 XLT 0.4 nozzle",
+		"re3D Terabot 4 0.4 nozzle",
+		"re3D Gigabot 4 0.8 nozzle",
+		"re3D Gigabot 4 XLT 0.8 nozzle",
+		"re3D Terabot 4 0.8 nozzle"
 	],
 	"filament_vendor": [
 		"re3D"
diff --git a/resources/profiles/re3D/filament/re3D PETG.json b/resources/profiles/re3D/filament/re3D PETG.json
index fb4cf4278c7..a52d5b742c7 100644
--- a/resources/profiles/re3D/filament/re3D PETG.json	
+++ b/resources/profiles/re3D/filament/re3D PETG.json	
@@ -10,9 +10,12 @@
 		"re3D PETG"
 	],
 	"compatible_printers": [
-		"re3D Gigabot 4",
-		"re3D Gigabot 4 XLT",
-		"re3D Terabot 4"
+		"re3D Gigabot 4 0.4 nozzle",
+		"re3D Gigabot 4 XLT 0.4 nozzle",
+		"re3D Terabot 4 0.4 nozzle",
+		"re3D Gigabot 4 0.8 nozzle",
+		"re3D Gigabot 4 XLT 0.8 nozzle",
+		"re3D Terabot 4 0.8 nozzle"
 	],
 	"filament_vendor": [
 		"re3D"
diff --git a/resources/profiles/re3D/filament/re3D PLA.json b/resources/profiles/re3D/filament/re3D PLA.json
index c3eb7300241..7b153db22b1 100644
--- a/resources/profiles/re3D/filament/re3D PLA.json	
+++ b/resources/profiles/re3D/filament/re3D PLA.json	
@@ -10,9 +10,12 @@
 		"re3D PLA"
 	],
 	"compatible_printers": [
-		"re3D Gigabot 4",
-		"re3D Gigabot 4 XLT",
-		"re3D Terabot 4"
+		"re3D Gigabot 4 0.4 nozzle",
+		"re3D Gigabot 4 XLT 0.4 nozzle",
+		"re3D Terabot 4 0.4 nozzle",
+		"re3D Gigabot 4 0.8 nozzle",
+		"re3D Gigabot 4 XLT 0.8 nozzle",
+		"re3D Terabot 4 0.8 nozzle"
 	],
 	"filament_vendor": [
 		"re3D"
diff --git a/resources/profiles/re3D/filament/re3D rPP.json b/resources/profiles/re3D/filament/re3D rPP.json
index d2266972403..bf96aa51e6b 100644
--- a/resources/profiles/re3D/filament/re3D rPP.json	
+++ b/resources/profiles/re3D/filament/re3D rPP.json	
@@ -13,9 +13,12 @@
 		"re3D rPP"
 	],
 	"compatible_printers": [
-		"re3D GigabotX 2",
-		"re3D GigabotX 2 XLT",
-		"re3D TerabotX 2"
+		"re3D GigabotX 2 0.8 nozzle",
+		"re3D GigabotX 2 XLT 0.8 nozzle",
+		"re3D TerabotX 2 0.8 nozzle",
+		"re3D GigabotX 2 1.75 nozzle",
+		"re3D GigabotX 2 XLT 1.75 nozzle",
+		"re3D TerabotX 2 1.75 nozzle"
 	],
 	"filament_vendor": [
 		"re3D"
diff --git a/src/dev-utils/OrcaSlicer_profile_validator.cpp b/src/dev-utils/OrcaSlicer_profile_validator.cpp
index baee58258c6..3208f554524 100644
--- a/src/dev-utils/OrcaSlicer_profile_validator.cpp
+++ b/src/dev-utils/OrcaSlicer_profile_validator.cpp
@@ -96,7 +96,6 @@ int main(int argc, char* argv[])
     ("vendor,v", po::value<std::string>()->default_value(""), "Vendor name. Optional, all profiles present in the folder will be validated if not specified")
     ("generate_presets,g", po::value<bool>()->default_value(false), "Generate user presets for mock test")
     ("check_filament_subtypes,f", po::bool_switch()->default_value(false), "Also flag printers with duplicate (ambiguous) filament subtypes. Off unless this flag is present.")
-    ("check_preset_references,r", po::bool_switch()->default_value(false), "Also flag presets whose inherits/compatible_printers/compatible_prints reference a deleted or renamed preset. Off unless this flag is present.")
     ("log_level,l", po::value<int>()->default_value(2), "Log level. Optional, default is 2 (warning). Higher values produce more detailed logs.");
     // clang-format on
 
@@ -121,7 +120,6 @@ int main(int argc, char* argv[])
     int         log_level            = vm["log_level"].as<int>();
     bool        generate_user_preset = vm["generate_presets"].as<bool>();
     bool        check_filament_subtypes = vm["check_filament_subtypes"].as<bool>();
-    bool        check_preset_references = vm["check_preset_references"].as<bool>();
 
     //  check if path is valid, and return error if not
     if (!fs::exists(path) || !fs::is_directory(path)) {
@@ -168,7 +166,7 @@ int main(int argc, char* argv[])
         return 0;
     }
 
-    if (preset_bundle->has_errors(check_filament_subtypes, check_preset_references)) {
+    if (preset_bundle->has_errors(check_filament_subtypes)) {
         std::cout << "Validation failed" << std::endl;
         return 1;
     }
diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp
index 4a1289aab13..9a49e14aa35 100644
--- a/src/libslic3r/PresetBundle.cpp
+++ b/src/libslic3r/PresetBundle.cpp
@@ -5528,7 +5528,7 @@ void PresetBundle::set_default_suppressed(bool default_suppressed)
     printers.set_default_suppressed(default_suppressed);
 }
 
-bool PresetBundle::has_errors(bool check_duplicate_filament_subtypes, bool check_references) const
+bool PresetBundle::has_errors(bool check_duplicate_filament_subtypes) const
 {
     if (m_errors != 0 || printers.m_errors != 0 || filaments.m_errors != 0 || prints.m_errors != 0)
         return true;
@@ -5551,7 +5551,7 @@ bool PresetBundle::has_errors(bool check_duplicate_filament_subtypes, bool check
     if (check_duplicate_filament_subtypes && this->check_duplicate_filament_subtypes())
         has_errors = true;
 
-    if (check_references && this->check_preset_references())
+    if (this->check_preset_references())
         has_errors = true;
 
     return has_errors;
diff --git a/src/libslic3r/PresetBundle.hpp b/src/libslic3r/PresetBundle.hpp
index 49b1a796c09..23ff5950035 100644
--- a/src/libslic3r/PresetBundle.hpp
+++ b/src/libslic3r/PresetBundle.hpp
@@ -485,9 +485,8 @@ public:
         return      { Preset::TYPE_PRINTER, Preset::TYPE_SLA_PRINT, Preset::TYPE_SLA_MATERIAL };
     }
 
-    // Orca: for validation only. The duplicate filament subtype and preset-reference checks are
-    // opt-in for now (enabled per-vendor by the profile-check CI as vendors are cleaned up).
-    bool has_errors(bool check_duplicate_filament_subtypes = false, bool check_preset_references = false) const;
+    // Orca: for validation only.
+    bool has_errors(bool check_duplicate_filament_subtypes = false) const;
 
     // Orca: for validation only. Flag any system preset whose inherits / compatible_printers /
     // compatible_prints references a deleted (unknown) or renamed (old) preset name.