diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
index 9e5c5b75b2..4f374a7bf4 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
@@ -129,14 +129,6 @@ public interface SessionFactoryImplementor
 	 */
 	FetchProfile getFetchProfile(String name);
 
-	/**
-	 * Get the identifier generator for the hierarchy
-	 * 
-	 * @deprecated use {@link #getGenerator(String)}
-	 */
-	@Deprecated(since = "6.2")
-	IdentifierGenerator getIdentifierGenerator(String rootEntityName);
-
 	/**
 	 * Get the identifier generator for the hierarchy
 	 */
@@ -159,6 +151,40 @@ public interface SessionFactoryImplementor
 
 	WrapperOptions getWrapperOptions();
 
+
+
+	/**
+	 * Get the JdbcServices.
+	 *
+	 * @return the JdbcServices
+	 */
+	JdbcServices getJdbcServices();
+
+	SqlStringGenerationContext getSqlStringGenerationContext();
+
+
+
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// map these to Metamodel
+
+	RootGraphImplementor<?> findEntityGraphByName(String name);
+
+	/**
+	 * The best guess entity name for an entity not in an association
+	 */
+	String bestGuessEntityName(Object object);
+
+	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// Deprecations
+
+	/**
+	 * Get the identifier generator for the hierarchy
+	 *
+	 * @deprecated use {@link #getGenerator(String)}
+	 */
+	@Deprecated(since = "6.2")
+	IdentifierGenerator getIdentifierGenerator(String rootEntityName);
+
 	/**
 	 * Contract for resolving this SessionFactory on deserialization
 	 *
@@ -175,48 +201,22 @@ public interface SessionFactoryImplementor
 	@Deprecated(since = "6.2", forRemoval = true)
 	DeserializationResolver<?> getDeserializationResolver();
 
-
-
-	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	// Deprecations
-
-	/**
-	 * Get the JdbcServices.
-	 *
-	 * @return the JdbcServices
-	 */
-	JdbcServices getJdbcServices();
-
-	SqlStringGenerationContext getSqlStringGenerationContext();
-
-
-
-	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	// map these to Metamodel
-
 	/**
 	 * @deprecated no longer for internal use, use {@link #getMappingMetamodel()} or {@link #getJpaMetamodel()}
 	 */
 	@Override @Deprecated
 	MetamodelImplementor getMetamodel();
 
-	RootGraphImplementor<?> findEntityGraphByName(String name);
-
-	/**
-	 * The best guess entity name for an entity not in an association
-	 */
-	String bestGuessEntityName(Object object);
-
 	/**
 	 * @deprecated Use {@link #getMappingMetamodel()}.{@link MappingMetamodelImplementor#resolveParameterBindType(Object)}
 	 */
-	@Deprecated(since = "6.2", forRemoval = true)
+	@Override @Deprecated(since = "6.2", forRemoval = true)
 	<T> BindableType<? extends T> resolveParameterBindType(T bindValue);
 
 	/**
 	 * @deprecated Use {@link #getMappingMetamodel()}.{@link MappingMetamodelImplementor#resolveParameterBindType(Class)}
 	 */
-	@Deprecated(since = "6.2", forRemoval = true)
+	@Override @Deprecated(since = "6.2", forRemoval = true)
 	<T> BindableType<T> resolveParameterBindType(Class<T> clazz);
 
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SqlTypes.java b/hibernate-core/src/main/java/org/hibernate/type/SqlTypes.java
index 21bc39f9ff..1117852206 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/SqlTypes.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/SqlTypes.java
@@ -10,8 +10,6 @@ import org.hibernate.Internal;
 
 import java.sql.Types;
 
-import org.hibernate.Internal;
-
 /**
  * Defines a list of constant type codes used to identify generic SQL types.
  * This is an extension of the standard JDBC-defined {@link Types}, defining