diff --git a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
index 4554e0aba5..a18bf4ea34 100644
--- a/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.25_normal.curaprofile
@@ -27,7 +27,6 @@ speed_topbottom = 20
 speed_infill = 30
 infill_before_walls = False
 retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
 infill_sparse_density = 22
 shell_thickness = 0.88
 cool_fan_speed_max = 100
diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
index 0c6a2fb79e..44a9ace179 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
@@ -28,7 +28,6 @@ speed_topbottom = 30
 speed_infill = 55
 infill_before_walls = False
 retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
 infill_sparse_density = 18
 shell_thickness = 0.7
 cool_fan_speed_max = 100
diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
index 55eae0a8f4..4477592e57 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
@@ -27,7 +27,6 @@ speed_topbottom = 20
 speed_infill = 45
 infill_before_walls = False
 retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
 infill_sparse_density = 22
 shell_thickness = 1.05
 cool_fan_speed_max = 100
diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
index 627f22aa61..9126e936e1 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
@@ -24,7 +24,6 @@ speed_topbottom = 20
 speed_infill = 45
 infill_before_walls = False
 retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
 shell_thickness = 1.05
 cool_fan_speed_max = 100
 raft_airgap = 0.0
diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
index 54904f0e2d..3a2fbb815e 100644
--- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
@@ -27,7 +27,6 @@ speed_topbottom = 20
 speed_infill = 55
 infill_before_walls = False
 retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
 shell_thickness = 1.59
 cool_fan_speed_max = 100
 raft_airgap = 0.0
diff --git a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
index 42addb54bb..3c6ef7f7e9 100644
--- a/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.8_normal.curaprofile
@@ -27,7 +27,6 @@ speed_topbottom = 20
 speed_infill = 40
 infill_before_walls = False
 retraction_speed = 40.0
-skin_no_small_gaps_heuristic = False
 shell_thickness = 2.1
 cool_fan_speed_max = 100
 raft_airgap = 0.0
diff --git a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
index 772d519e69..beef7f3490 100644
--- a/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.25_normal.curaprofile
@@ -12,7 +12,6 @@ support_enable = False
 raft_airgap = 0.0
 raft_surface_thickness = 0.27
 raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
 bottom_thickness = 0.72
 raft_surface_line_spacing = 3.0
 retraction_combing = All
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
index f484beaf30..37885d9235 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
@@ -8,7 +8,6 @@ material = CPE
 [settings]
 cool_fan_speed_min = 50
 retraction_hop = 0.0
-skin_no_small_gaps_heuristic = False
 raft_airgap = 0.0
 speed_travel = 150
 raft_surface_thickness = 0.27
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
index 0ca6bdca19..10e8252915 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
@@ -12,7 +12,6 @@ support_enable = False
 raft_airgap = 0.0
 raft_surface_thickness = 0.27
 raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
 bottom_thickness = 0.72
 raft_surface_line_spacing = 3.0
 retraction_combing = All
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
index 340ded170e..cfd3477f88 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
@@ -12,7 +12,6 @@ raft_airgap = 0.0
 raft_surface_thickness = 0.27
 support_pattern = lines
 raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
 raft_surface_line_width = 0.4
 cool_fan_speed_min = 50
 retraction_combing = All
diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
index d1b26b64e8..b3d19baa9e 100644
--- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
@@ -12,7 +12,6 @@ support_enable = False
 raft_airgap = 0.0
 raft_surface_thickness = 0.27
 raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
 bottom_thickness = 1.2
 support_pattern = lines
 retraction_combing = All
diff --git a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
index 9497120a63..b0bcdceac2 100644
--- a/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.8_normal.curaprofile
@@ -12,7 +12,6 @@ support_enable = False
 raft_airgap = 0.0
 raft_surface_thickness = 0.27
 raft_interface_line_spacing = 3.0
-skin_no_small_gaps_heuristic = False
 bottom_thickness = 1.2
 support_pattern = lines
 retraction_combing = All
diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
index 069f964e4d..31e2b5da88 100644
--- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
@@ -12,7 +12,6 @@ layer_height_0 = 0.15
 shell_thickness = 0.88
 top_bottom_thickness = 0.72
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_wipe_dist = 0.1
diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
index 870f8da6ed..62abae9dd2 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@@ -12,7 +12,6 @@ layer_height_0 = 0.26
 shell_thickness = 0.7
 top_bottom_thickness = 0.6
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 18
 infill_wipe_dist = 0.2
diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
index a2a89d897f..de38624a1e 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@@ -12,7 +12,6 @@ layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.84
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_wipe_dist = 0.2
diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
index 54dedd578d..20a4c5e002 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@@ -12,7 +12,6 @@ layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.8
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_wipe_dist = 0.2
diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
index eccc14ecff..bce7a83a87 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
@@ -12,7 +12,6 @@ layer_height_0 = 0.26
 shell_thickness = 1.4
 top_bottom_thickness = 1.12
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 25
 infill_wipe_dist = 0.2
diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
index 6a5f4033b1..f006c958c8 100644
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@@ -12,7 +12,6 @@ layer_height_0 = 0.4
 shell_thickness = 1.59
 top_bottom_thickness = 1.2
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_wipe_dist = 0.3
diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
index fe454b5c32..5c63cf0d7f 100644
--- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
@@ -12,7 +12,6 @@ layer_height_0 = 0.5
 shell_thickness = 2.1
 top_bottom_thickness = 1.6
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_wipe_dist = 0.4
diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
index 86db0cbd22..45e4a4a26a 100644
--- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile
@@ -11,7 +11,6 @@ layer_height_0 = 0.15
 shell_thickness = 0.88
 top_bottom_thickness = 0.72
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_overlap = 0.022
diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
index 6511f2ada8..815c6a74e2 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile
@@ -11,7 +11,6 @@ layer_height_0 = 0.26
 shell_thickness = 0.7
 top_bottom_thickness = 0.6
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 18
 infill_overlap = 0.035
diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
index 33be857fb7..f1b5234698 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile
@@ -11,7 +11,6 @@ layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.84
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_overlap = 0.035
diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
index 90fcf9e49c..a7f5687ce5 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile
@@ -11,7 +11,6 @@ layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.8
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_overlap = 0.035
diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
index 0181bc0bdf..0d37690391 100644
--- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile
@@ -11,7 +11,6 @@ layer_height_0 = 0.26
 shell_thickness = 1.4
 top_bottom_thickness = 1.12
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 25
 infill_overlap = 0.035
diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
index e52ae2c9b8..1ef68752ac 100644
--- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile
@@ -11,7 +11,6 @@ layer_height_0 = 0.4
 shell_thickness = 1.59
 top_bottom_thickness = 1.2
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_overlap = 0.053
diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
index bfc3ae8e34..97abce19a3 100644
--- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
+++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile
@@ -11,7 +11,6 @@ layer_height_0 = 0.5
 shell_thickness = 2.1
 top_bottom_thickness = 1.6
 travel_compensate_overlapping_walls_enabled = True
-skin_no_small_gaps_heuristic = False
 top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_overlap = 0.07