diff --git a/Jellyfin.Server.Implementations/JellyfinDb.cs b/Jellyfin.Server.Implementations/JellyfinDb.cs
index b176e14a61..dc4f53913c 100644
--- a/Jellyfin.Server.Implementations/JellyfinDb.cs
+++ b/Jellyfin.Server.Implementations/JellyfinDb.cs
@@ -155,7 +155,7 @@ namespace Jellyfin.Server.Implementations
             base.OnModelCreating(modelBuilder);
             modelBuilder.HasDefaultSchema("jellyfin");
 
-            // Configuration for each entity is in it's own class inside 'ModelConfiguratio'.
+            // Configuration for each entity is in it's own class inside 'ModelConfiguration'.
             modelBuilder.ApplyConfigurationsFromAssembly(typeof(JellyfinDb).Assembly);
         }
     }
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/ApiKeyConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/ApiKeyConfiguration.cs
index 9067d3833d..3f19b6986a 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/ApiKeyConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/ApiKeyConfiguration.cs
@@ -12,8 +12,6 @@ namespace Jellyfin.Server.Implementations.ModelConfiguration
         /// <inheritdoc/>
         public void Configure(EntityTypeBuilder<ApiKey> builder)
         {
-            // Indexes
-
             builder
                 .HasIndex(entity => entity.AccessToken)
                 .IsUnique();
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/CustomItemDisplayPreferencesConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/CustomItemDisplayPreferencesConfiguration.cs
index 75d9ba529e..779aec986b 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/CustomItemDisplayPreferencesConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/CustomItemDisplayPreferencesConfiguration.cs
@@ -12,8 +12,6 @@ namespace Jellyfin.Server.Implementations.ModelConfiguration
         /// <inheritdoc/>
         public void Configure(EntityTypeBuilder<CustomItemDisplayPreferences> builder)
         {
-            // Indexes
-
             builder
                 .HasIndex(entity => new { entity.UserId, entity.ItemId, entity.Client, entity.Key })
                 .IsUnique();
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/DeviceConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/DeviceConfiguration.cs
index 5b4e711cc4..a750b65c03 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/DeviceConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/DeviceConfiguration.cs
@@ -12,8 +12,6 @@ namespace Jellyfin.Server.Implementations.ModelConfiguration
         /// <inheritdoc/>
         public void Configure(EntityTypeBuilder<Device> builder)
         {
-            // Indexes
-
             builder
                 .HasIndex(entity => new { entity.DeviceId, entity.DateLastActivity });
 
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/DeviceOptionsConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/DeviceOptionsConfiguration.cs
index 0db1944b58..038afd7524 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/DeviceOptionsConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/DeviceOptionsConfiguration.cs
@@ -12,8 +12,6 @@ namespace Jellyfin.Server.Implementations.ModelConfiguration
         /// <inheritdoc/>
         public void Configure(EntityTypeBuilder<DeviceOptions> builder)
         {
-            // Indexes
-
             builder
                 .HasIndex(entity => entity.DeviceId)
                 .IsUnique();
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/DisplayPreferencesConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/DisplayPreferencesConfiguration.cs
index 807078803d..9b437861bb 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/DisplayPreferencesConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/DisplayPreferencesConfiguration.cs
@@ -12,15 +12,11 @@ namespace Jellyfin.Server.Implementations.ModelConfiguration
         /// <inheritdoc/>
         public void Configure(EntityTypeBuilder<DisplayPreferences> builder)
         {
-            // Delete behaviour
-
             builder
                 .HasMany(d => d.HomeSections)
                 .WithOne()
                 .OnDelete(DeleteBehavior.Cascade);
 
-            // Indexes
-
             builder
                 .HasIndex(entity => new { entity.UserId, entity.ItemId, entity.Client })
                 .IsUnique();
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/PermissionConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/PermissionConfiguration.cs
index 56e76d88dd..240e284c0c 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/PermissionConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/PermissionConfiguration.cs
@@ -12,8 +12,6 @@ namespace Jellyfin.Server.Implementations.ModelConfiguration
         /// <inheritdoc/>
         public void Configure(EntityTypeBuilder<Permission> builder)
         {
-            // Indexes
-
             // Used to get a user's permissions or a specific permission for a user.
             // Also prevents multiple values being created for a user.
             // Filtered over non-null user ids for when other entities (groups, API keys) get permissions
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/PreferenceConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/PreferenceConfiguration.cs
index 3cd5f8afbe..49c869c6a8 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/PreferenceConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/PreferenceConfiguration.cs
@@ -12,8 +12,6 @@ namespace Jellyfin.Server.Implementations.ModelConfiguration
         /// <inheritdoc/>
         public void Configure(EntityTypeBuilder<Preference> builder)
         {
-            // Indexes
-
             builder
                 .HasIndex(p => new { p.UserId, p.Kind })
                 .HasFilter("[UserId] IS NOT NULL")
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/UserConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/UserConfiguration.cs
index ee88318048..a369cf6562 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/UserConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/UserConfiguration.cs
@@ -12,14 +12,10 @@ namespace Jellyfin.Server.Implementations.ModelConfiguration
         /// <inheritdoc/>
         public void Configure(EntityTypeBuilder<User> builder)
         {
-            // Collations
-
             builder
                 .Property(user => user.Username)
                 .UseCollation("NOCASE");
 
-            // Delete behavior
-
             builder
                 .HasOne(u => u.ProfileImage)
                 .WithOne()
@@ -52,8 +48,6 @@ namespace Jellyfin.Server.Implementations.ModelConfiguration
                 .WithOne()
                 .OnDelete(DeleteBehavior.Cascade);
 
-            // Indexes
-
             builder
                 .HasIndex(entity => entity.Username)
                 .IsUnique();