diff --git a/include/etl/ipool.h b/include/etl/ipool.h
index 88e03e46f..942927748 100644
--- a/include/etl/ipool.h
+++ b/include/etl/ipool.h
@@ -385,39 +385,13 @@ namespace etl
     //*************************************************************************
     void release_item(char* p_value)
     {
-      //// Does it belong to us?
-      //ETL_ASSERT(is_item_in_pool(p_value), ETL_ERROR(pool_object_not_in_pool));
-
-      //if (p_next != ETL_NULLPTR)
-      //{
-      //  // Point it to the current free item.
-      //  *(uintptr_t*)p_value = reinterpret_cast<uintptr_t>(p_next);
-      //}
-      //else
-      //{
-      //  // This is the only free item.
-      //  *((uintptr_t*)p_value) = 0;
-      //}
-
-      //p_next = p_value;
-
-      //--items_allocated;
-
       // Does it belong to us?
       ETL_ASSERT(is_item_in_pool(p_value), ETL_ERROR(pool_object_not_in_pool));
 
       if (items_allocated > 0) 
       {
-        if (p_next != ETL_NULLPTR)
-        {
-          // Point it to the current free item.
-          *(uintptr_t*)p_value = reinterpret_cast<uintptr_t>(p_next);
-        }
-        else
-        {
-          // This is the only free item.
-          *((uintptr_t*)p_value) = 0;
-        }
+        // Point it to the current free item.
+        *(uintptr_t*)p_value = reinterpret_cast<uintptr_t>(p_next);
 
         p_next = p_value;
 
diff --git a/include/etl/memory.h b/include/etl/memory.h
index 10b5cef65..ca72656b9 100644
--- a/include/etl/memory.h
+++ b/include/etl/memory.h
@@ -2366,9 +2366,9 @@ namespace etl
 
   //***************************************************************************
   /// Template wrapper for memcmp.
-  /// \param source begin
-  /// \param source end
-  /// \param destination begin
+  /// \param sb Source begin
+  /// \param se Source end
+  /// \param db Destination begin
   /// \return < 0	The first byte that does not match in both memory blocks has a lower value in 'sb' than in 'db' when evaluated as unsigned char values.
   ///   0 The contents of both memory blocks are equal
   /// > 0	The first byte that does not match in both memory blocks has a greater value in 'sb' than in 'db' when evaluated as unsigned char values.
diff --git a/include/etl/span.h b/include/etl/span.h
index 775f95406..ea8ad3b13 100644
--- a/include/etl/span.h
+++ b/include/etl/span.h
@@ -39,7 +39,6 @@ SOFTWARE.
 #include "hash.h"
 #include "type_traits.h"
 #include "integral_limits.h"
-#include "memory.h"
 #include "array.h"
 #include "byte.h"
 #include "static_assert.h"