diff --git a/src/Base/swigpyrun.cpp b/src/Base/swigpyrun.cpp
index 3213ad2a48..87fc3f59c5 100644
--- a/src/Base/swigpyrun.cpp
+++ b/src/Base/swigpyrun.cpp
@@ -31,10 +31,8 @@
 #elif defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#if __GNUC__ >= 8
 #pragma GCC diagnostic ignored "-Wcast-function-type"
 #endif
-#endif
 #include "PyExport.h"
 #include "Exception.h"
 namespace Swig_python
diff --git a/src/Mod/Part/App/GeometryMigrationExtension.cpp b/src/Mod/Part/App/GeometryMigrationExtension.cpp
index 2ecebe6298..43388eeecc 100644
--- a/src/Mod/Part/App/GeometryMigrationExtension.cpp
+++ b/src/Mod/Part/App/GeometryMigrationExtension.cpp
@@ -52,11 +52,7 @@ std::unique_ptr<Part::GeometryExtension> GeometryMigrationExtension::copy() cons
 
     copyAttributes(cpy.get());
 
-#if defined (__GNUC__) && (__GNUC__ <=4)
-    return std::move(cpy);
-#else
     return cpy;
-#endif
 }
 
 PyObject * GeometryMigrationExtension::getPyObject()
diff --git a/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp b/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp
index ced70dde49..7053525dc6 100644
--- a/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp
+++ b/src/Mod/Sketcher/App/ExternalGeometryExtension.cpp
@@ -82,11 +82,7 @@ std::unique_ptr<Part::GeometryExtension> ExternalGeometryExtension::copy() const
 
     copyAttributes(cpy.get());
 
-#if defined(__GNUC__) && (__GNUC__ <= 4)
-    return std::move(cpy);
-#else
     return cpy;
-#endif
 }
 
 PyObject* ExternalGeometryExtension::getPyObject()
diff --git a/src/Mod/Sketcher/App/SketchGeometryExtension.cpp b/src/Mod/Sketcher/App/SketchGeometryExtension.cpp
index 00929143b6..4759004f4e 100644
--- a/src/Mod/Sketcher/App/SketchGeometryExtension.cpp
+++ b/src/Mod/Sketcher/App/SketchGeometryExtension.cpp
@@ -103,12 +103,7 @@ std::unique_ptr<Part::GeometryExtension> SketchGeometryExtension::copy() const
     auto cpy = std::make_unique<SketchGeometryExtension>();
 
     copyAttributes(cpy.get());
-
-#if defined(__GNUC__) && (__GNUC__ <= 4)
-    return std::move(cpy);
-#else
     return cpy;
-#endif
 }
 
 PyObject* SketchGeometryExtension::getPyObject()
diff --git a/src/Mod/Sketcher/App/SolverGeometryExtension.cpp b/src/Mod/Sketcher/App/SolverGeometryExtension.cpp
index 89c94a2dfe..f0e83cf6bd 100644
--- a/src/Mod/Sketcher/App/SolverGeometryExtension.cpp
+++ b/src/Mod/Sketcher/App/SolverGeometryExtension.cpp
@@ -53,12 +53,7 @@ std::unique_ptr<Part::GeometryExtension> SolverGeometryExtension::copy() const
     auto cpy = std::make_unique<SolverGeometryExtension>();
 
     copyAttributes(cpy.get());
-
-#if defined(__GNUC__) && (__GNUC__ <= 4)
-    return std::move(cpy);
-#else
     return cpy;
-#endif
 }
 
 PyObject* SolverGeometryExtension::getPyObject()
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp
index 05feb2c345..b2d177b524 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketchGeometryExtension.cpp
@@ -57,11 +57,7 @@ std::unique_ptr<Part::GeometryExtension> ViewProviderSketchGeometryExtension::co
 
     copyAttributes(cpy.get());
 
-#if defined(__GNUC__) && (__GNUC__ <= 4)
-    return std::move(cpy);
-#else
     return cpy;
-#endif
 }
 
 void ViewProviderSketchGeometryExtension::restoreAttributes(Base::XMLReader& reader)