--- darktable/src/common/fast_guided_filter.h
+++ darktable/src/common/fast_guided_filter.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
 
--- darktable/src/common/iop_order.c
+++ darktable/src/common/iop_order.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", \
                       "fp-contract=fast", \
                       "tree-vectorize")
 #endif
--- darktable/src/common/luminance_mask.h
+++ darktable/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
 
--- darktable/src/iop/choleski.h
+++ darktable/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
 
--- darktable/src/iop/filmicrgb.c
+++ darktable/src/iop/filmicrgb.c
@@ -90,11 +90,10 @@ DT_MODULE_INTROSPECTION(1, 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", \
+                      "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
 
--- darktable/src/iop/toneequal.c
+++ darktable/src/iop/toneequal.c
@@ -118,11 +118,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