restructure raft airgapPP-243-cleanup-raft-settings

No values are changed, but the settings are restructured. The PVA airgap is moved to fdm_materials. Inconsistent use of equations is also resolved. PP-243

38 files changed, 19 insertions, 38 deletions

diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index 0988d7a6e4..8090938556 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -111,7 +111,6 @@
         "multiple_mesh_overlap": { "value": "0" },
         "optimize_wall_printing_order": { "value": "True" },
         "prime_tower_enable": { "default_value": true },
-        "raft_airgap": { "value": "0" },
         "retraction_amount": { "value": "6.5" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 6653ffddf4..584ce726f0 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -100,7 +100,6 @@
         "multiple_mesh_overlap": { "value": "0" },
         "optimize_wall_printing_order": { "value": "True" },
         "prime_tower_enable": { "value": "True" },
-        "raft_airgap": { "value": "0" },
         "retraction_amount": { "value": "6.5" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 1f5fa06ee7..e00399a588 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -101,7 +101,6 @@
         "default_material_print_temperature": { "value": "200" },
         "multiple_mesh_overlap": { "value": "0" },
         "prime_tower_enable": { "value": "True" },
-        "raft_airgap": { "value": "0" },
         "retraction_amount": { "value": "6.5" },
         "retraction_combing": { "value": "'no_outer_surfaces'"},
         "retraction_hop": { "value": "2" },
diff --git a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg
index 93f8d98598..7cb72ef3e0 100644
--- a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg
@@ -17,7 +17,7 @@ cool_min_speed = 12
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.15
 retraction_min_travel = 5
 skin_overlap = 50
 speed_print = 70
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
index 34ff30d4e5..babf6f1306 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -19,7 +19,7 @@ material_print_temperature = =default_material_print_temperature + 10
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.25
 skin_overlap = 50
 speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 switch_extruder_prime_speed = 30
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
index 36c0dbbf2f..cbf61a838f 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -19,7 +19,7 @@ material_print_temperature = =default_material_print_temperature + 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.25
 skin_overlap = 50
 speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 switch_extruder_prime_speed = 30
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
index 9bc7c2ecce..31e1d559f3 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
@@ -18,7 +18,7 @@ cool_min_speed = 15
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.25
 skin_overlap = 50
 speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 switch_extruder_prime_speed = 30
diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
index c5f92c2515..761ab7d56d 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -18,7 +18,7 @@ cool_min_speed = 12
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.25
 skin_overlap = 50
 speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 switch_extruder_prime_speed = 30
diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
index aa9d44f0e0..a171427548 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
@@ -19,7 +19,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
index 56432e5af9..e80a6c73fd 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
@@ -20,7 +20,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
index 6e98944441..a2ca3a769f 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -20,7 +20,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
index 2b12e3380b..d20c1303b8 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
@@ -34,5 +34,5 @@ top_bottom_thickness = 0.9
 
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 
-raft_airgap = =0.25
+raft_airgap = 0.25
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
index 1b508e3a23..2d05a15f3c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
@@ -34,5 +34,5 @@ top_bottom_thickness = 1.2
 
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 
-raft_airgap = =0.25
+raft_airgap = 0.25
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
index deed7d6486..09de59ba20 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
@@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
index 5dfbf6ce6c..d6e11ca953 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
@@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
index 2717be119c..599789f528 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
index 5e4bfd359d..b06a514334 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
@@ -18,7 +18,7 @@ cool_min_speed = 12
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.15
 retraction_min_travel = 5
 skin_overlap = 50
 speed_print = 70
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
index 3b20559564..962f906e74 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
@@ -35,5 +35,5 @@ top_bottom_thickness = 0.9
 
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 
-raft_airgap = =0.25
+raft_airgap = 0.25
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
index bfb76f20c8..5150537256 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
@@ -34,5 +34,5 @@ top_bottom_thickness = 1.2
 
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 
-raft_airgap = =0.25
+raft_airgap = 0.25
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
index 7bd2536fa0..addfe52641 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
@@ -19,7 +19,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
index 4ba546ab06..aec980aa48 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
@@ -19,7 +19,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
index 5466fb4a72..fc9d586503 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
@@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg
index 5d6a33d365..15fc789f66 100644
--- a/resources/variants/ultimaker3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.25.inst.cfg
@@ -18,7 +18,6 @@ machine_nozzle_size = 0.25
 machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg
index d708aa724a..c81caf4164 100644
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_airgap = 0.3
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index 5d4cd93ef6..fd516c48b2 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -31,7 +31,6 @@ material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
-raft_airgap = 0
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
index 612f09b509..e6a9abfe1e 100644
--- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
@@ -18,7 +18,6 @@ machine_nozzle_size = 0.25
 machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg
index e4a739516f..be07b56cdc 100644
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_airgap = 0.3
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index 09f97c3562..e052df63eb 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -31,7 +31,6 @@ material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
-raft_airgap = 0
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
index f4c025b8fe..059f3ece2f 100644
--- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
@@ -18,7 +18,6 @@ machine_nozzle_size = 0.25
 machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg
index e860d64cd2..fb995635ff 100644
--- a/resources/variants/ultimaker_s3_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa04.inst.cfg
@@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_airgap = 0.3
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
index 12dd16e06a..0305245e08 100644
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -30,7 +30,6 @@ material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
-raft_airgap = 0
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s3_cc04.inst.cfg b/resources/variants/ultimaker_s3_cc04.inst.cfg
index d056faa5a0..0c22958955 100644
--- a/resources/variants/ultimaker_s3_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc04.inst.cfg
@@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = CC 0.4
 machine_nozzle_size = 0.4
-raft_airgap = 0.3
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg
index ac1f171098..caa1616d4d 100644
--- a/resources/variants/ultimaker_s3_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc06.inst.cfg
@@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = CC 0.6
 machine_nozzle_size = 0.6
-raft_airgap = 0.3
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
index 11637d1ba9..3b9d08b278 100644
--- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
@@ -18,7 +18,6 @@ machine_nozzle_size = 0.25
 machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg
index 6d55c27cae..4d361e51c8 100644
--- a/resources/variants/ultimaker_s5_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa04.inst.cfg
@@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_airgap = 0.3
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 skin_overlap = 15
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index dde21ab57e..3c2e9d14cb 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -30,7 +30,6 @@ material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
-raft_airgap = 0
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s5_cc04.inst.cfg b/resources/variants/ultimaker_s5_cc04.inst.cfg
index 6632045a92..174a4f7c62 100644
--- a/resources/variants/ultimaker_s5_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc04.inst.cfg
@@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = CC 0.4
 machine_nozzle_size = 0.4
-raft_airgap = 0.3
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg
index 3a34e292dc..e8934377a1 100644
--- a/resources/variants/ultimaker_s5_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc06.inst.cfg
@@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = CC 0.6
 machine_nozzle_size = 0.6
-raft_airgap = 0.3
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print