diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
index 97a15de6d..1efbf3f33 100644
--- a/src/ArduinoIoTCloudTCP.cpp
+++ b/src/ArduinoIoTCloudTCP.cpp
@@ -132,16 +132,7 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
   _brokerAddress = brokerAddress;
   _brokerPort = brokerPort;
 
-#if defined(__AVR__)
-  String const nina_fw_version = WiFi.firmwareVersion();
-  if (nina_fw_version < "1.4.2")
-  {
-    DEBUG_ERROR("ArduinoIoTCloudTCP::%s NINA firmware needs to be >= 1.4.2 to support cloud on Uno WiFi Rev. 2, current %s", __FUNCTION__, nina_fw_version.c_str());
-    return 0;
-  }
-#endif /* AVR */
-
-#if OTA_ENABLED && !defined(__AVR__)
+#if OTA_ENABLED
   _ota_img_sha256 = OTA::getImageSHA256();
   DEBUG_VERBOSE("SHA256: HASH(%d) = %s", strlen(_ota_img_sha256.c_str()), _ota_img_sha256.c_str());
 #endif /* OTA_ENABLED */
@@ -483,18 +474,14 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeThingTopics()
   if (!_mqttClient.subscribe(_dataTopicIn))
   {
     DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not subscribe to %s", __FUNCTION__, _dataTopicIn.c_str());
-#if !defined(__AVR__)
     DEBUG_ERROR("Check your thing configuration, and press the reset button on your board.");
-#endif
     return State::SubscribeThingTopics;
   }
 
   if (!_mqttClient.subscribe(_shadowTopicIn))
   {
     DEBUG_ERROR("ArduinoIoTCloudTCP::%s could not subscribe to %s", __FUNCTION__, _shadowTopicIn.c_str());
-#if !defined(__AVR__)
     DEBUG_ERROR("Check your thing configuration, and press the reset button on your board.");
-#endif
     return State::SubscribeThingTopics;
   }
 
diff --git a/src/cbor/CBORDecoder.h b/src/cbor/CBORDecoder.h
index d1bf91ca0..5e9496b2a 100644
--- a/src/cbor/CBORDecoder.h
+++ b/src/cbor/CBORDecoder.h
@@ -24,10 +24,6 @@
 
 #include <Arduino.h>
 
-#ifdef __AVR__
-# include <Arduino_AVRSTL.h>
-#endif
-
 #undef max
 #undef min
 #include <list>
diff --git a/src/cbor/CBOREncoder.h b/src/cbor/CBOREncoder.h
index fa68d2200..cbba5522d 100644
--- a/src/cbor/CBOREncoder.h
+++ b/src/cbor/CBOREncoder.h
@@ -24,10 +24,6 @@
 
 #include <Arduino.h>
 
-#ifdef __AVR__
-# include <Arduino_AVRSTL.h>
-#endif
-
 #undef max
 #undef min
 #include <list>
diff --git a/src/cbor/lib/tinycbor/src/cbor.h b/src/cbor/lib/tinycbor/src/cbor.h
index 93d448daf..27a4fe4a8 100644
--- a/src/cbor/lib/tinycbor/src/cbor.h
+++ b/src/cbor/lib/tinycbor/src/cbor.h
@@ -25,11 +25,6 @@
 #ifndef CBOR_H
 #define CBOR_H
 
-#ifdef __AVR__
-#define FP_NAN          NAN
-#define FP_INFINITE     INFINITY
-#endif
-
 #ifndef assert
 #include <assert.h>
 #endif
diff --git a/src/cbor/lib/tinycbor/src/cborpretty.c b/src/cbor/lib/tinycbor/src/cborpretty.c
index b82b985ac..2db4b253a 100644
--- a/src/cbor/lib/tinycbor/src/cborpretty.c
+++ b/src/cbor/lib/tinycbor/src/cborpretty.c
@@ -28,8 +28,6 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
-#ifndef __AVR__
-
 #include "cbor.h"
 #include "cborinternal_p.h"
 #include "compilersupport_p.h"
@@ -582,6 +580,4 @@ CborError cbor_value_to_pretty_stream(CborStreamFunction streamFunction, void *t
 
 #pragma GCC diagnostic pop
 
-#endif // __AVR__
-
 /** @} */
diff --git a/src/cbor/lib/tinycbor/src/cbortojson.c b/src/cbor/lib/tinycbor/src/cbortojson.c
index 0e669f27e..ed6a16666 100644
--- a/src/cbor/lib/tinycbor/src/cbortojson.c
+++ b/src/cbor/lib/tinycbor/src/cbortojson.c
@@ -30,8 +30,6 @@
 #  define __STDC_LIMIT_MACROS 1
 #endif
 
-#ifndef __AVR__
-
 #include "cbor.h"
 #include "cborjson.h"
 #include "cborinternal_p.h"
@@ -703,6 +701,4 @@ CborError cbor_value_to_json_advance(FILE *out, CborValue *value, int flags)
 
 #pragma GCC diagnostic pop
 
-#endif // __AVR__
-
 /** @} */
diff --git a/src/cbor/lib/tinycbor/src/open_memstream.c b/src/cbor/lib/tinycbor/src/open_memstream.c
index 4d79a726e..b3e624d47 100644
--- a/src/cbor/lib/tinycbor/src/open_memstream.c
+++ b/src/cbor/lib/tinycbor/src/open_memstream.c
@@ -34,10 +34,6 @@
 
 #include <unistd.h>
 
-#ifdef __AVR__
-typedef size_t ssize_t;
-#endif
-
 typedef ssize_t RetType;
 typedef size_t LenType;
 
diff --git a/src/nonstd/nonstd.h b/src/nonstd/nonstd.h
deleted file mode 100644
index b591919c6..000000000
--- a/src/nonstd/nonstd.h
+++ /dev/null
@@ -1,235 +0,0 @@
-#pragma once
-#ifdef __AVR__
-#include <Arduino.h>
-extern void * operator new(size_t size, void * ptr);
-namespace nonstd{
-  
-  template<class T>struct tag{using type=T;};
-  template<class Tag>using type_t=typename Tag::type;
-  
-  using size_t=decltype(sizeof(int));
-  
-  //move
-  
-  template<class T>
-  T&& move(T&t){return static_cast<T&&>(t);}
-  
-  //forward
-  
-  template<class T>
-  struct remove_reference:tag<T>{};
-  template<class T>
-  struct remove_reference<T&>:tag<T>{};
-  template<class T>using remove_reference_t=type_t<remove_reference<T>>;
-  
-  template<class T>
-  T&& forward( remove_reference_t<T>& t ) {
-  return static_cast<T&&>(t);
-  }
-  template<class T>
-  T&& forward( remove_reference_t<T>&& t ) {
-  return static_cast<T&&>(t);
-  }
-  
-  //decay
-  
-  template<class T>
-  struct remove_const:tag<T>{};
-  template<class T>
-  struct remove_const<T const>:tag<T>{};
-  
-  template<class T>
-  struct remove_volatile:tag<T>{};
-  template<class T>
-  struct remove_volatile<T volatile>:tag<T>{};
-  
-  template<class T>
-  struct remove_cv:remove_const<type_t<remove_volatile<T>>>{};
-  
-  
-  template<class T>
-  struct decay3:remove_cv<T>{};
-  template<class R, class...Args>
-  struct decay3<R(Args...)>:tag<R(*)(Args...)>{};
-  template<class T>
-  struct decay2:decay3<T>{};
-  template<class T, size_t  N>
-  struct decay2<T[N]>:tag<T*>{};
-  
-  template<class T>
-  struct decay:decay2<remove_reference_t<T>>{};
-  
-  template<class T>
-  using decay_t=type_t<decay<T>>;
-  
-  //is_convertible
-  
-  template<class T>
-  T declval(); // no implementation
-  
-  template<class T, T t>
-  struct integral_constant{
-  static constexpr T value=t;
-  constexpr integral_constant() {};
-  constexpr operator T()const{ return value; }
-  constexpr T operator()()const{ return value; }
-  };
-  template<bool b>
-  using bool_t=integral_constant<bool, b>;
-  using true_type=bool_t<true>;
-  using false_type=bool_t<false>;
-  
-  template<class...>struct voider:tag<void>{};
-  template<class...Ts>using void_t=type_t<voider<Ts...>>;
-  
-  namespace details {
-  template<template<class...>class Z, class, class...Ts>
-  struct can_apply:false_type{};
-  template<template<class...>class Z, class...Ts>
-  struct can_apply<Z, void_t<Z<Ts...>>, Ts...>:true_type{};
-  }
-  template<template<class...>class Z, class...Ts>
-  using can_apply = details::can_apply<Z, void, Ts...>;
-  
-  namespace details {
-  template<class From, class To>
-  using try_convert = decltype( To{declval<From>()} );
-  }
-  template<class From, class To>
-  struct is_convertible : can_apply< details::try_convert, From, To > {};
-  template<>
-  struct is_convertible<void,void>:true_type{};
-  
-  //enable_if
-  
-  template<bool, class=void>
-  struct enable_if {};
-  template<class T>
-  struct enable_if<true, T>:tag<T>{};
-  template<bool b, class T=void>
-  using enable_if_t=type_t<enable_if<b,T>>;
-  
-  //res_of
-  
-  namespace details {
-  template<class G, class...Args>
-  using invoke_t = decltype( declval<G>()(declval<Args>()...) );
-  
-  template<class Sig,class=void>
-  struct res_of {};
-  template<class G, class...Args>
-  struct res_of<G(Args...), void_t<invoke_t<G, Args...>>>:
-  tag<invoke_t<G, Args...>>
-  {};
-  }
-  template<class Sig>
-  using res_of = details::res_of<Sig>;
-  template<class Sig>
-  using res_of_t=type_t<res_of<Sig>>;
-  
-  //aligned_storage
-  
-  template<size_t size, size_t align>
-  struct alignas(align) aligned_storage_t {
-  char buff[size];
-  };
-  
-  //is_same
-  
-  template<class A, class B>
-  struct is_same:false_type{};
-  template<class A>
-  struct is_same<A,A>:true_type{};
-  
-  template<class Sig, size_t sz, size_t algn>
-  struct small_task;
-  
-  template<class R, class...Args, size_t sz, size_t algn>
-  struct small_task<R(Args...), sz, algn>{
-    struct vtable_t {
-      void(*mover)(void* src, void* dest);
-      void(*destroyer)(void*);
-      R(*invoke)(void const* t, Args&&...args);
-      template<class T>
-      static vtable_t const* get() {
-        static const vtable_t table = {
-          [](void* src, void*dest) {
-            new(dest) T(move(*static_cast<T*>(src)));
-          },
-          [](void* t){ static_cast<T*>(t)->~T(); },
-          [](void const* t, Args&&...args)->R {
-            return (*static_cast<T const*>(t))(forward<Args>(args)...);
-          }
-        };
-        return &table;
-      }
-    };
-    vtable_t const* table = nullptr;
-    aligned_storage_t<sz, algn> data;
-    template<class F,
-      class dF=decay_t<F>,
-      enable_if_t<!is_same<dF, small_task>{}>* = nullptr,
-      enable_if_t<is_convertible< res_of_t<dF&(Args...)>, R >{}>* = nullptr
-    >
-    small_task( F&& f ):
-      table( vtable_t::template get<dF>() )
-    {
-      static_assert( sizeof(dF) <= sz, "object too large" );
-      static_assert( alignof(dF) <= algn, "object too aligned" );
-      new(&data) dF(forward<F>(f));
-    }
-    ~small_task() {
-      if (table)
-        table->destroyer(&data);
-    }
-    small_task(const small_task& o):
-      table(o.table)
-    {
-      data = o.data;
-    }
-    small_task(small_task&& o):
-      table(o.table)
-    {
-      if (table)
-        table->mover(&o.data, &data);
-    }
-    small_task(){}
-    small_task& operator=(const small_task& o){
-      this->~small_task();
-      new(this) small_task( move(o) );
-      return *this;
-    }
-    small_task& operator=(small_task&& o){
-      this->~small_task();
-      new(this) small_task( move(o) );
-      return *this;
-    }
-    explicit operator bool()const{return table;}
-    R operator()(Args...args)const{
-      return table->invoke(&data, forward<Args>(args)...);
-    }
-  };
-
-  template<class R, class...Args, size_t sz, size_t algn>
-  inline bool operator==(const small_task<R(Args...), sz, algn>& __f, nullptr_t)
-  { return !static_cast<bool>(__f); }
-
-  /// @overload
-  template<class R, class...Args, size_t sz, size_t algn>
-  inline bool  operator==(nullptr_t, const small_task<R(Args...), sz, algn>& __f)
-  { return !static_cast<bool>(__f); }
-
-  template<class R, class...Args, size_t sz, size_t algn>
-  inline bool operator!=(const small_task<R(Args...), sz, algn>& __f, nullptr_t)
-  { return static_cast<bool>(__f); }
-
-  /// @overload
-  template<class R, class...Args, size_t sz, size_t algn>
-  inline bool operator!=(nullptr_t, const small_task<R(Args...), sz, algn>& __f)
-  { return static_cast<bool>(__f); }
-  
-  template<class Sig>
-  using function = small_task<Sig, sizeof(void*)*4, alignof(void*) >;
-}
-
-#endif
\ No newline at end of file
diff --git a/src/property/Property.cpp b/src/property/Property.cpp
index 326e25584..4d4258b28 100644
--- a/src/property/Property.cpp
+++ b/src/property/Property.cpp
@@ -226,11 +226,7 @@ CborError Property::appendAttribute(String value, String attributeName, CborEnco
   }, encoder);
 }
 
-#ifdef __AVR__
-CborError Property::appendAttributeName(String attributeName, nonstd::function<CborError (CborEncoder& mapEncoder)>appendValue, CborEncoder *encoder)
-#else
 CborError Property::appendAttributeName(String attributeName, std::function<CborError (CborEncoder& mapEncoder)>appendValue, CborEncoder *encoder)
-#endif
 {
   if (attributeName != "") {
     // when the attribute name string is not empty, the attribute identifier is incremented in order to be encoded in the message if the _lightPayload flag is set
@@ -319,11 +315,7 @@ void Property::setAttribute(String& value, String attributeName) {
   });
 }
 
-#ifdef __AVR__
-void Property::setAttribute(String attributeName, nonstd::function<void (CborMapData & md)>setValue)
-#else
 void Property::setAttribute(String attributeName, std::function<void (CborMapData & md)>setValue)
-#endif
 {
   if (attributeName != "") {
     _attributeIdentifier++;
diff --git a/src/property/Property.h b/src/property/Property.h
index b0e6ada06..90848b64a 100644
--- a/src/property/Property.h
+++ b/src/property/Property.h
@@ -32,13 +32,7 @@
 #undef max
 #undef min
 
-#ifdef __AVR__
-# include <Arduino_AVRSTL.h>
-# include <nonstd/nonstd.h>
-#else
 # include <functional>
-#endif
-
 #include <list>
 
 #include "../cbor/lib/tinycbor/cbor-lib.h"
@@ -140,10 +134,6 @@ typedef void(*OnSyncCallbackFunc)(Property &);
    CLASS DECLARATION
  ******************************************************************************/
 
-#ifdef __AVR__
-#include "nonstd/nonstd.h"
-#endif
-
 class Property
 {
   public:
@@ -191,13 +181,8 @@ class Property
     CborError appendAttribute(unsigned int value, String attributeName = "", CborEncoder *encoder = nullptr);
     CborError appendAttribute(float value, String attributeName = "", CborEncoder *encoder = nullptr);
     CborError appendAttribute(String value, String attributeName = "", CborEncoder *encoder = nullptr);
-#ifndef __AVR__
     CborError appendAttributeName(String attributeName, std::function<CborError (CborEncoder& mapEncoder)>f, CborEncoder *encoder);
     void setAttribute(String attributeName, std::function<void (CborMapData & md)>setValue);
-#else
-    CborError appendAttributeName(String attributeName, nonstd::function<CborError (CborEncoder& mapEncoder)>f, CborEncoder *encoder);
-    void setAttribute(String attributeName, nonstd::function<void (CborMapData & md)>setValue);
-#endif
     void setAttributesFromCloud(std::list<CborMapData> * map_data_list);
     void setAttribute(bool& value, String attributeName = "");
     void setAttribute(int& value, String attributeName = "");
diff --git a/src/property/PropertyContainer.h b/src/property/PropertyContainer.h
index 8c254875e..9dc3c86cd 100644
--- a/src/property/PropertyContainer.h
+++ b/src/property/PropertyContainer.h
@@ -26,10 +26,6 @@
 
 #include "Property.h"
 
-#ifdef __AVR__
-# include <Arduino_AVRSTL.h>
-#endif
-
 #undef max
 #undef min
 #include <list>
diff --git a/src/utility/ota/FlashSHA256.cpp b/src/utility/ota/FlashSHA256.cpp
index 85a1b4ebe..d0fc3d532 100644
--- a/src/utility/ota/FlashSHA256.cpp
+++ b/src/utility/ota/FlashSHA256.cpp
@@ -20,7 +20,7 @@
  ******************************************************************************/
 
 #include <AIoTC_Config.h>
-#if OTA_ENABLED && !defined(__AVR__)
+#if OTA_ENABLED
 
 #include "FlashSHA256.h"
 
diff --git a/src/utility/time/TimeService.cpp b/src/utility/time/TimeService.cpp
index 23ab0a663..ac0a5eb02 100644
--- a/src/utility/time/TimeService.cpp
+++ b/src/utility/time/TimeService.cpp
@@ -294,7 +294,6 @@ bool TimeServiceClass::connected()
 unsigned long TimeServiceClass::getRemoteTime()
 {
   if(connected()) {
-#ifndef __AVR__
     /* At first try to obtain a valid time via NTP.
      * This is the most reliable time source and it will
      * ensure a correct behaviour of the library.
@@ -303,7 +302,6 @@ unsigned long TimeServiceClass::getRemoteTime()
     if(isTimeValid(ntp_time)) {
       return ntp_time;
     }
-#endif
 
     /* As fallback if NTP request fails try to obtain the
      * network time using the connection handler.