diff --git a/src/MusicStore.Spa/Models/MusicStoreContext.cs b/src/MusicStore.Spa/Models/MusicStoreContext.cs
index 87552d9a3a..db5adebe78 100644
--- a/src/MusicStore.Spa/Models/MusicStoreContext.cs
+++ b/src/MusicStore.Spa/Models/MusicStoreContext.cs
@@ -39,12 +39,6 @@ namespace MusicStore.Models
             builder.Entity<Album>().Property(a => a.ArtistId).GenerateValueOnAdd(generateValue: false);
             builder.Entity<Genre>().Property(g => g.GenreId).GenerateValueOnAdd(generateValue: false);
 
-            // TODO: Remove this once convention-based relations work again
-            builder.Entity<Album>().ManyToOne(a => a.Artist);
-            builder.Entity<Album>().ManyToOne(a => a.Genre, g => g.Albums);
-            builder.Entity<Order>().OneToMany(o => o.OrderDetails);
-            builder.Entity<Album>().OneToMany(a => a.OrderDetails, od => od.Album);
-
             base.OnModelCreating(builder);
         }
     }
diff --git a/src/MusicStore/Models/MusicStoreContext.cs b/src/MusicStore/Models/MusicStoreContext.cs
index 41cda5cc54..5eaa43da36 100644
--- a/src/MusicStore/Models/MusicStoreContext.cs
+++ b/src/MusicStore/Models/MusicStoreContext.cs
@@ -33,18 +33,6 @@ namespace MusicStore.Models
             builder.Entity<Album>().Ignore(a => a.OrderDetails);
             builder.Entity<OrderDetail>().Ignore(od => od.Album);
 
-            var orderDetails = builder.Model.GetEntityType(typeof(OrderDetail));
-            var albumNavigation = orderDetails.TryGetNavigation("Album");
-            if (albumNavigation != null)
-            {
-                orderDetails.RemoveNavigation(albumNavigation);
-
-                var album = builder.Model.GetEntityType(typeof(Album));
-                album.RemoveNavigation(album.GetNavigation("OrderDetails"));
-
-                orderDetails.RemoveForeignKey(albumNavigation.ForeignKey);
-            }
-
             base.OnModelCreating(builder);
         }
     }