diff --git a/src/main/java/tech/units/indriya/format/EBNFUnitFormat.java b/src/main/java/tech/units/indriya/format/EBNFUnitFormat.java
index 4ee717ac..57fed143 100644
--- a/src/main/java/tech/units/indriya/format/EBNFUnitFormat.java
+++ b/src/main/java/tech/units/indriya/format/EBNFUnitFormat.java
@@ -34,7 +34,6 @@
 import javax.measure.format.MeasurementParseException;
 
 import tech.units.indriya.AbstractUnit;
-import tech.units.indriya.format.SimpleUnitFormat.Flavor;
 import tech.units.indriya.internal.format.UnitFormatParser;
 import tech.units.indriya.unit.AnnotatedUnit;
 
diff --git a/src/main/java/tech/units/indriya/format/LocalUnitFormat.java b/src/main/java/tech/units/indriya/format/LocalUnitFormat.java
index a54b8702..a50c2875 100644
--- a/src/main/java/tech/units/indriya/format/LocalUnitFormat.java
+++ b/src/main/java/tech/units/indriya/format/LocalUnitFormat.java
@@ -356,7 +356,6 @@ private int formatInternal(Unit<?> unit, Appendable buffer) throws IOException {
       // unit.
       buffer.append(unit.getSymbol());
       return NOOP_PRECEDENCE;
-   // TODO add case for MixedUnit
     } else { // A transformed unit or new unit type!
       UnitConverter converter = null;
       boolean printSeparator = false;
diff --git a/src/main/resources/tech/units/indriya/format/messages.properties b/src/main/resources/tech/units/indriya/format/messages.properties
index 524e618a..25202cca 100644
--- a/src/main/resources/tech/units/indriya/format/messages.properties
+++ b/src/main/resources/tech/units/indriya/format/messages.properties
@@ -13,7 +13,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions
 #    and the following disclaimer in the documentation and/or other materials provided with the distribution.
 #
-# 3. Neither the name of JSR-363 nor the names of its contributors may be used to endorse or promote products
+# 3. Neither the name of JSR-385 nor the names of its contributors may be used to endorse or promote products
 #    derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -73,10 +73,6 @@ tech.units.indriya.unit.Units.CELSIUS             = \u00B0C
 tech.units.indriya.unit.Units.CELSIUS.1           = \u2103
 tech.units.indriya.unit.Units.CELSIUS.2           = Celsius
 tech.units.indriya.unit.Units.COULOMB             = C
-#tech.units.indriya.unit.Units.DEGREE_ANGLE        = \u00B0
-#tech.units.indriya.unit.Units.MINUTE_ANGLE        = '
-#tech.units.indriya.unit.Units.SECOND_ANGLE        = "
-#tech.units.indriya.unit.Units.ELECTRON_VOLT       = eV
 tech.units.indriya.unit.Units.FARAD               = F
 tech.units.indriya.unit.Units.GRAM                = g
 tech.units.indriya.unit.Units.GRAY                = Gy
diff --git a/src/main/resources/tech/units/indriya/format/messages_cn.properties b/src/main/resources/tech/units/indriya/format/messages_cn.properties
index 937afe8f..75acbdfd 100644
--- a/src/main/resources/tech/units/indriya/format/messages_cn.properties
+++ b/src/main/resources/tech/units/indriya/format/messages_cn.properties
@@ -4,9 +4,6 @@ tech.units.indriya.unit.Units.HERTZ.2                    = \u30D8\u30EB\u30C4
 tech.units.indriya.unit.Units.METRE                      = \u7C73
 #tech.units.indriya.unit.Units.ROENTGEN                   = \u306E
 tech.units.indriya.unit.Units.SECOND                     = \u79D2
-#tech.units.indriya.unit.US.LITER             = \u5347
-#tech.units.indriya.unit.US.METER             = \u7C73
-#tech.units.indriya.unit.US.TON               = \u30C8\u30F3
 javax.measure.MetricPrefix.CENTI = \u5398
 javax.measure.MetricPrefix.DECI  = \u5206
 javax.measure.MetricPrefix.DECA  = \u5341
diff --git a/src/main/resources/tech/units/indriya/format/messages_de.properties b/src/main/resources/tech/units/indriya/format/messages_de.properties
index d7296fc4..b5b2fe41 100644
--- a/src/main/resources/tech/units/indriya/format/messages_de.properties
+++ b/src/main/resources/tech/units/indriya/format/messages_de.properties
@@ -1,6 +1,6 @@
 #
 # Units of Measurement Reference Implementation
-# Copyright (c) 2005-2020, Jean-Marie Dautelle, Werner Keil, Otavio Santana.
+# Copyright (c) 2005-2024, Jean-Marie Dautelle, Werner Keil, Otavio Santana.
 #
 # All rights reserved.
 #