diff --git a/model/criteria/operators_test.go b/model/criteria/operators_test.go
index 575b9c3f8..e6082de44 100644
--- a/model/criteria/operators_test.go
+++ b/model/criteria/operators_test.go
@@ -46,7 +46,6 @@ var _ = Describe("Operators", func() {
 		Entry("notInPlaylist", NotInPlaylist{"id": "deadbeef-dead-beef"}, "media_file.id NOT IN "+
 			"(SELECT media_file_id FROM playlist_tracks pl LEFT JOIN playlist on pl.playlist_id = playlist.id WHERE (pl.playlist_id = ? AND playlist.public = ?))", "deadbeef-dead-beef", 1),
 
-		// TODO These may be flaky
 		Entry("inTheLast", InTheLast{"lastPlayed": 30}, "annotation.play_date > ?", StartOfPeriod(30, time.Now())),
 		Entry("notInTheLast", NotInTheLast{"lastPlayed": 30}, "(annotation.play_date < ? OR annotation.play_date IS NULL)", StartOfPeriod(30, time.Now())),
 
diff --git a/model/player.go b/model/player.go
index ee7346b66..39ea99d1a 100644
--- a/model/player.go
+++ b/model/player.go
@@ -28,5 +28,4 @@ type PlayerRepository interface {
 	Put(p *Player) error
 	CountAll(...QueryOptions) (int64, error)
 	CountByClient(...QueryOptions) (map[string]int64, error)
-	// TODO: Add CountAll method. Useful at least for metrics.
 }
diff --git a/server/subsonic/browsing.go b/server/subsonic/browsing.go
index d46c7937d..edc45a7c7 100644
--- a/server/subsonic/browsing.go
+++ b/server/subsonic/browsing.go
@@ -252,9 +252,7 @@ func (api *Router) GetSong(r *http.Request) (*responses.Subsonic, error) {
 
 func (api *Router) GetGenres(r *http.Request) (*responses.Subsonic, error) {
 	ctx := r.Context()
-	// TODO Put back when album_count is available
-	//genres, err := api.ds.Genre(ctx).GetAll(model.QueryOptions{Sort: "song_count, album_count, name desc", Order: "desc"})
-	genres, err := api.ds.Genre(ctx).GetAll(model.QueryOptions{Sort: "song_count, name desc", Order: "desc"})
+	genres, err := api.ds.Genre(ctx).GetAll(model.QueryOptions{Sort: "song_count, album_count, name desc", Order: "desc"})
 	if err != nil {
 		log.Error(r, err)
 		return nil, err