diff --git a/api/src/main/java/javax/jdo/annotations/Element.java b/api/src/main/java/javax/jdo/annotations/Element.java
index fe1b09e12..ea46c36dd 100644
--- a/api/src/main/java/javax/jdo/annotations/Element.java
+++ b/api/src/main/java/javax/jdo/annotations/Element.java
@@ -164,7 +164,7 @@
    */
   @SuppressWarnings("rawtypes")
   Class<? extends AttributeConverter> converter() default
-      UseDefault.class; // TODO Current JDK doesn't allow "default null"
+      UseDefault.class; // Current JDK doesn't allow "default null"
 
   /**
    * Whether we should disable any converter that was specified as default for this type on the PMF.
@@ -174,7 +174,7 @@ Class<? extends AttributeConverter> converter() default
    *
    * @return Whether PMF attribute conversion is to be disabled.
    */
-  boolean useDefaultConversion() default false; // TODO Current JDK doesn't allow "default null"
+  boolean useDefaultConversion() default false;
 
   /**
    * Vendor extensions.
diff --git a/api/src/main/java/javax/jdo/annotations/Key.java b/api/src/main/java/javax/jdo/annotations/Key.java
index dcfd2f5c9..7c7722acf 100644
--- a/api/src/main/java/javax/jdo/annotations/Key.java
+++ b/api/src/main/java/javax/jdo/annotations/Key.java
@@ -160,7 +160,7 @@
    */
   @SuppressWarnings("rawtypes")
   Class<? extends AttributeConverter> converter() default
-      UseDefault.class; // TODO Current JDK doesn't allow "default null"
+      UseDefault.class; // Current JDK doesn't allow "default null"
 
   /**
    * Whether we should disable any converter that was specified as default for this type on the PMF.
@@ -170,7 +170,7 @@ Class<? extends AttributeConverter> converter() default
    *
    * @return Whether PMF attribute conversion is to be disabled.
    */
-  boolean useDefaultConversion() default false; // TODO Current JDK doesn't allow "default null"
+  boolean useDefaultConversion() default false;
 
   /**
    * Vendor extensions.
diff --git a/api/src/main/java/javax/jdo/annotations/Persistent.java b/api/src/main/java/javax/jdo/annotations/Persistent.java
index cf55632e2..66cabc070 100644
--- a/api/src/main/java/javax/jdo/annotations/Persistent.java
+++ b/api/src/main/java/javax/jdo/annotations/Persistent.java
@@ -262,7 +262,7 @@
    */
   @SuppressWarnings("rawtypes")
   Class<? extends AttributeConverter> converter() default
-      UseDefault.class; // TODO Current JDK doesn't allow "default null"
+      UseDefault.class; // Current JDK doesn't allow "default null"
 
   /**
    * Whether we should disable any converter that was specified as default for this type on the PMF.
@@ -272,7 +272,7 @@ Class<? extends AttributeConverter> converter() default
    *
    * @return Whether PMF attribute conversion is to be disabled.
    */
-  boolean useDefaultConversion() default false; // TODO Current JDK doesn't allow "default null"
+  boolean useDefaultConversion() default false;
 
   /**
    * Vendor extensions for this member.
diff --git a/api/src/main/java/javax/jdo/annotations/Value.java b/api/src/main/java/javax/jdo/annotations/Value.java
index 1e7068ce7..98c49ec30 100644
--- a/api/src/main/java/javax/jdo/annotations/Value.java
+++ b/api/src/main/java/javax/jdo/annotations/Value.java
@@ -161,7 +161,7 @@
    */
   @SuppressWarnings("rawtypes")
   Class<? extends AttributeConverter> converter() default
-      UseDefault.class; // TODO Current JDK doesn't allow "default null"
+      UseDefault.class; // Current JDK doesn't allow "default null"
 
   /**
    * Whether we should disable any converter that was specified as default for this type on the PMF.
@@ -171,7 +171,7 @@ Class<? extends AttributeConverter> converter() default
    *
    * @return Whether PMF attribute conversion is to be disabled.
    */
-  boolean useDefaultConversion() default false; // TODO Current JDK doesn't allow "default null"
+  boolean useDefaultConversion() default false;
 
   /**
    * Vendor extensions.