diff --git a/code/AssetLib/FBX/FBXParser.cpp b/code/AssetLib/FBX/FBXParser.cpp
index 9278d90ab..11cd1a934 100644
--- a/code/AssetLib/FBX/FBXParser.cpp
+++ b/code/AssetLib/FBX/FBXParser.cpp
@@ -190,7 +190,7 @@ Scope::Scope(Parser& parser,bool topLevel)
         }
 
         auto *element = new_Element(*n, parser);
-        
+
         // Element() should stop at the next Key token (or right after a Close token)
         n = parser.CurrentToken();
         if (n == nullptr) {
diff --git a/code/AssetLib/X3D/X3DXmlHelper.cpp b/code/AssetLib/X3D/X3DXmlHelper.cpp
index ff24b74b3..7ed2e8237 100644
--- a/code/AssetLib/X3D/X3DXmlHelper.cpp
+++ b/code/AssetLib/X3D/X3DXmlHelper.cpp
@@ -12,7 +12,6 @@ bool X3DXmlHelper::getColor3DAttribute(XmlNode &node, const char *attributeName,
         tokenize<std::string>(val, values, " ");
         if (values.size() != 3) {
             Throw_ConvertFail_Str2ArrF(node.name(), attributeName);
-            return false;
         }
         auto it = values.begin();
         color.r = stof(*it++);
@@ -30,7 +29,6 @@ bool X3DXmlHelper::getVector2DAttribute(XmlNode &node, const char *attributeName
         tokenize<std::string>(val, values, " ");
         if (values.size() != 2) {
             Throw_ConvertFail_Str2ArrF(node.name(), attributeName);
-            return false;
         }
         auto it = values.begin();
         color.x = stof(*it++);
@@ -47,7 +45,6 @@ bool X3DXmlHelper::getVector3DAttribute(XmlNode &node, const char *attributeName
         tokenize<std::string>(val, values, " ");
         if (values.size() != 3) {
             Throw_ConvertFail_Str2ArrF(node.name(), attributeName);
-            return false;
         }
         auto it = values.begin();
         color.x = stof(*it++);
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index d5500d986..02ba7a08e 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -1234,14 +1234,11 @@ IF (ASSIMP_WARNINGS_AS_ERRORS)
         -Wno-header-hygiene
         -Wno-tautological-value-range-compare
         -Wno-tautological-type-limit-compare
-        -Wno-missing-noreturn
         -Wno-missing-variable-declarations
         -Wno-extra-semi
         -Wno-nonportable-system-include-path
         -Wno-undefined-reinterpret-cast
         -Wno-shift-sign-overflow
-        -Wno-deprecated-copy-with-user-provided-dtor
-        -Wno-deprecated-copy-with-dtor
         -Wno-deprecated
         -Wno-format-nonliteral
         -Wno-comma