- Reverted the print profiles to changes agreed by the Print Profile CCB from 06-10-2021 14:00-15:00

66 files changed, 85 insertions, 209 deletions

diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json
index c028363239..4ade59985f 100644
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@@ -86,6 +86,19 @@
         },
         "machine_acceleration": {
             "default_value": 3000
+        },
+        "infill_before_walls": {
+            "value": false
+        },
+        "retraction_combing": {
+            "value": "no_outer_surfaces",
+            "default_value": "no_outer_surfaces"
+        },
+        "skin_monotonic" : {
+            "value": true
+        },
+        "top_bottom_pattern" : {
+            "value":  "zigzag"
         }
     }
 }
diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index cf4d5fd7ff..01a54426fa 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -96,20 +96,30 @@
         "cool_fan_speed": { "value": "50" },
         "cool_fan_speed_max": { "value": "100" },
         "cool_min_speed": { "value": "5" },
+        "infill_before_walls": { "value": false },
         "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" },
         "infill_overlap": { "value": "0" },
-        "infill_pattern": { "value": "'lines'" },
+        "infill_pattern": { "value": "'triangles'" },
         "infill_wipe_dist": { "value": "0" },
         "initial_layer_line_width_factor": { "value": "120" },
         "jerk_enabled": { "value": "True" },
-        "jerk_layer_0": { "value": "jerk_topbottom" },
-        "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
-        "jerk_print": { "value": "25" },
-        "jerk_support": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
-        "jerk_support_interface": { "value": "jerk_topbottom" },
-        "jerk_topbottom": { "value": "max(math.ceil(jerk_print * 5 / 25), 20)" },
-        "jerk_wall": { "value": "max(math.ceil(jerk_print * 10 / 25), 20" },
-        "jerk_wall_0": { "value": "max(math.ceil(jerk_wall * 5 / 10), 20)" },
+        "jerk_print": { "value": "20", "minimum_value": 20 },
+        "jerk_infill": {"minimum_value": 20 },
+        "jerk_wall": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_wall_0": { "value": "jerk_wall", "minimum_value": 20 },
+        "jerk_roofing": {"minimum_value": 20 },
+        "jerk_topbottom": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_support": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_support_infill": {"minimum_value": 20 },
+        "jerk_support_interface": { "value": "jerk_topbottom", "minimum_value": 20 },
+        "jerk_support_roof": {"minimum_value": 20 },
+        "jerk_support_bottom": {"minimum_value": 20 },
+        "jerk_prime_tower": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_travel": {"minimum_value": 20 },
+        "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value": 20},
+        "jerk_print_layer_0": {"minimum_value": 20 },
+        "jerk_travel_layer_0": {"minimum_value": 20 },
+        "jerk_skirt_brim": {"minimum_value": 20 },
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
         "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
@@ -132,6 +142,7 @@
         "raft_margin": { "value": "10" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
+        "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" },
         "retraction_count_max": { "value": "10" },
         "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
@@ -161,10 +172,7 @@
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_pattern" : {"value":  "zigzag"},
         "top_bottom_thickness": { "value": "1" },
-        "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" },
-        "wall_material_flow": {"value": "90"},
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
-        "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" },
         "wall_0_inset": { "value": "0" },
         "wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" },
         "wall_thickness": { "value": "1" },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index e0545dda65..cd5746fe43 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -89,19 +89,29 @@
         "cool_fan_speed": { "value": "50" },
         "cool_fan_speed_max": { "value": "100" },
         "cool_min_speed": { "value": "5" },
+        "infill_before_walls": { "value": false },
         "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" },
         "infill_overlap": { "value": "0" },
-        "infill_pattern": { "value": "'lines'" },
+        "infill_pattern": { "value": "'triangles'" },
         "infill_wipe_dist": { "value": "0" },
-        "jerk_enabled": { "value": "False" },
-        "jerk_layer_0": { "value": "jerk_topbottom" },
-        "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
-        "jerk_print": { "value": "25" },
-        "jerk_support": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
-        "jerk_support_interface": { "value": "jerk_topbottom" },
-        "jerk_topbottom": { "value": "max(math.ceil(jerk_print * 5 / 25), 20)" },
-        "jerk_wall": { "value": "max(math.ceil(jerk_print * 10 / 25), 20)" },
-        "jerk_wall_0": { "value": "max(math.ceil(jerk_wall * 5 / 10), 20)" },
+        "jerk_enabled": { "value": "True" },
+        "jerk_print": { "value": "20", "minimum_value": 20 },
+        "jerk_infill": {"minimum_value": 20 },
+        "jerk_wall": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_wall_0": { "value": "jerk_wall", "minimum_value": 20 },
+        "jerk_roofing": {"minimum_value": 20 },
+        "jerk_topbottom": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_support": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_support_infill": {"minimum_value": 20 },
+        "jerk_support_interface": { "value": "jerk_topbottom", "minimum_value": 20 },
+        "jerk_support_roof": {"minimum_value": 20 },
+        "jerk_support_bottom": {"minimum_value": 20 },
+        "jerk_prime_tower": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_travel": {"minimum_value": 20 },
+        "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value": 20},
+        "jerk_print_layer_0": {"minimum_value": 20 },
+        "jerk_travel_layer_0": {"minimum_value": 20 },
+        "jerk_skirt_brim": {"minimum_value": 20 },
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
         "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
@@ -123,6 +133,7 @@
         "raft_speed": { "value": "25" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
+        "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" },
         "retraction_count_max": { "value": "10" },
         "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
@@ -130,9 +141,7 @@
         "retraction_hop_only_when_collides": { "value": "True" },
         "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
-        "skin_monotonic" : { "value": "False" },
-        "roofing_layer_count": {"value": "1"},
-        "roofing_monotonic": {"value": "True"},
+        "skin_monotonic" : { "value": true },
         "skin_overlap": { "value": "10" },
         "speed_equalize_flow_enabled": { "value": "True" },
         "speed_layer_0": { "value": "20" },
@@ -159,11 +168,9 @@
         "wall_0_inset": { "value": "0" },
         "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
         "wall_thickness": { "value": "1" },
-        "wall_material_flow": {"value": "90"},
-        "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" },
+        "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
         "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
-        "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" },
         "initial_layer_line_width_factor": { "value": "120" },
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
     }
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index e2149019e0..d851238466 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -91,20 +91,29 @@
         "cool_fan_speed": { "value": "50" },
         "cool_fan_speed_max": { "value": "100" },
         "cool_min_speed": { "value": "5" },
+        "infill_before_walls": { "value": false },
         "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" },
         "infill_overlap": { "value": "0" },
-        "infill_pattern": { "value": "'lines'" },
+        "infill_pattern": { "value": "'triangles'" },
         "infill_wipe_dist": { "value": "0" },
-        "infill_before_walls": { "value": "False" },
         "jerk_enabled": { "value": "True" },
-        "jerk_layer_0": { "value": "jerk_topbottom" },
-        "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
-        "jerk_print": { "value": "25" },
-        "jerk_support": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
-        "jerk_support_interface": { "value": "jerk_topbottom" },
-        "jerk_topbottom": { "value": "max(math.ceil(jerk_print * 5 / 25), 20)" },
-        "jerk_wall": { "value": "max(math.ceil(jerk_print * 10 / 25), 20)" },
-        "jerk_wall_0": { "value": "max(math.ceil(jerk_wall * 5 / 10), 20)" },
+        "jerk_print": { "value": "20", "minimum_value": 20 },
+        "jerk_infill": {"minimum_value": 20 },
+        "jerk_wall": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_wall_0": { "value": "jerk_wall", "minimum_value": 20 },
+        "jerk_roofing": {"minimum_value": 20 },
+        "jerk_topbottom": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_support": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_support_infill": {"minimum_value": 20 },
+        "jerk_support_interface": { "value": "jerk_topbottom", "minimum_value": 20 },
+        "jerk_support_roof": {"minimum_value": 20 },
+        "jerk_support_bottom": {"minimum_value": 20 },
+        "jerk_prime_tower": { "value": "jerk_print", "minimum_value": 20 },
+        "jerk_travel": {"minimum_value": 20 },
+        "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value": 20},
+        "jerk_print_layer_0": {"minimum_value": 20 },
+        "jerk_travel_layer_0": {"minimum_value": 20 },
+        "jerk_skirt_brim": {"minimum_value": 20 },
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
         "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
@@ -133,9 +142,7 @@
         "retraction_hop_only_when_collides": { "value": "True" },
         "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
-        "skin_monotonic" : { "value": "False" },
-        "roofing_layer_count": {"value": "1"},
-        "roofing_monotonic": {"value": "True"},
+        "skin_monotonic" : { "value": true },
         "skin_overlap": { "value": "10" },
         "speed_equalize_flow_enabled": { "value": "True" },
         "speed_layer_0": { "value": "20" },
@@ -162,8 +169,7 @@
         "wall_0_inset": { "value": "0" },
         "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },
         "wall_thickness": { "value": "1" },
-        "wall_material_flow": {"value": "90"},
-        "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" },
+        "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
         "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
         "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" },
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
index 5693df306b..44a4ae7897 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
@@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
index c5eaa6c3ac..8c753ef948 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
@@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
index 8e6172d8f7..9b6104da25 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
index 61ec77d72a..a1e3e05ba5 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
index 53188692b8..0804f60436 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
index ac741853e6..c2bafc30c6 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
index 732ad0905f..8844a15e45 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
index 29f455e65a..52fe55ed0a 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
index 67db5395f7..d5093dd2b7 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
index d689a603d8..bd329948f8 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
@@ -32,5 +32,4 @@ top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width

 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

-infill_pattern = 'triangles'

-wall_material_flow = 100

+

diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
index a450339861..53bfb3b116 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
index 64221bedb3..799fab36e0 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
index 5c2cac232c..1b404665d4 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
@@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
index 696fe7ec36..74aabdaf9c 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
@@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
index 3bcb262450..195a57b041 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
@@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
index 6465503406..402ffb8a51 100644
--- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
@@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness
 wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
index b45bb53995..9536c24b86 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
index 8232526ea7..faa957ddea 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg
@@ -33,5 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
index ca9ad0d849..0bcba30cf2 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg
@@ -33,5 +33,4 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

-infill_pattern = 'triangles'

-wall_material_flow = 100

+

diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
index afef4e80d5..cb601ff61e 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg
@@ -33,5 +33,4 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

-infill_pattern = 'triangles'

-wall_material_flow = 100

+

diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
index d1dda124bd..a9dd2e0863 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg
@@ -33,5 +33,4 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

-infill_pattern = 'triangles'

-wall_material_flow = 100

+

diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
index d3aae5d932..81424cb862 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg
@@ -33,5 +33,4 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

-infill_pattern = 'triangles'

-wall_material_flow = 100

+

diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
index 68a6dbec13..b1a2905659 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg
@@ -33,5 +33,4 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

-infill_pattern = 'triangles'

-wall_material_flow = 100

+

diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
index 8822d01402..853307f093 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg
@@ -33,5 +33,4 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

-infill_pattern = 'triangles'

-wall_material_flow = 100

+

diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
index 579d450696..a4f9cafae9 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg
@@ -33,5 +33,4 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3

 xy_offset = =-layer_height * 0.2

 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

-infill_pattern = 'triangles'

-wall_material_flow = 100

+

diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
index 4aa2d5a49f..d49a121334 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg
@@ -34,5 +34,3 @@ wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2

 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
index e36a2d4737..a06922a0d1 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg
@@ -34,5 +34,3 @@ wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2

 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
index d5dfc07b2b..b4a7b7e3ac 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg
@@ -34,5 +34,3 @@ wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2

 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset

 

-infill_pattern = 'triangles'

-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
index 4e3fc3de3f..3d6336fce5 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg
@@ -33,6 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
index 940a0d4e55..3c1bd032af 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg
@@ -33,6 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
index 5a59c962da..c0ddc08d88 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg
@@ -33,6 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
index 99e09d51be..1809422b15 100644
--- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
+++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg
@@ -33,6 +33,3 @@ wall_line_width_x = =line_width
 wall_thickness = =line_width * 3
 xy_offset = =-layer_height * 0.2
 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
-
-infill_pattern = 'triangles'
-wall_material_flow = 100
\ No newline at end of file
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
index c17eac097d..87f432b80a 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature - 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
index a9082464e0..042eb806be 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature + 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
index 8e60621c5d..3a61f887ee 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 layer_height = 0.3
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
index e9dd9ba255..df1f349d7e 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -20,9 +20,6 @@ infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
index 2a25221203..7783a639f3 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -20,9 +20,6 @@ infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 layer_height = 0.4
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
index dad835a0c9..fcbbf61e64 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -20,9 +20,6 @@ infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 layer_height = 0.3
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
index d4f54922d3..04568434bd 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature - 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
index 8257a7f854..fc42b6fbd6 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature + 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
index 566e79dfc7..b4c6cfdf02 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
 material_standby_temperature = 100
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
index 4930036a4e..2afe0ec9cb 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -18,9 +18,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = cross_3d
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
index b54ae49d6d..222f356e8b 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -19,9 +19,6 @@ infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
index dda18519b5..272e8f50b4 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -19,9 +19,6 @@ infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
index bdb28c8633..6fc530d8da 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature - 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
index 3d7b1c1147..5a8a47212d 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature + 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
index 5cacedaf49..f1cc5604f3 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
 material_standby_temperature = 100
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
index bb5f8b1fb2..ffc21e7071 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
@@ -18,9 +18,6 @@ top_skin_expand_distance = =line_width * 2
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = cross_3d
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
index d83ef48e5a..6ed2dd23e8 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -19,9 +19,6 @@ infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
index 180f28db6d..834230cc59 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -19,9 +19,6 @@ infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index f3f19887b3..cb8b95b0fb 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -23,9 +23,6 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 200
 layer_height = 0.2
 line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index 4a48d7f830..6aed23623a 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -25,11 +25,7 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index 5f2409965f..a60190d2ff 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -15,10 +15,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index f66e83e611..5a1259fc35 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -23,9 +23,6 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 20)
 layer_height = 0.2
 line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index 3c45cd355c..df1c09633b 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -25,11 +25,7 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
index be3d5ef8c5..c22fb01c15 100644
--- a/resources/variants/ultimaker3_extended_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -15,10 +15,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_prime_tower = =math.ceil(jerk_print * 2 / 25)
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
index df04b8634e..7fac331e72 100644
--- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
@@ -23,9 +23,6 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 20)
 layer_height = 0.2
 line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
index 819ca14649..ba64926541 100644
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -25,11 +25,7 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg
index 8ee593eca5..52f41f837c 100644
--- a/resources/variants/ultimaker_s3_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb04.inst.cfg
@@ -15,10 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index c7a4dcd596..7a6bf3deb5 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
@@ -23,9 +23,6 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 20)
 layer_height = 0.2
 line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index b73eefe19e..06c71b1dfc 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -25,11 +25,7 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
index 1d2da249af..c178cdcd17 100644
--- a/resources/variants/ultimaker_s5_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb04.inst.cfg
@@ -15,10 +15,6 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0