diff --git a/src/chat/misc.c b/src/chat/misc.c
index 82a234c..6f9acff 100644
--- a/src/chat/misc.c
+++ b/src/chat/misc.c
@@ -159,7 +159,7 @@ char *read_socket_from_raw(char *raw)
     if (json_obj == NULL) return "ERR"; //RETURN IF INVALID SYNTAX WAS SENT BY SOME FUCKING SCRIPT KIDDIE
 
     //GET STRINGS
-    char *message = get_string_from_json(json_obj, "message"); //TODO: Check deallocation problems
+    char *message = get_string_from_json(json_obj, "message");
     char *username = get_string_from_json(json_obj, "username");
 
     //ALLOCATE final_message
@@ -398,7 +398,7 @@ char *why2_read_socket(int socket)
     struct json_object *json_obj = json_tokener_parse(raw_socket);
 
     //GET STRINGS
-    char *message = get_string_from_json(json_obj, "message"); //TODO: Check deallocation problems
+    char *message = get_string_from_json(json_obj, "message");
     char *username = get_string_from_json(json_obj, "username");
 
     //ALLOCATE final_message
@@ -484,6 +484,4 @@ void *why2_listen_server(void *socket)
     }
 
     return NULL;
-}
-
-//TODO: Client formatting fix
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/core/lib/utils/llist.c b/src/core/lib/utils/llist.c
index 546ed85..a22be98 100644
--- a/src/core/lib/utils/llist.c
+++ b/src/core/lib/utils/llist.c
@@ -44,7 +44,7 @@ void why2_list_push(why2_list_t *list, void *value, unsigned long size)
         buffer -> next = new_node; //LINK
     }
 
-    list -> head = buffer; //TODO: Unused?
+    list -> head = buffer;
 }
 
 void why2_list_remove(why2_list_t *list, why2_node_t *node)