--- a/src/common/fast_guided_filter.h
+++ b/src/common/fast_guided_filter.h
@@ -36,11 +36,10 @@
 #if defined(__GNUC__)
 #pragma GCC optimize ("unroll-loops", "tree-loop-if-convert", \
                       "tree-loop-distribution", "no-strict-aliasing", \
-                      "loop-interchange", "loop-nest-optimize", "tree-loop-im", \
+                      "loop-interchange", "tree-loop-im", \
                       "unswitch-loops", "tree-loop-ivcanon", "ira-loop-pressure", \
                       "split-ivs-in-unroller", "variable-expansion-in-unroller", \
                       "split-loops", "ivopts", "predictive-commoning",\
-                      "tree-loop-linear", "loop-block", "loop-strip-mine", \
                       "finite-math-only", "fp-contract=fast", "fast-math")
 #endif
 
--- a/src/common/iop_order.c
+++ b/src/common/iop_order.c
@@ -44,11 +44,10 @@ static void _ioppr_reset_iop_order(GList *iop_order_list);
 #if defined(__GNUC__)
 #pragma GCC optimize ("unroll-loops", "tree-loop-if-convert", \
                       "tree-loop-distribution", "no-strict-aliasing", \
-                      "loop-interchange", "loop-nest-optimize", "tree-loop-im", \
+                      "loop-interchange", "tree-loop-im", \
                       "unswitch-loops", "tree-loop-ivcanon", "ira-loop-pressure", \
                       "split-ivs-in-unroller", "variable-expansion-in-unroller", \
                       "split-loops", "ivopts", "predictive-commoning",\
-                      "tree-loop-linear", "loop-block", "loop-strip-mine", \
                       "fp-contract=fast", \
                       "tree-vectorize")
 #endif
--- a/src/common/iop_profile.c
+++ b/src/common/iop_profile.c
@@ -39,11 +39,10 @@
 #if defined(__GNUC__)
 #pragma GCC optimize ("unroll-loops", "tree-loop-if-convert", \
                       "tree-loop-distribution", "no-strict-aliasing", \
-                      "loop-interchange", "loop-nest-optimize", "tree-loop-im", \
+                      "loop-interchange", "tree-loop-im", \
                       "unswitch-loops", "tree-loop-ivcanon", "ira-loop-pressure", \
                       "split-ivs-in-unroller", "variable-expansion-in-unroller", \
                       "split-loops", "ivopts", "predictive-commoning",\
-                      "tree-loop-linear", "loop-block", "loop-strip-mine", \
                       "fp-contract=fast", \
                       "tree-vectorize")
 #endif
--- a/src/common/luminance_mask.h
+++ b/src/common/luminance_mask.h
@@ -37,11 +37,10 @@
 #if defined(__GNUC__)
 #pragma GCC optimize ("unroll-loops", "tree-loop-if-convert", \
                       "tree-loop-distribution", "no-strict-aliasing", \
-                      "loop-interchange", "loop-nest-optimize", "tree-loop-im", \
+                      "loop-interchange", "tree-loop-im", \
                       "unswitch-loops", "tree-loop-ivcanon", "ira-loop-pressure", \
                       "split-ivs-in-unroller", "variable-expansion-in-unroller", \
                       "split-loops", "ivopts", "predictive-commoning",\
-                      "tree-loop-linear", "loop-block", "loop-strip-mine", \
                       "finite-math-only", "fp-contract=fast", "fast-math")
 #endif
 
--- a/src/develop/blends/blendif_lab.c
+++ b/src/develop/blends/blendif_lab.c
@@ -18,10 +18,10 @@
 
 #if defined(__GNUC__)
 #pragma GCC optimize("unroll-loops", "tree-loop-if-convert", "tree-loop-distribution", "no-strict-aliasing",      \
-                     "loop-interchange", "loop-nest-optimize", "tree-loop-im", "unswitch-loops",                  \
+                     "loop-interchange", "tree-loop-im", "unswitch-loops",                  \
                      "tree-loop-ivcanon", "ira-loop-pressure", "split-ivs-in-unroller", "tree-loop-vectorize",    \
                      "variable-expansion-in-unroller", "split-loops", "ivopts", "predictive-commoning",           \
-                     "tree-loop-linear", "loop-block", "loop-strip-mine", "finite-math-only", "fp-contract=fast", \
+                     "finite-math-only", "fp-contract=fast", \
                      "fast-math", "no-math-errno")
 #endif
 
--- a/src/develop/blends/blendif_raw.c
+++ b/src/develop/blends/blendif_raw.c
@@ -18,10 +18,10 @@
 
 #if defined(__GNUC__)
 #pragma GCC optimize("unroll-loops", "tree-loop-if-convert", "tree-loop-distribution", "no-strict-aliasing",      \
-                     "loop-interchange", "loop-nest-optimize", "tree-loop-im", "unswitch-loops",                  \
+                     "loop-interchange", "tree-loop-im", "unswitch-loops",                  \
                      "tree-loop-ivcanon", "ira-loop-pressure", "split-ivs-in-unroller", "tree-loop-vectorize",    \
                      "variable-expansion-in-unroller", "split-loops", "ivopts", "predictive-commoning",           \
-                     "tree-loop-linear", "loop-block", "loop-strip-mine", "finite-math-only", "fp-contract=fast", \
+                     "finite-math-only", "fp-contract=fast", \
                      "fast-math", "no-math-errno")
 #endif
 
--- a/src/develop/blends/blendif_rgb_hsl.c
+++ b/src/develop/blends/blendif_rgb_hsl.c
@@ -18,10 +18,10 @@
 
 #if defined(__GNUC__)
 #pragma GCC optimize("unroll-loops", "tree-loop-if-convert", "tree-loop-distribution", "no-strict-aliasing",      \
-                     "loop-interchange", "loop-nest-optimize", "tree-loop-im", "unswitch-loops",                  \
+                     "loop-interchange", "tree-loop-im", "unswitch-loops",                  \
                      "tree-loop-ivcanon", "ira-loop-pressure", "split-ivs-in-unroller", "tree-loop-vectorize",    \
                      "variable-expansion-in-unroller", "split-loops", "ivopts", "predictive-commoning",           \
-                     "tree-loop-linear", "loop-block", "loop-strip-mine", "finite-math-only", "fp-contract=fast", \
+                     "finite-math-only", "fp-contract=fast", \
                      "fast-math", "no-math-errno")
 #endif
 
--- a/src/develop/blends/blendif_rgb_jzczhz.c
+++ b/src/develop/blends/blendif_rgb_jzczhz.c
@@ -18,10 +18,10 @@
 
 #if defined(__GNUC__)
 #pragma GCC optimize("unroll-loops", "tree-loop-if-convert", "tree-loop-distribution", "no-strict-aliasing",      \
-                     "loop-interchange", "loop-nest-optimize", "tree-loop-im", "unswitch-loops",                  \
+                     "loop-interchange", "tree-loop-im", "unswitch-loops",                  \
                      "tree-loop-ivcanon", "ira-loop-pressure", "split-ivs-in-unroller", "tree-loop-vectorize",    \
                      "variable-expansion-in-unroller", "split-loops", "ivopts", "predictive-commoning",           \
-                     "tree-loop-linear", "loop-block", "loop-strip-mine", "finite-math-only", "fp-contract=fast", \
+                     "finite-math-only", "fp-contract=fast", \
                      "fast-math", "no-math-errno")
 #endif
 
--- a/src/iop/channelmixerrgb.c
+++ b/src/iop/channelmixerrgb.c
@@ -52,11 +52,10 @@ DT_MODULE_INTROSPECTION(2, dt_iop_channelmixer_rgb_params_t)
 #if defined(__GNUC__)
 #pragma GCC optimize ("unroll-loops", "tree-loop-if-convert", \
                       "tree-loop-distribution", "no-strict-aliasing", \
-                      "loop-interchange", "loop-nest-optimize", "tree-loop-im", \
+                      "loop-interchange", "tree-loop-im", \
                       "unswitch-loops", "tree-loop-ivcanon", "ira-loop-pressure", \
                       "split-ivs-in-unroller", "variable-expansion-in-unroller", \
                       "split-loops", "ivopts", "predictive-commoning",\
-                      "tree-loop-linear", "loop-block", "loop-strip-mine", \
                       "finite-math-only", "fp-contract=fast", "fast-math", \
                       "tree-vectorize", "no-math-errno")
 #endif
--- a/src/iop/choleski.h
+++ b/src/iop/choleski.h
@@ -34,11 +34,10 @@
 #if defined(__GNUC__)
 #pragma GCC optimize ("unroll-loops", "tree-loop-if-convert", \
                       "tree-loop-distribution", "no-strict-aliasing", \
-                      "loop-interchange", "loop-nest-optimize", "tree-loop-im", \
+                      "loop-interchange", "tree-loop-im", \
                       "unswitch-loops", "tree-loop-ivcanon", "ira-loop-pressure", \
                       "split-ivs-in-unroller", "variable-expansion-in-unroller", \
                       "split-loops", "ivopts", "predictive-commoning",\
-                      "tree-loop-linear", "loop-block", "loop-strip-mine", \
                       "finite-math-only", "fp-contract=fast", "fast-math")
 #endif
 
--- a/src/iop/filmicrgb.c
+++ b/src/iop/filmicrgb.c
@@ -96,10 +96,10 @@ DT_MODULE_INTROSPECTION(4, dt_iop_filmicrgb_params_t)
  **/
 #if defined(__GNUC__)
 #pragma GCC optimize("unroll-loops", "tree-loop-if-convert", "tree-loop-distribution", "no-strict-aliasing",      \
-                     "loop-interchange", "loop-nest-optimize", "tree-loop-im", "unswitch-loops",                  \
+                     "loop-interchange", "tree-loop-im", "unswitch-loops",                  \
                      "tree-loop-ivcanon", "ira-loop-pressure", "split-ivs-in-unroller",                           \
                      "variable-expansion-in-unroller", "split-loops", "ivopts", "predictive-commoning",           \
-                     "tree-loop-linear", "loop-block", "loop-strip-mine", "finite-math-only", "fp-contract=fast", \
+                     "finite-math-only", "fp-contract=fast", \
                      "fast-math", "no-math-errno")
 #endif
 
--- a/src/iop/negadoctor.c
+++ b/src/iop/negadoctor.c
@@ -43,11 +43,10 @@
 #if defined(__GNUC__)
 #pragma GCC optimize ("unroll-loops", "tree-loop-if-convert", \
                       "tree-loop-distribution", "no-strict-aliasing", \
-                      "loop-interchange", "loop-nest-optimize", "tree-loop-im", \
+                      "loop-interchange", "tree-loop-im", \
                       "unswitch-loops", "tree-loop-ivcanon", "ira-loop-pressure", \
                       "split-ivs-in-unroller", "variable-expansion-in-unroller", \
                       "split-loops", "ivopts", "predictive-commoning",\
-                      "tree-loop-linear", "loop-block", "loop-strip-mine", \
                       "finite-math-only", "fp-contract=fast", "fast-math")
 #endif
 
--- a/src/iop/toneequal.c
+++ b/src/iop/toneequal.c
@@ -119,11 +119,10 @@ DT_MODULE_INTROSPECTION(2, dt_iop_toneequalizer_params_t)
 #if defined(__GNUC__)
 #pragma GCC optimize ("unroll-loops", "tree-loop-if-convert", \
                       "tree-loop-distribution", "no-strict-aliasing", \
-                      "loop-interchange", "loop-nest-optimize", "tree-loop-im", \
+                      "loop-interchange", "tree-loop-im", \
                       "unswitch-loops", "tree-loop-ivcanon", "ira-loop-pressure", \
                       "split-ivs-in-unroller", "variable-expansion-in-unroller", \
                       "split-loops", "ivopts", "predictive-commoning",\
-                      "tree-loop-linear", "loop-block", "loop-strip-mine", \
                       "finite-math-only", "fp-contract=fast", "fast-math", \
                       "tree-vectorize")
 #endif