diff --git a/cura/Machines/Models/IntentCategoryModel.py b/cura/Machines/Models/IntentCategoryModel.py
index 20d07864bf..a968d12b7a 100644
--- a/cura/Machines/Models/IntentCategoryModel.py
+++ b/cura/Machines/Models/IntentCategoryModel.py
@@ -41,11 +41,11 @@ class IntentCategoryModel(ListModel):
     }
     _translations["engineering"] = {
         "name": catalog.i18nc("@label", "Engineering"),
-        "description": catalog.i18nc("@text", "Suitable for engineering work")
+        "description": catalog.i18nc("@text", "Optimized for higher accuracy")
     }
-    _translations["smooth"] = {
-        "name": catalog.i18nc("@label", "Smooth"),
-        "description": catalog.i18nc("@text", "Optimized for a smooth surfaces")
+    _translations["quick"] = {
+        "name": catalog.i18nc("@label", "Draft"),
+        "description": catalog.i18nc("@text", "Optimized for fast results")
     }
 
 
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 7348c14a2a..efdc7cca0a 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -67,8 +67,6 @@
         "extruder_prime_pos_abs": { "default_value": true },
         "machine_start_gcode": { "default_value": "" },
         "machine_end_gcode": { "default_value": "" },
-        "prime_tower_position_x": { "value": "345" },
-        "prime_tower_position_y": { "value": "222.5" },
         "prime_blob_enable": { "enabled": true, "default_value": false },
 
         "speed_travel":
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
index b41f636e63..92d91840b5 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker_s3
 [metadata]
 setting_version = 10
 type = intent
-intent_category = smooth
+intent_category = quick
 quality_type = draft
 material = generic_abs
 variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg
deleted file mode 100644
index 49672fcb72..0000000000
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Visual.inst.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-[general]
-version = 4
-name = Visual
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 10
-type = intent
-intent_category = visual
-quality_type = draft
-material = generic_abs
-variant = AA 0.4
-
-[values]
-speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg
index 8095a53141..1d990b83c0 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker_s3
 [metadata]
 setting_version = 10
 type = intent
-intent_category = smooth
+intent_category = quick
 quality_type = draft
 material = generic_pla
 variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg
deleted file mode 100644
index 0c39d43c6a..0000000000
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Visual.inst.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-[general]
-version = 4
-name = Visual
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 10
-type = intent
-quality_type = draft
-intent_category = visual
-material = generic_pla
-variant = AA 0.4
-
-[values]
-speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
index edae808491..020a4bbc99 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker_s3
 [metadata]
 setting_version = 10
 type = intent
-intent_category = smooth
+intent_category = quick
 quality_type = draft
 material = generic_tough_pla
 variant = AA 0.4
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg
deleted file mode 100644
index f52eb22ec2..0000000000
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Visual.inst.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-[general]
-version = 4
-name = Visual
-definition = ultimaker_s3
-
-[metadata]
-setting_version = 10
-type = intent
-quality_type = draft
-intent_category = visual
-material = generic_tough_pla
-variant = AA 0.4
-
-[values]
-speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
index f627fbf74b..14bb0e0f54 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker_s5
 [metadata]
 setting_version = 10
 type = intent
-intent_category = smooth
+intent_category = quick
 quality_type = draft
 material = generic_abs
 variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg
deleted file mode 100644
index 4f7ee148f9..0000000000
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Visual.inst.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-[general]
-version = 4
-name = Visual
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 10
-type = intent
-intent_category = visualquality_type = draft
-material = generic_abs
-variant = AA 0.4
-
-[values]
-speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
index 553a68201d..86062ecf19 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker_s5
 [metadata]
 setting_version = 10
 type = intent
-intent_category = smooth
+intent_category = quick
 quality_type = draft
 material = generic_pla
 variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg
deleted file mode 100644
index a71bb898d3..0000000000
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Visual.inst.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-[general]
-version = 4
-name = Visual
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 10
-type = intent
-quality_type = draft
-intent_category = visual
-material = generic_pla
-variant = AA 0.4
-
-[values]
-speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
index 458b283dd8..3a6e19c64c 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg
@@ -6,7 +6,7 @@ definition = ultimaker_s5
 [metadata]
 setting_version = 10
 type = intent
-intent_category = smooth
+intent_category = quick
 quality_type = draft
 material = generic_tough_pla
 variant = AA 0.4
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg
deleted file mode 100644
index b522d262af..0000000000
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Visual.inst.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-[general]
-version = 4
-name = Visual
-definition = ultimaker_s5
-
-[metadata]
-setting_version = 10
-type = intent
-intent_category = visual
-material = generic_tough_pla
-variant = AA 0.4
-
-[values]
-speed_infill = 50
-wall_thickness = =wall_line_width * 3
-top_bottom_thickness = =wall_thickness