diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizer.java b/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizer.java
index 9774ac7ea1..0b753e93a5 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/Tuplizer.java
@@ -31,7 +31,7 @@ public @interface Tuplizer {
 	Class impl();
 
 	/**
-	 * either pojo, dynamic-map or dom4j.
+	 * either pojo or dynamic-map.
 	 * @deprecated should use #entityModeType instead
 	 */
 	@Deprecated
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java
index 9996267a5b..8f0e247ea7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AttributeSource.java
@@ -35,7 +35,8 @@ public interface AttributeSource extends ToolingHintContextContainer {
 	public boolean isSingular();
 
 	/**
-	 * Ugh.  This is the deprecated DOM4J entity-mode feature
+	 * This is only useful to log warnings when these deprecated attributes are populated.
+	 * It was only useful for DOM4J entity-mode, which was removed a long time ago.
 	 *
 	 * @return The xml node name
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java
index 455b09d244..2866a1a309 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/log/DeprecationLogger.java
@@ -53,7 +53,8 @@ public interface DeprecationLogger extends BasicLogger {
 	public void logDeprecationOfMultipleEntityModeSupport();
 
 	/**
-	 * Log message indicating the use of DOM4J EntityMode.
+	 * Log message indicating the use of features that were only useful for DOM4J EntityMode,
+	 * which was removed a long time ago.
 	 */
 	@LogMessage( level = WARN )
 	@Message(
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/Tuplizer.java b/hibernate-core/src/main/java/org/hibernate/tuple/Tuplizer.java
index 65faa25f62..9c0120b185 100644
--- a/hibernate-core/src/main/java/org/hibernate/tuple/Tuplizer.java
+++ b/hibernate-core/src/main/java/org/hibernate/tuple/Tuplizer.java
@@ -27,10 +27,6 @@ import org.hibernate.property.access.spi.Getter;
  * <li>extract and inject values through getters/setter, or by direct field access, etc
  * </ul>
  * </p>
- * That same piece of data might also be represented as a DOM structure, using
- * the tuplizer associated with the DOM4J entity-mode, which would generate instances
- * of {@link org.dom4j.Element} as the data structure and know how to access the
- * values as either nested {@link org.dom4j.Element}s or as {@link org.dom4j.Attribute}s.
  *
  * @see org.hibernate.tuple.entity.EntityTuplizer
  * @see org.hibernate.tuple.component.ComponentTuplizer
diff --git a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
index 1f4ac97ab3..005ab12ad0 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/CollectionType.java
@@ -576,7 +576,6 @@ public abstract class CollectionType extends AbstractType implements Association
 			Object owner,
 			Map copyCache,
 			SharedSessionContractImplementor session) {
-		// TODO: does not work for EntityMode.DOM4J yet!
 		java.util.Collection result = ( java.util.Collection ) target;
 		result.clear();