diff --git a/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py b/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py
index 168ed12669..5e311f49e7 100644
--- a/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py
+++ b/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py
@@ -10,7 +10,9 @@ _removed_settings = {
     "travel_compensate_overlapping_walls_enabled",
     "travel_compensate_overlapping_walls_0_enabled",
     "travel_compensate_overlapping_walls_x_enabled",
-    "fill_perimeter_gaps"
+    "fill_perimeter_gaps",
+    "wall_min_flow",
+    "wall_min_flow_retract"
 }
 
 
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index b412f3d85b..8a5ce7e8b3 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1195,26 +1195,6 @@
                     "limit_to_extruder": "infill_extruder_nr",
                     "settable_per_mesh": true
                 },
-                "wall_min_flow":
-                {
-                    "label": "Minimum Wall Flow",
-                    "description": "Minimum allowed percentage flow for a wall line. The wall overlap compensation reduces a wall's flow when it lies close to an existing wall. Walls whose flow is less than this value will be replaced with a travel move. When using this setting, you must enable the wall overlap compensation and print the outer wall before inner walls.",
-                    "unit": "%",
-                    "minimum_value": "0",
-                    "maximum_value": "100",
-                    "default_value": 0,
-                    "type": "float",
-                    "settable_per_mesh": true
-                },
-                "wall_min_flow_retract":
-                {
-                    "label": "Prefer Retract",
-                    "description": "If enabled, retraction is used rather than combing for travel moves that replace walls whose flow is below the minimum flow threshold.",
-                    "type": "bool",
-                    "default_value": false,
-                    "enabled": "wall_min_flow > 0",
-                    "settable_per_mesh": true
-                },
                 "filter_out_tiny_gaps":
                 {
                     "label": "Filter Out Tiny Gaps",
diff --git a/resources/definitions/kingroon_base.def.json b/resources/definitions/kingroon_base.def.json
index c458e684bd..83c8da9f0f 100644
--- a/resources/definitions/kingroon_base.def.json
+++ b/resources/definitions/kingroon_base.def.json
@@ -194,7 +194,6 @@
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
         "material_flow": { "value": 100 },
-        "travel_compensate_overlapping_walls_0_enabled": { "value": false },
 
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_none'" },
@@ -207,7 +206,6 @@
         "infill_wipe_dist": { "value": 0.0 },
         "wall_0_wipe_dist": { "value": 0.0 },
 
-        "fill_perimeter_gaps": { "value": "'everywhere'" },
         "fill_outline_gaps": { "value": false },
         "filter_out_tiny_gaps": { "value": false },
 
diff --git a/resources/definitions/maker_made_300x.def.json b/resources/definitions/maker_made_300x.def.json
index a4b49820b7..b9aaac9e96 100644
--- a/resources/definitions/maker_made_300x.def.json
+++ b/resources/definitions/maker_made_300x.def.json
@@ -51,7 +51,6 @@
         "optimize_wall_printing_order": {"value": false },
         "inset_direction": {"value": "'inside_out'" },
         "alternate_extra_perimeter": {"value": false },
-        "wall_min_flow": {"value": 0},
         "filter_out_tiny_gaps": {"value": true },
         "fill_outline_gaps": {"value": true },
         "xy_offset": {"value": 0},
diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg
index dd36c2ff67..f88172adff 100644
--- a/resources/quality/key3d/key3d_tyro_best.inst.cfg
+++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg
@@ -30,7 +30,6 @@ wall_0_inset = 0
 optimize_wall_printing_order = False
 inset_direction = inside_out
 alternate_extra_perimeter = False
-wall_min_flow = 0
 filter_out_tiny_gaps = True
 fill_outline_gaps = True
 xy_offset = 0
diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg
index 3f567b78f7..bdbc8dd9b6 100644
--- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg
+++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg
@@ -29,7 +29,6 @@ wall_0_inset = 0
 optimize_wall_printing_order = False
 inset_direction = inside_out
 alternate_extra_perimeter = False
-wall_min_flow = 0
 filter_out_tiny_gaps = True
 fill_outline_gaps = True
 xy_offset = 0
diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg
index 77033a57ae..49dd6797f8 100644
--- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg
+++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg
@@ -29,7 +29,6 @@ wall_0_inset = 0
 optimize_wall_printing_order = False
 inset_direction = inside_out
 alternate_extra_perimeter = False
-wall_min_flow = 0
 filter_out_tiny_gaps = True
 fill_outline_gaps = True
 xy_offset = 0
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg
index 93a536b995..9be48dbbd9 100644
--- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg
@@ -31,7 +31,6 @@ wall_0_inset = 0
 optimize_wall_printing_order = False
 inset_direction = inside_out
 alternate_extra_perimeter = False
-wall_min_flow = 0
 filter_out_tiny_gaps = True
 fill_outline_gaps = True
 xy_offset = 0
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg
index 164bdd8a8d..4d79d72c0d 100644
--- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg
@@ -28,7 +28,6 @@ wall_0_inset = 0
 optimize_wall_printing_order = False
 inset_direction = inside_out
 alternate_extra_perimeter = False
-wall_min_flow = 0
 filter_out_tiny_gaps = True
 fill_outline_gaps = True
 xy_offset = 0
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg
index 7546bfbfad..4d5235d3b0 100644
--- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg
@@ -31,7 +31,6 @@ wall_0_inset = 0
 optimize_wall_printing_order = False
 inset_direction = inside_out
 alternate_extra_perimeter = False
-wall_min_flow = 0
 filter_out_tiny_gaps = True
 fill_outline_gaps = True
 xy_offset = 0
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg
index 5f799daf06..a6f8929e02 100644
--- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg
@@ -30,7 +30,6 @@ wall_0_inset = 0
 optimize_wall_printing_order = False
 inset_direction = inside_out
 alternate_extra_perimeter = False
-wall_min_flow = 0
 filter_out_tiny_gaps = True
 fill_outline_gaps = True
 xy_offset = 0
diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
index 5d1e69c6cf..e5d7378267 100644
--- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
+++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
@@ -29,7 +29,6 @@ wall_0_inset = 0
 optimize_wall_printing_order = False
 inset_direction = inside_out
 alternate_extra_perimeter = False
-wall_min_flow = 0
 filter_out_tiny_gaps = True
 fill_outline_gaps = True
 xy_offset = 0
diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
index 60c0334472..4fee0b35d9 100644
--- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
+++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
@@ -29,7 +29,6 @@ wall_0_inset = 0
 optimize_wall_printing_order = False
 inset_direction = inside_out
 alternate_extra_perimeter = False
-wall_min_flow = 0
 filter_out_tiny_gaps = True
 fill_outline_gaps = True
 xy_offset = 0
diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
index 4e15ce7cef..7130766951 100644
--- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
+++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
@@ -29,7 +29,6 @@ wall_0_inset = 0
 optimize_wall_printing_order = False
 inset_direction = inside_out
 alternate_extra_perimeter = False
-wall_min_flow = 0
 filter_out_tiny_gaps = True
 fill_outline_gaps = True
 xy_offset = 0