diff --git a/Components/Network/Driver/Modem_Null.c b/Components/Network/Driver/Modem_Null.c
index 602d3b18..c8e730fe 100644
--- a/Components/Network/Driver/Modem_Null.c
+++ b/Components/Network/Driver/Modem_Null.c
@@ -8,10 +8,6 @@
 
 #include "net_modem.h"
 
-#ifdef __clang__
-  #pragma clang diagnostic ignored "-Wpadded"
-#endif
-
 /* Modem driver states */
 enum Modem_State {
   Modem_Idle,
diff --git a/Components/Network/Driver/Modem_Standard.c b/Components/Network/Driver/Modem_Standard.c
index 095eaad9..7bf3f1fe 100644
--- a/Components/Network/Driver/Modem_Standard.c
+++ b/Components/Network/Driver/Modem_Standard.c
@@ -8,10 +8,6 @@
 
 #include "net_modem.h"
 
-#ifdef __clang__
-  #pragma clang diagnostic ignored "-Wpadded"
-#endif
-
 /* Modem driver states */
 enum Modem_State {
   Modem_Idle,
diff --git a/Components/Network/Include/rl_net.h b/Components/Network/Include/rl_net.h
index ec8dd2e8..5e3648ae 100644
--- a/Components/Network/Include/rl_net.h
+++ b/Components/Network/Include/rl_net.h
@@ -234,11 +234,6 @@ typedef struct sockaddr {
   int8_t   sa_data[14];                 ///< Direct address (up to 14 bytes)
 } SOCKADDR;
 
-#if defined(__clang__)
-  #pragma clang diagnostic push
-  #pragma clang diagnostic ignored "-Wc11-extensions"
-#endif
-
 #ifndef __DOXYGEN__
 
 /// Generic IPv4 Address structure.
@@ -265,10 +260,6 @@ typedef struct in6_addr {
 
 #endif
 
-#if defined(__clang__)
-  #pragma clang diagnostic pop
-#endif
-
 /// BSD Internet Addresses IPv6.
 extern const IN6_ADDR in6addr_any;      ///< All IPv6 addresses accepted
 extern const IN6_ADDR in6addr_loopback; ///< Localhost IPv6 address
@@ -722,11 +713,6 @@ typedef struct net_snmp_byte_str {
   uint8_t data[];                       ///< String content
 } NET_SNMP_BYTE_STR;
 
-#if defined(__clang__)
-  #pragma clang diagnostic push
-  #pragma clang diagnostic ignored "-Wpadded"
-#endif
-
 /// FS Interface Time info
 typedef struct net_fs_time {
   uint8_t  hr;                          ///< Hours    [0..23]
@@ -737,10 +723,6 @@ typedef struct net_fs_time {
   uint16_t year;                        ///< Year     [1980..2107]
 } NET_FS_TIME;
 
-#if defined(__clang__)
-  #pragma clang diagnostic pop
-#endif
-
 /// FS Interface Attributes
 #define NET_FS_ATTR_FILE        1       ///< File entry
 #define NET_FS_ATTR_DIRECTORY   2       ///< Directory entry
diff --git a/Components/Network/Source/net_config.c b/Components/Network/Source/net_config.c
index b882c3cd..78ee5c36 100644
--- a/Components/Network/Source/net_config.c
+++ b/Components/Network/Source/net_config.c
@@ -6,12 +6,6 @@
  * Purpose: Network Core Configuration
  *----------------------------------------------------------------------------*/
 
-#if defined(__clang__)
-  #pragma clang diagnostic ignored "-Wundef"
-  #pragma clang diagnostic ignored "-Wpadded"
-  #pragma clang diagnostic ignored "-Wmissing-noreturn"
-#endif
-
 #include "net_lib.h"
 
 /* Interface configuration */
@@ -118,10 +112,6 @@
 #endif
 
 /* Check configuration integrity */
-#if (!defined(NET_THREAD_STACK_SIZE))
-  #error "::Network:CORE: Configuration update required"
-#endif
-
 #if (ETH0_ENABLE && !defined(ETH0_THREAD_STACK_SIZE))
   #error "::Network:Interface:ETH0: Configuration update required"
 #endif
@@ -364,11 +354,6 @@
   #error "::Network:Service:TFTP Client: Block Size out of range"
 #endif
 
-/* Check SMTP client attachments */
-#if (SMTP_CLIENT_ENABLE && SMTP_CLIENT_ATTACH_ENABLE && !defined(RTE_FileSystem_Core))
-  #error "::Network:Service:SMTP Client: File System component required"
-#endif
-
 /* Check SMTP advanced client */
 #if (SMTP_CLIENT_ENABLE && SMTP_CLIENT_ATTACH_ENABLE && !DNS_CLIENT_ENABLE)
   #error "::Network:Service:SMTP Client: DNS Client service required"
diff --git a/Components/Network/Source/net_dbg.h b/Components/Network/Source/net_dbg.h
index 3285ae52..f0c8d983 100644
--- a/Components/Network/Source/net_dbg.h
+++ b/Components/Network/Source/net_dbg.h
@@ -16,13 +16,6 @@
   #define __DEBUG_ENABLED
 #endif
 
-#if defined(__clang__)
-  #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
-#elif (defined(__GNUC__) && defined(Network_Debug_EVR))
-  #pragma GCC diagnostic ignored "-Warray-bounds"
-  #pragma GCC diagnostic ignored "-Wstringop-overread"
-#endif
-
 #ifdef Network_Debug_STDIO
   #define DEBUGF(id,fmt,...) net_debug_info(id,fmt,##__VA_ARGS__)
   #define ERRORF(id,fmt,...) net_debug_error(id,fmt,##__VA_ARGS__)
diff --git a/Components/Network/Source/net_debug.c b/Components/Network/Source/net_debug.c
index 15cf70da..10e990f2 100644
--- a/Components/Network/Source/net_debug.c
+++ b/Components/Network/Source/net_debug.c
@@ -76,10 +76,6 @@ void net_evr_init (void) {
 #include <stdio.h>
 #include <stdarg.h>
 
-#if defined(__clang__)
-  #pragma clang diagnostic ignored "-Wformat-nonliteral"
-#endif
-
 #if (NET_DEBUG_CHANNEL == 2)
   #define __DEBUG_TIME  net_debug_time()
 #else
diff --git a/Components/Network/Source/net_lib.h b/Components/Network/Source/net_lib.h
index 184123da..5cff295a 100644
--- a/Components/Network/Source/net_lib.h
+++ b/Components/Network/Source/net_lib.h
@@ -27,10 +27,6 @@
  #endif
 #endif
 
-#ifdef __clang__
-  #pragma clang diagnostic ignored "-Wpadded"
-#endif
-
 /// General definitions
 #define NET_HEADER_LEN      4           ///< Network frame header length
 #define PHY_HEADER_LEN      14          ///< Physical/ethernet header length