diff --git a/dataformat-json/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSerializer.java b/dataformat-json/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSerializer.java
index 8a57e631b..f370de8c0 100644
--- a/dataformat-json/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSerializer.java
+++ b/dataformat-json/src/main/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/json/JsonSerializer.java
@@ -68,7 +68,6 @@ protected void buildMapper() {
 
     protected SimpleModule buildCustomSerializerModule() {
         SimpleModule module = new SimpleModule();
-        // TODO: module.addSerializer(EmbeddedDataSpecification.class, new EmbeddedDataSpecificationSerializer());
         return module;
     }
 
diff --git a/dataformat-xml/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/xml/XmlSerializerTest.java b/dataformat-xml/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/xml/XmlSerializerTest.java
index 2487f2acb..aaa6b2e13 100644
--- a/dataformat-xml/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/xml/XmlSerializerTest.java
+++ b/dataformat-xml/src/test/java/org/eclipse/digitaltwin/aas4j/v3/dataformat/xml/XmlSerializerTest.java
@@ -219,8 +219,8 @@ private String removeDefaults(String aasXml) {
         aasXml = aasXml.replace("<test:kind>Instance</test:kind>", "");
         aasXml = aasXml.replace("<aas:category>VARIABLE</aas:category>", "");
         aasXml = aasXml.replace("<test:category>VARIABLE</test:category>", "");
-        aasXml = aasXml.replace("<aas:category>PROPERTY</aas:category>", ""); // TODO: only for ConceptDescriptions
-        aasXml = aasXml.replace("<test:category>PROPERTY</test:category>", ""); // TODO: only for ConceptDescriptions
+        aasXml = aasXml.replace("<aas:category>PROPERTY</aas:category>", "");
+        aasXml = aasXml.replace("<test:category>PROPERTY</test:category>", "");
         aasXml = aasXml.replace("<aas:kind>ConceptQualifier</aas:kind>", "");
         aasXml = aasXml.replace("<test:kind>ConceptQualifier</test:kind>", "");
         aasXml = aasXml.replace("<aas:orderRelevant>true</aas:orderRelevant>", "");
@@ -243,7 +243,7 @@ private boolean ignoreDefaults(Node node) {
 
         if (node.getLocalName() != null 
                 && node.getLocalName().equals("category") 
-                && node.getFirstChild().getNodeValue().equals("PROPERTY")) { // TODO: only for ConceptDescriptions
+                && node.getFirstChild().getNodeValue().equals("PROPERTY")) {
             return false;
         }