diff --git a/Kontent.Ai.Delivery/ContentItems/ModelProvider.cs b/Kontent.Ai.Delivery/ContentItems/ModelProvider.cs
index c7b10b5e..30f725d1 100644
--- a/Kontent.Ai.Delivery/ContentItems/ModelProvider.cs
+++ b/Kontent.Ai.Delivery/ContentItems/ModelProvider.cs
@@ -230,7 +230,7 @@ private ContentItemElements GetAllPropertiesValuesAsync(JObject elementsData, Pr
                 var element = item.Value;
 
                 // TODO think about value converter implementation
-                // TODO what about codename property - now it is null
+                // TODO what about codename property - now it is not null, bit withCodename is not really nice
                 IContentElementValue value = (element["type"].ToString()) switch
                 {
                     // TODO do we want to use string/structured data for rich text - probably think about support both ways
@@ -248,9 +248,6 @@ private ContentItemElements GetAllPropertiesValuesAsync(JObject elementsData, Pr
                     "text" => element.ToObject<TextElementValue>(Serializer).WithCodename(key),
                     _ => throw new ArgumentException($"Argument type ({element["type"].ToString()}) not supported.")
                 };
-
-                // TODO Fix the empty Codename? Probably yes (wrap ToObject with normalization logic)
-                // value.Codename = key;
                 result.Add(key, value);
             }
             return result;