diff --git a/src/EFCore.PG/Extensions/NpgsqlEntityTypeBuilderExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlEntityTypeBuilderExtensions.cs
index 23a7957ae..191d76736 100644
--- a/src/EFCore.PG/Extensions/NpgsqlEntityTypeBuilderExtensions.cs
+++ b/src/EFCore.PG/Extensions/NpgsqlEntityTypeBuilderExtensions.cs
@@ -253,147 +253,5 @@ public static EntityTypeBuilder<TEntity> UseCockroachDbInterleaveInParent<TEntit
             => (EntityTypeBuilder<TEntity>)UseCockroachDbInterleaveInParent((EntityTypeBuilder)entityTypeBuilder, parentTableType, interleavePrefix);
 
         #endregion CockroachDB Interleave-in-parent
-
-        #region Obsolete
-
-
-        /// <summary>
-        /// Configures a comment to be applied on the table.
-        /// </summary>
-        /// <param name="entityTypeBuilder">The builder for the entity type being configured.</param>
-        /// <param name="comment">The comment for the table.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use HasComment")]
-        public static EntityTypeBuilder ForNpgsqlHasComment(
-            [NotNull] this EntityTypeBuilder entityTypeBuilder,
-            [CanBeNull] string comment)
-        {
-            Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
-            Check.NullButNotEmpty(comment, nameof(comment));
-
-            entityTypeBuilder.HasComment(comment);
-
-            return entityTypeBuilder;
-        }
-
-        /// <summary>
-        /// Configures a comment to be applied on the table.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity type being configured.</typeparam>
-        /// <param name="entityTypeBuilder">The builder for the entity type being configured.</param>
-        /// <param name="comment">The comment for the table.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use HasComment")]
-        public static EntityTypeBuilder<TEntity> ForNpgsqlHasComment<TEntity>(
-            [NotNull] this EntityTypeBuilder<TEntity> entityTypeBuilder,
-            [CanBeNull] string comment)
-            where TEntity : class
-            => (EntityTypeBuilder<TEntity>)ForNpgsqlHasComment((EntityTypeBuilder)entityTypeBuilder, comment);
-
-        /// <summary>
-        /// Configures using the auto-updating system column <c>xmin</c> as the optimistic concurrency token.
-        /// </summary>
-        /// <remarks>
-        /// See http://www.npgsql.org/efcore/miscellaneous.html#optimistic-concurrency-and-concurrency-tokens
-        /// </remarks>
-        /// <param name="entityTypeBuilder">The builder for the entity type being configured.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseXminAsConcurrencyToken")]
-        public static EntityTypeBuilder ForNpgsqlUseXminAsConcurrencyToken([NotNull] this EntityTypeBuilder entityTypeBuilder)
-            => entityTypeBuilder.UseXminAsConcurrencyToken();
-
-        /// <summary>
-        /// Configures using the auto-updating system column <c>xmin</c> as the optimistic concurrency token.
-        /// </summary>
-        /// <remarks>
-        /// See http://www.npgsql.org/efcore/miscellaneous.html#optimistic-concurrency-and-concurrency-tokens
-        /// </remarks>
-        /// <param name="entityTypeBuilder">The builder for the entity type being configured.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseXminAsConcurrencyToken")]
-        public static EntityTypeBuilder<TEntity> ForNpgsqlUseXminAsConcurrencyToken<TEntity>([NotNull] this EntityTypeBuilder<TEntity> entityTypeBuilder)
-            where TEntity : class
-            => entityTypeBuilder.UseXminAsConcurrencyToken();
-
-        /// <summary>
-        /// Sets a PostgreSQL storage parameter on the table created for this entity.
-        /// </summary>
-        /// <remarks>
-        /// See https://www.postgresql.org/docs/current/static/sql-createtable.html#SQL-CREATETABLE-STORAGE-PARAMETERS
-        /// </remarks>
-        /// <param name="entityTypeBuilder"> The builder for the entity type being configured. </param>
-        /// <param name="parameterName"> The name of the storage parameter. </param>
-        /// <param name="parameterValue"> The value of the storage parameter. </param>
-        /// <returns> The same builder instance so that multiple calls can be chained. </returns>
-        [Obsolete("Use SetStorageParameter")]
-        public static EntityTypeBuilder ForNpgsqlSetStorageParameter(
-            [NotNull] this EntityTypeBuilder entityTypeBuilder, string parameterName, object parameterValue)
-            => entityTypeBuilder.SetStorageParameter(parameterName, parameterValue);
-
-        /// <summary>
-        /// Sets a PostgreSQL storage parameter on the table created for this entity.
-        /// </summary>
-        /// <remarks>
-        /// See https://www.postgresql.org/docs/current/static/sql-createtable.html#SQL-CREATETABLE-STORAGE-PARAMETERS
-        /// </remarks>
-        /// <param name="entityTypeBuilder"> The builder for the entity type being configured. </param>
-        /// <param name="parameterName"> The name of the storage parameter. </param>
-        /// <param name="parameterValue"> The value of the storage parameter. </param>
-        /// <returns> The same builder instance so that multiple calls can be chained. </returns>
-        [Obsolete("Use SetStorageParameter")]
-        public static EntityTypeBuilder<TEntity> ForNpgsqlSetStorageParameter<TEntity>(
-            [NotNull] this EntityTypeBuilder<TEntity> entityTypeBuilder, string parameterName, object parameterValue)
-            where TEntity : class
-            => entityTypeBuilder.SetStorageParameter(parameterName, parameterValue);
-
-        /// <summary>
-        /// Configures the entity to use an unlogged table when targeting Npgsql.
-        /// </summary>
-        /// <param name="entityTypeBuilder">The builder for the entity type being configured.</param>
-        /// <param name="isUnlogged">True to configure the entity to use an unlogged table; otherwise, false.</param>
-        /// <returns>
-        /// The same builder instance so that multiple calls can be chained.
-        /// </returns>
-        /// <remarks>
-        /// See: https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-UNLOGGED
-        /// </remarks>
-        [Obsolete("Use IsUnlogged")]
-        public static EntityTypeBuilder ForNpgsqlIsUnlogged([NotNull] this EntityTypeBuilder entityTypeBuilder, bool isUnlogged = true)
-            => entityTypeBuilder.IsUnlogged(isUnlogged);
-
-        /// <summary>
-        /// Configures the mapped table to use an unlogged table when targeting Npgsql.
-        /// </summary>
-        /// <param name="entityTypeBuilder">The builder for the entity type being configured.</param>
-        /// <param name="isUnlogged">True to configure the entity to use an unlogged table; otherwise, false.</param>
-        /// <returns>
-        /// The same builder instance so that multiple calls can be chained.
-        /// </returns>
-        /// <remarks>
-        /// See: https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-UNLOGGED
-        /// </remarks>
-        [Obsolete("Use IsUnlogged")]
-        public static EntityTypeBuilder<TEntity> ForNpgsqlIsUnlogged<TEntity>(
-            [NotNull] this EntityTypeBuilder<TEntity> entityTypeBuilder,
-            bool isUnlogged = true)
-            where TEntity : class
-            => entityTypeBuilder.IsUnlogged(isUnlogged);
-
-        [Obsolete("Use UseCockroachDbInterleaveInParent")]
-        public static EntityTypeBuilder ForCockroachDbInterleaveInParent(
-            [NotNull] this EntityTypeBuilder entityTypeBuilder,
-            [NotNull] Type parentTableType,
-            [NotNull] List<string> interleavePrefix)
-            => entityTypeBuilder.UseCockroachDbInterleaveInParent(parentTableType, interleavePrefix);
-
-        [Obsolete("Use UseCockroachDbInterleaveInParent")]
-        public static EntityTypeBuilder<TEntity> ForCockroachDbInterleaveInParent<TEntity>(
-            [NotNull] this EntityTypeBuilder<TEntity> entityTypeBuilder,
-            [NotNull] Type parentTableType,
-            [NotNull] List<string> interleavePrefix)
-            where TEntity : class
-            => entityTypeBuilder.UseCockroachDbInterleaveInParent(parentTableType, interleavePrefix);
-
-        #endregion Obsolete
     }
 }
diff --git a/src/EFCore.PG/Extensions/NpgsqlIndexBuilderExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlIndexBuilderExtensions.cs
index 31bac7741..5bae2a98e 100644
--- a/src/EFCore.PG/Extensions/NpgsqlIndexBuilderExtensions.cs
+++ b/src/EFCore.PG/Extensions/NpgsqlIndexBuilderExtensions.cs
@@ -635,111 +635,5 @@ public static bool CanSetIsCreatedConcurrently(
         }
 
         #endregion Created concurrently
-
-        #region Obsolete
-
-        /// <summary>
-        /// The PostgreSQL index method to be used. Null selects the default (currently btree).
-        /// </summary>
-        /// <remarks>
-        /// http://www.postgresql.org/docs/current/static/sql-createindex.html
-        /// </remarks>
-        /// <param name="indexBuilder">The builder for the index being configured.</param>
-        /// <param name="method">The name of the index.</param>
-        /// <returns>A builder to further configure the index.</returns>
-        [Obsolete("Use HasMethod")]
-        public static IndexBuilder ForNpgsqlHasMethod([NotNull] this IndexBuilder indexBuilder, [CanBeNull] string method)
-            => indexBuilder.HasMethod(method);
-
-        /// <summary>
-        /// The PostgreSQL index operators to be used.
-        /// </summary>
-        /// <remarks>
-        /// https://www.postgresql.org/docs/current/static/indexes-opclass.html
-        /// </remarks>
-        /// <param name="indexBuilder">The builder for the index being configured.</param>
-        /// <param name="operators">The operators to use for each column.</param>
-        /// <returns>A builder to further configure the index.</returns>
-        [Obsolete("Use HasOperators")]
-        public static IndexBuilder ForNpgsqlHasOperators([NotNull] this IndexBuilder indexBuilder, [CanBeNull, ItemNotNull] params string[] operators)
-            => indexBuilder.HasOperators(operators);
-
-        /// <summary>
-        /// The PostgreSQL index collation to be used.
-        /// </summary>
-        /// <remarks>
-        /// https://www.postgresql.org/docs/current/static/indexes-collations.html
-        /// </remarks>
-        /// <param name="indexBuilder">The builder for the index being configured.</param>
-        /// <param name="values">The sort options to use for each column.</param>
-        /// <returns>A builder to further configure the index.</returns>
-        [Obsolete("Use HasCollation")]
-        public static IndexBuilder ForNpgsqlHasCollation([NotNull] this IndexBuilder indexBuilder, [CanBeNull, ItemNotNull] params string[] values)
-            => indexBuilder.HasCollation(values);
-
-        /// <summary>
-        /// The PostgreSQL index sort ordering to be used.
-        /// </summary>
-        /// <remarks>
-        /// https://www.postgresql.org/docs/current/static/indexes-ordering.html
-        /// </remarks>
-        /// <param name="indexBuilder">The builder for the index being configured.</param>
-        /// <param name="values">The sort order to use for each column.</param>
-        /// <returns>A builder to further configure the index.</returns>
-        [Obsolete("Use HasSortOrder")]
-        public static IndexBuilder ForNpgsqlHasSortOrder([NotNull] this IndexBuilder indexBuilder, [CanBeNull] params SortOrder[] values)
-            => indexBuilder.HasSortOrder(values);
-
-        /// <summary>
-        /// The PostgreSQL index NULL sort ordering to be used.
-        /// </summary>
-        /// <remarks>
-        /// https://www.postgresql.org/docs/current/static/indexes-ordering.html
-        /// </remarks>
-        /// <param name="indexBuilder">The builder for the index being configured.</param>
-        /// <param name="values">The sort order to use for each column.</param>
-        /// <returns>A builder to further configure the index.</returns>
-        [Obsolete("Use HasNullSortOrder")]
-        public static IndexBuilder ForNpgsqlHasNullSortOrder([NotNull] this IndexBuilder indexBuilder, [CanBeNull] params NullSortOrder[] values)
-            => indexBuilder.HasNullSortOrder(values);
-
-        /// <summary>
-        /// Adds an INCLUDE clause to the index definition with the specified property names.
-        /// This clause specifies a list of columns which will be included as a non-key part in the index.
-        /// </summary>
-        /// <remarks>
-        /// https://www.postgresql.org/docs/current/sql-createindex.html
-        /// </remarks>
-        /// <param name="indexBuilder">The builder for the index being configured.</param>
-        /// <param name="propertyNames">An array of property names to be used in INCLUDE clause.</param>
-        /// <returns>A builder to further configure the index.</returns>
-        [Obsolete("Use IncludeProperties")]
-        public static IndexBuilder ForNpgsqlInclude([NotNull] this IndexBuilder indexBuilder, [NotNull, ItemNotNull] params string[] propertyNames)
-            => indexBuilder.IncludeProperties(propertyNames);
-
-        /// <summary>
-        /// Adds an INCLUDE clause to the index definition with property names from the specified expression.
-        /// This clause specifies a list of columns which will be included as a non-key part in the index.
-        /// </summary>
-        /// <remarks>
-        /// https://www.postgresql.org/docs/current/sql-createindex.html
-        /// </remarks>
-        /// <param name="indexBuilder">The builder for the index being configured.</param>
-        /// <param name="includeExpression">
-        /// <para>
-        /// A lambda expression representing the property(s) to be included in the INCLUDE clause
-        /// (<c>blog => blog.Url</c>).
-        /// </para>
-        /// <para>
-        /// If multiple properties are to be included then specify an anonymous type including the
-        /// properties (<c>post => new { post.Title, post.BlogId }</c>).
-        /// </para>
-        /// </param>
-        /// <returns>A builder to further configure the index.</returns>
-        [Obsolete("Use IncludeProperties")]
-        public static IndexBuilder<TEntity> ForNpgsqlInclude<TEntity>([NotNull] this IndexBuilder<TEntity> indexBuilder, [NotNull] Expression<Func<TEntity, object>> includeExpression)
-            => indexBuilder.IncludeProperties(includeExpression);
-
-        #endregion Obsolete
     }
 }
diff --git a/src/EFCore.PG/Extensions/NpgsqlModelBuilderExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlModelBuilderExtensions.cs
index e556c0ef3..0149cf578 100644
--- a/src/EFCore.PG/Extensions/NpgsqlModelBuilderExtensions.cs
+++ b/src/EFCore.PG/Extensions/NpgsqlModelBuilderExtensions.cs
@@ -490,202 +490,5 @@ static string[] GetMemberPgNames<TEnum>([NotNull] INpgsqlNameTranslator nameTran
                .ToArray();
 
         #endregion
-
-        #region Obsolete
-
-        /// <summary>
-        /// Configures the model to use a sequence-based hi-lo pattern to generate values for properties
-        /// marked as <see cref="ValueGenerated.OnAdd" />, when targeting PostgreSQL.
-        /// </summary>
-        /// <param name="modelBuilder">The model builder.</param>
-        /// <param name="name">The name of the sequence.</param>
-        /// <param name="schema">The schema of the sequence.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseHiLo")]
-        public static ModelBuilder ForNpgsqlUseSequenceHiLo([NotNull] this ModelBuilder modelBuilder, [CanBeNull] string name = null, [CanBeNull] string schema = null)
-            => modelBuilder.UseHiLo(name, schema);
-
-        /// <summary>
-        /// Configures the model to use the PostgreSQL SERIAL feature to generate values for properties
-        /// marked as <see cref="ValueGenerated.OnAdd" />, when targeting PostgreSQL. This is the default
-        /// behavior when targeting PostgreSQL.
-        /// </summary>
-        /// <param name="modelBuilder">The model builder.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseSerialColumns")]
-        public static ModelBuilder ForNpgsqlUseSerialColumns([NotNull] this ModelBuilder modelBuilder)
-            => modelBuilder.UseSerialColumns();
-
-        /// <summary>
-        /// <para>
-        /// Configures the model to use the PostgreSQL IDENTITY feature to generate values for properties
-        /// marked as <see cref="ValueGenerated.OnAdd" />, when targeting PostgreSQL. Values for these
-        /// columns will always be generated as identity, and the application will not be able to override
-        /// this behavior by providing a value.
-        /// </para>
-        /// <para>Available only starting PostgreSQL 10.</para>
-        /// </summary>
-        /// <param name="modelBuilder">The model builder.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseIdentityAlwaysColumns")]
-        public static ModelBuilder ForNpgsqlUseIdentityAlwaysColumns([NotNull] this ModelBuilder modelBuilder)
-            => modelBuilder.UseIdentityAlwaysColumns();
-
-        /// <summary>
-        /// <para>
-        /// Configures the model to use the PostgreSQL IDENTITY feature to generate values for properties
-        /// marked as <see cref="ValueGenerated.OnAdd" />, when targeting PostgreSQL. Values for these
-        /// columns will be generated as identity by default, but the application will be able to override
-        /// this behavior by providing a value.
-        /// </para>
-        /// <para>Available only starting PostgreSQL 10.</para>
-        /// </summary>
-        /// <param name="modelBuilder">The model builder.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseIdentityByDefaultColumns")]
-        public static ModelBuilder ForNpgsqlUseIdentityByDefaultColumns([NotNull] this ModelBuilder modelBuilder)
-            => modelBuilder.UseIdentityByDefaultColumns();
-
-        /// <summary>
-        /// <para>
-        /// Configures the model to use the PostgreSQL IDENTITY feature to generate values for properties
-        /// marked as <see cref="ValueGenerated.OnAdd" />, when targeting PostgreSQL. Values for these
-        /// columns will be generated as identity by default, but the application will be able to override
-        /// this behavior by providing a value.
-        /// </para>
-        /// <para>Available only starting PostgreSQL 10.</para>
-        /// </summary>
-        /// <param name="modelBuilder">The model builder.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseIdentityColumns")]
-        public static ModelBuilder ForNpgsqlUseIdentityColumns([NotNull] this ModelBuilder modelBuilder)
-            => modelBuilder.UseIdentityColumns();
-
-        /// <summary>
-        /// Registers a user-defined enum type in the model.
-        /// </summary>
-        /// <param name="modelBuilder">The model builder in which to create the enum type.</param>
-        /// <param name="schema">The schema in which to create the enum type.</param>
-        /// <param name="name">The name of the enum type to create.</param>
-        /// <param name="labels">The enum label values.</param>
-        /// <returns>
-        /// The updated <see cref="ModelBuilder"/>.
-        /// </returns>
-        /// <remarks>
-        /// See: https://www.postgresql.org/docs/current/static/datatype-enum.html
-        /// </remarks>
-        /// <exception cref="ArgumentNullException">builder</exception>
-        [Obsolete("Use HasPostgresEnum")]
-        public static ModelBuilder ForNpgsqlHasEnum(
-            [NotNull] this ModelBuilder modelBuilder,
-            [CanBeNull] string schema,
-            [NotNull] string name,
-            [NotNull] string[] labels)
-            => modelBuilder.HasPostgresEnum(schema, name, labels);
-
-        /// <summary>
-        /// Registers a user-defined enum type in the model.
-        /// </summary>
-        /// <param name="modelBuilder">The model builder in which to create the enum type.</param>
-        /// <param name="name">The name of the enum type to create.</param>
-        /// <param name="labels">The enum label values.</param>
-        /// <returns>
-        /// The updated <see cref="ModelBuilder"/>.
-        /// </returns>
-        /// <remarks>
-        /// See: https://www.postgresql.org/docs/current/static/datatype-enum.html
-        /// </remarks>
-        /// <exception cref="ArgumentNullException">builder</exception>
-        [Obsolete("Use HasPostgresEnum")]
-        public static ModelBuilder ForNpgsqlHasEnum(
-            [NotNull] this ModelBuilder modelBuilder,
-            [NotNull] string name,
-            [NotNull] string[] labels)
-            => modelBuilder.HasPostgresEnum(name, labels);
-
-        /// <summary>
-        /// Registers a user-defined enum type in the model.
-        /// </summary>
-        /// <param name="modelBuilder">The model builder in which to create the enum type.</param>
-        /// <param name="schema">The schema in which to create the enum type.</param>
-        /// <param name="name">The name of the enum type to create.</param>
-        /// <param name="nameTranslator">
-        /// The translator for name and label inference.
-        /// Defaults to <see cref="NpgsqlSnakeCaseNameTranslator"/>.</param>
-        /// <typeparam name="TEnum"></typeparam>
-        /// <returns>
-        /// The updated <see cref="ModelBuilder"/>.
-        /// </returns>
-        /// <remarks>
-        /// See: https://www.postgresql.org/docs/current/static/datatype-enum.html
-        /// </remarks>
-        /// <exception cref="ArgumentNullException">builder</exception>
-        [Obsolete("Use HasPostgresEnum")]
-        public static ModelBuilder ForNpgsqlHasEnum<TEnum>(
-            [NotNull] this ModelBuilder modelBuilder,
-            [CanBeNull] string schema = null,
-            [CanBeNull] string name = null,
-            [CanBeNull] INpgsqlNameTranslator nameTranslator = null)
-            where TEnum : struct, Enum
-            => modelBuilder.HasPostgresEnum<TEnum>(schema, name, nameTranslator);
-
-        [Obsolete("Use UseDatabaseTemplate")]
-        public static ModelBuilder HasDatabaseTemplate([NotNull] this ModelBuilder modelBuilder, [NotNull] string templateDatabaseName)
-            => modelBuilder.UseDatabaseTemplate(templateDatabaseName);
-
-        /// <summary>
-        /// Registers a user-defined range type in the model.
-        /// </summary>
-        /// <param name="modelBuilder">The model builder on which to create the range type.</param>
-        /// <param name="schema">The schema in which to create the range type.</param>
-        /// <param name="name">The name of the range type to be created.</param>
-        /// <param name="subtype">The subtype (or element type) of the range</param>
-        /// <param name="canonicalFunction">
-        /// An optional PostgreSQL function which converts range values to a canonical form.
-        /// </param>
-        /// <param name="subtypeOpClass">Used to specify a non-default operator class.</param>
-        /// <param name="collation">Used to specify a non-default collation in the range's order.</param>
-        /// <param name="subtypeDiff">
-        /// An optional PostgreSQL function taking two values of the subtype type as argument, and return a double
-        /// precision value representing the difference between the two given values.
-        /// </param>
-        /// <remarks>
-        /// See https://www.postgresql.org/docs/current/static/rangetypes.html,
-        /// https://www.postgresql.org/docs/current/static/sql-createtype.html,
-        /// </remarks>
-        [Obsolete("Use HasPostgresRange")]
-        public static ModelBuilder ForNpgsqlHasRange(
-            [NotNull] this ModelBuilder modelBuilder,
-            [CanBeNull] string schema,
-            [NotNull] string name,
-            [NotNull] string subtype,
-            string canonicalFunction = null,
-            string subtypeOpClass = null,
-            string collation = null,
-            string subtypeDiff = null)
-            => modelBuilder.HasPostgresRange(schema, name, subtype, canonicalFunction, subtype, collation, subtypeDiff);
-
-        /// <summary>
-        /// Registers a user-defined range type in the model.
-        /// </summary>
-        /// <param name="modelBuilder">The model builder on which to create the range type.</param>
-        /// <param name="name">The name of the range type to be created.</param>
-        /// <param name="subtype">The subtype (or element type) of the range</param>
-        /// <remarks>
-        /// See https://www.postgresql.org/docs/current/static/rangetypes.html,
-        /// https://www.postgresql.org/docs/current/static/sql-createtype.html,
-        /// </remarks>
-        [Obsolete("Use HasPostgresRange")]
-        public static ModelBuilder ForNpgsqlHasRange(
-            [NotNull] this ModelBuilder modelBuilder,
-            [NotNull] string name,
-            [NotNull] string subtype)
-            => modelBuilder.HasPostgresRange(name, subtype);
-
-        [Obsolete("Use UseTablespace")]
-        public static ModelBuilder ForNpgsqlUseTablespace([NotNull] this ModelBuilder modelBuilder, [NotNull] string tablespace)
-            => modelBuilder.UseTablespace(tablespace);
-
-        #endregion Obsolete
     }
 }
diff --git a/src/EFCore.PG/Extensions/NpgsqlPropertyBuilderExtensions.cs b/src/EFCore.PG/Extensions/NpgsqlPropertyBuilderExtensions.cs
index 5a52a3d51..d607eadd8 100644
--- a/src/EFCore.PG/Extensions/NpgsqlPropertyBuilderExtensions.cs
+++ b/src/EFCore.PG/Extensions/NpgsqlPropertyBuilderExtensions.cs
@@ -611,184 +611,5 @@ public static bool CanSetIdentityOptions(
         }
 
         #endregion Identity options
-
-        #region Obsolete
-
-        /// <summary>
-        /// Configures a comment to be applied to the column.
-        /// </summary>
-        /// <param name="propertyBuilder">The builder for the property being configured.</param>
-        /// <param name="comment">The comment for the column.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use HasComment")]
-        public static PropertyBuilder ForNpgsqlHasComment(
-            [NotNull] this PropertyBuilder propertyBuilder,
-            [CanBeNull] string comment)
-        {
-            Check.NotNull(propertyBuilder, nameof(propertyBuilder));
-            Check.NullButNotEmpty(comment, nameof(comment));
-
-            propertyBuilder.HasComment(comment);
-
-            return propertyBuilder;
-        }
-
-        /// <summary>
-        /// Configures a comment to be applied to the column.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity type being configured.</typeparam>
-        /// <param name="propertyBuilder">The builder for the property being configured.</param>
-        /// <param name="comment">The comment for the column.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use HasComment")]
-        public static PropertyBuilder<TEntity> ForNpgsqlHasComment<TEntity>(
-            [NotNull] this PropertyBuilder<TEntity> propertyBuilder,
-            [CanBeNull] string comment)
-            => (PropertyBuilder<TEntity>)ForNpgsqlHasComment((PropertyBuilder)propertyBuilder, comment);
-
-        /// <summary>
-        /// Configures the property to use a sequence-based hi-lo pattern to generate values for new entities,
-        /// when targeting PostgreSQL. This method sets the property to be <see cref="ValueGenerated.OnAdd" />.
-        /// </summary>
-        /// <param name="propertyBuilder"> The builder for the property being configured.</param>
-        /// <param name="name"> The comment of the sequence.</param>
-        /// <param name="schema"> The schema of the sequence.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseHiLo")]
-        public static PropertyBuilder ForNpgsqlUseSequenceHiLo([NotNull] this PropertyBuilder propertyBuilder, [CanBeNull] string name = null, [CanBeNull] string schema = null)
-            => propertyBuilder.UseHiLo(name, schema);
-
-        /// <summary>
-        /// Configures the property to use a sequence-based hi-lo pattern to generate values for new entities,
-        /// when targeting PostgreSQL. This method sets the property to be <see cref="ValueGenerated.OnAdd" />.
-        /// </summary>
-        /// <param name="propertyBuilder"> The builder for the property being configured.</param>
-        /// <param name="name"> The comment of the sequence.</param>
-        /// <param name="schema"> The schema of the sequence.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseHiLo")]
-        public static PropertyBuilder<TProperty> ForNpgsqlUseSequenceHiLo<TProperty>([NotNull] this PropertyBuilder<TProperty> propertyBuilder, [CanBeNull] string name = null, [CanBeNull] string schema = null)
-            => propertyBuilder.UseHiLo(name, schema);
-
-        /// <summary>
-        /// Configures the property to use the PostgreSQL SERIAL feature to generate values for new entities,
-        /// when targeting PostgreSQL. This method sets the property to be <see cref="ValueGenerated.OnAdd" />.
-        /// </summary>
-        /// <typeparam name="TProperty"> The type of the property being configured.</typeparam>
-        /// <param name="propertyBuilder"> The builder for the property being configured.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseSerialColumn")]
-        public static PropertyBuilder UseNpgsqlSerialColumn([NotNull] this PropertyBuilder propertyBuilder)
-            => propertyBuilder.UseSerialColumn();
-
-        /// <summary>
-        /// Configures the property to use the PostgreSQL SERIAL feature to generate values for new entities,
-        /// when targeting PostgreSQL. This method sets the property to be <see cref="ValueGenerated.OnAdd" />.
-        /// </summary>
-        /// <typeparam name="TProperty"> The type of the property being configured.</typeparam>
-        /// <param name="propertyBuilder"> The builder for the property being configured.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseSerialColumn")]
-        public static PropertyBuilder<TProperty> UseNpgsqlSerialColumn<TProperty>(
-            [NotNull] this PropertyBuilder<TProperty> propertyBuilder)
-            => propertyBuilder.UseSerialColumn();
-
-        /// <summary>
-        /// <para>
-        /// Configures the property to use the PostgreSQL IDENTITY feature to generate values for new entities,
-        /// when targeting PostgreSQL. This method sets the property to be <see cref="ValueGenerated.OnAdd" />.
-        /// Values for this property will always be generated as identity, and the application will not be able
-        /// to override this behavior by providing a value.
-        /// </para>
-        /// <para>Available only starting PostgreSQL 10.</para>
-        /// </summary>
-        /// <param name="propertyBuilder"> The builder for the property being configured.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseIdentityAlwaysColumn")]
-        public static PropertyBuilder UseNpgsqlIdentityAlwaysColumn([NotNull] this PropertyBuilder propertyBuilder)
-            => propertyBuilder.UseIdentityAlwaysColumn();
-
-        /// <summary>
-        /// <para>
-        /// Configures the property to use the PostgreSQL IDENTITY feature to generate values for new entities,
-        /// when targeting PostgreSQL. This method sets the property to be <see cref="ValueGenerated.OnAdd" />.
-        /// Values for this property will always be generated as identity, and the application will not be able
-        /// to override this behavior by providing a value.
-        /// </para>
-        /// <para>Available only starting PostgreSQL 10.</para>
-        /// </summary>
-        /// <param name="propertyBuilder"> The builder for the property being configured.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseIdentityAlwaysColumn")]
-        public static PropertyBuilder<TProperty> UseNpgsqlIdentityAlwaysColumn<TProperty>(
-            [NotNull] this PropertyBuilder<TProperty> propertyBuilder)
-            => propertyBuilder.UseIdentityAlwaysColumn();
-
-        /// <summary>
-        /// <para>
-        /// Configures the property to use the PostgreSQL IDENTITY feature to generate values for new entities,
-        /// when targeting PostgreSQL. This method sets the property to be <see cref="ValueGenerated.OnAdd" />.
-        /// Values for this property will be generated as identity by default, but the application will be able
-        /// to override this behavior by providing a value.
-        /// </para>
-        /// <para>Available only starting PostgreSQL 10.</para>
-        /// </summary>
-        /// <param name="propertyBuilder"> The builder for the property being configured.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseIdentityByDefaultColumn")]
-        public static PropertyBuilder UseNpgsqlIdentityByDefaultColumn([NotNull] this PropertyBuilder propertyBuilder)
-            => propertyBuilder.UseIdentityByDefaultColumn();
-
-        /// <summary>
-        /// <para>
-        /// Configures the property to use the PostgreSQL IDENTITY feature to generate values for new entities,
-        /// when targeting PostgreSQL. This method sets the property to be <see cref="ValueGenerated.OnAdd" />.
-        /// Values for this property will be generated as identity by default, but the application will be able
-        /// to override this behavior by providing a value.
-        /// </para>
-        /// <para>Available only starting PostgreSQL 10.</para>
-        /// </summary>
-        /// <typeparam name="TProperty"> The type of the property being configured.</typeparam>
-        /// <param name="propertyBuilder"> The builder for the property being configured.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseIdentityByDefaultColumn")]
-        public static PropertyBuilder<TProperty> UseNpgsqlIdentityByDefaultColumn<TProperty>(
-            [NotNull] this PropertyBuilder<TProperty> propertyBuilder)
-            => propertyBuilder.UseIdentityByDefaultColumn();
-
-        /// <summary>
-        /// <para>
-        /// Configures the property to use the PostgreSQL IDENTITY feature to generate values for new entities,
-        /// when targeting PostgreSQL. This method sets the property to be <see cref="ValueGenerated.OnAdd" />.
-        /// Values for this property will be generated as identity by default, but the application will be able
-        /// to override this behavior by providing a value.
-        /// </para>
-        /// <para>Available only starting PostgreSQL 10.</para>
-        /// </summary>
-        /// <param name="propertyBuilder"> The builder for the property being configured.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseIdentityColumn")]
-        public static PropertyBuilder UseNpgsqlIdentityColumn(
-            [NotNull] this PropertyBuilder propertyBuilder)
-            => propertyBuilder.UseIdentityColumn();
-
-        /// <summary>
-        /// <para>
-        /// Configures the property to use the PostgreSQL IDENTITY feature to generate values for new entities,
-        /// when targeting PostgreSQL. This method sets the property to be <see cref="ValueGenerated.OnAdd" />.
-        /// Values for this property will be generated as identity by default, but the application will be able
-        /// to override this behavior by providing a value.
-        /// </para>
-        /// <para>Available only starting PostgreSQL 10.</para>
-        /// </summary>
-        /// <typeparam name="TProperty"> The type of the property being configured.</typeparam>
-        /// <param name="propertyBuilder"> The builder for the property being configured.</param>
-        /// <returns>The same builder instance so that multiple calls can be chained.</returns>
-        [Obsolete("Use UseIdentityColumn")]
-        public static PropertyBuilder<TProperty> UseNpgsqlIdentityColumn<TProperty>(
-            [NotNull] this PropertyBuilder<TProperty> propertyBuilder)
-            => propertyBuilder.UseIdentityColumn();
-
-        #endregion Obsolete
     }
 }