diff --git a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java
index 19fb89068b..72c6f5b78b 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/IdentifierGenerator.java
@@ -51,8 +51,6 @@ import static org.hibernate.generator.EventTypeSets.INSERT_ONLY;
  *     using {@link org.hibernate.annotations.GenericGenerator#parameters()}.
  * </ul>
  * <p>
- * Instances of {@code IdentifierGenerator} are usually created and configured
- * by the {@link org.hibernate.id.factory.IdentifierGeneratorFactory} service.
  * It's not usually correct to use an {@code IdentifierGenerator} with the
  * {@link org.hibernate.annotations.IdGeneratorType} meta-annotation.
  *
@@ -150,7 +148,7 @@ public interface IdentifierGenerator extends BeforeExecutionGenerator, Exportabl
 	 *
 	 * @deprecated this method is no longer called
 	 */
-	@Deprecated(since="6.2")
+	@Deprecated(since="6.2", forRemoval = true)
 	default boolean supportsJdbcBatchInserts() {
 		return true;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
index 662d9d3277..68dd97d10a 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/SequenceStyleGenerator.java
@@ -557,7 +557,6 @@ public class SequenceStyleGenerator
 
 	private String determineContributor(Properties params) {
 		final String contributor = params.getProperty( IdentifierGenerator.CONTRIBUTOR_NAME );
-
 		return contributor == null ? "orm" : contributor;
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
index 07fac2f056..d7810c2ce9 100644
--- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
+++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java
@@ -555,7 +555,6 @@ public class TableGenerator implements PersistentIdentifierGenerator {
 				getFactory().getJdbcServices()
 				.getSqlStatementLogger();
 		final SessionEventListenerManager statsCollector = session.getEventListenerManager();
-
 		return optimizer.generate(
 				new AccessCallback() {
 					@Override
@@ -570,7 +569,6 @@ public class TableGenerator implements PersistentIdentifierGenerator {
 								true
 						);
 					}
-
 					@Override
 					public String getTenantIdentifier() {
 						return session.getTenantIdentifier();
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
index 9899afec01..2009f97498 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
@@ -1364,9 +1364,8 @@ public abstract class BaseSqmToSqlAstConverter<T extends Statement> extends Base
 		Expression discriminatorExpression = null;
 		BasicEntityIdentifierMapping identifierMapping = null;
 		// We use the id property name to null the identifier generator variable if the target paths contain the id
-		final String identifierPropertyName;
 		Generator identifierGenerator = entityDescriptor.getGenerator();
-		identifierPropertyName = identifierGenerator != null ? entityDescriptor.getIdentifierPropertyName() : null;
+		final String identifierPropertyName = identifierGenerator != null ? entityDescriptor.getIdentifierPropertyName() : null;
 		final String versionAttributeName;
 		boolean needsVersionInsert;
 		if ( entityDescriptor.isVersioned() ) {