diff --git a/src/libs/database/impl/objects/Artist.cpp b/src/libs/database/impl/objects/Artist.cpp
index 15cacc41..ab7cbac6 100644
--- a/src/libs/database/impl/objects/Artist.cpp
+++ b/src/libs/database/impl/objects/Artist.cpp
@@ -27,9 +27,9 @@
 #include "database/objects/Cluster.hpp"
 #include "database/objects/Directory.hpp"
 #include "database/objects/Release.hpp"
-#include "database/objects/StarredArtist.hpp"
+// #include "database/objects/StarredArtist.hpp"
 #include "database/objects/Track.hpp"
-#include "database/objects/TrackArtistLink.hpp"
+// #include "database/objects/TrackArtistLink.hpp"
 #include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
diff --git a/src/libs/database/include/database/objects/Artist.hpp b/src/libs/database/include/database/objects/Artist.hpp
index 21d9e96e..e6f82723 100644
--- a/src/libs/database/include/database/objects/Artist.hpp
+++ b/src/libs/database/include/database/objects/Artist.hpp
@@ -31,12 +31,12 @@
 
 #include "core/EnumSet.hpp"
 #include "core/UUID.hpp"
+
 #include "database/IdRange.hpp"
 #include "database/Object.hpp"
 #include "database/Types.hpp"
 #include "database/objects/ArtistId.hpp"
 #include "database/objects/ArtworkId.hpp"
-#include "database/objects/ClusterId.hpp"
 #include "database/objects/Filters.hpp"
 #include "database/objects/MediaLibraryId.hpp"
 #include "database/objects/ReleaseId.hpp"
@@ -51,9 +51,7 @@ namespace lms::db
     class ClusterType;
     class Release;
     class Session;
-    class StarredArtist;
     class Track;
-    class TrackArtistLink;
     class User;
 
     class Artist final : public Object<Artist, ArtistId>
@@ -149,7 +147,6 @@ namespace lms::db
         bool hasMBID() const;
         ObjectPtr<Artwork> getPreferredArtwork() const;
         ArtworkId getPreferredArtworkId() const;
-        void visitLinks(std::function<void(const ObjectPtr<TrackArtistLink>& link)> visitor) const;
 
         // No artistLinkTypes means get them all
         RangeResults<ArtistId> findSimilarArtistIds(core::EnumSet<TrackArtistLinkType> artistLinkTypes = {}, std::optional<Range> range = std::nullopt) const;
@@ -172,8 +169,6 @@ namespace lms::db
             Wt::Dbo::field(a, _mbid, "mbid");
 
             Wt::Dbo::belongsTo(a, _preferredArtwork, "preferred_artwork", Wt::Dbo::OnDeleteSetNull);
-            Wt::Dbo::hasMany(a, _trackArtistLinks, Wt::Dbo::ManyToOne, "artist");
-            Wt::Dbo::hasMany(a, _starredArtists, Wt::Dbo::ManyToMany, "user_starred_artists", "", Wt::Dbo::OnDeleteCascade);
         }
 
     private:
@@ -187,8 +182,5 @@ namespace lms::db
         std::string _mbid; // Musicbrainz Identifier
 
         Wt::Dbo::ptr<Artwork> _preferredArtwork;
-        Wt::Dbo::collection<Wt::Dbo::ptr<TrackArtistLink>> _trackArtistLinks; // Tracks involving this artist
-        Wt::Dbo::collection<Wt::Dbo::ptr<StarredArtist>> _starredArtists;     // starred entries for this artist
     };
-
 } // namespace lms::db
diff --git a/src/lms/ui/explore/TrackArtistLinkTypeSelector.hpp b/src/lms/ui/explore/TrackArtistLinkTypeSelector.hpp
index a3c08605..f7b737e8 100644
--- a/src/lms/ui/explore/TrackArtistLinkTypeSelector.hpp
+++ b/src/lms/ui/explore/TrackArtistLinkTypeSelector.hpp
@@ -21,7 +21,7 @@
 
 #include <optional>
 
-#include "database/Types.hpp"
+#include "database/objects/Types.hpp"
 
 #include "DropDownMenuSelector.hpp"