diff --git a/src/core/song.cpp b/src/core/song.cpp
index ca3e89b19..926f9f9ed 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -1036,7 +1036,7 @@ void Song::BindToQuery(QSqlQuery *query) const {
   query->bindValue(":samplerate", intval(d->samplerate_));
   query->bindValue(":bitdepth", intval(d->bitdepth_));
 
-  query->bindValue(":source", notnullintval(d->source_));
+  query->bindValue(":source", d->source_);
   query->bindValue(":directory_id", notnullintval(d->directory_id_));
 
   if (Application::kIsPortable && Utilities::UrlOnSameDriveAsStrawberry(d->url_)) {
diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp
index 1939b816d..4b7edbd1f 100644
--- a/src/playlist/playlistdelegates.cpp
+++ b/src/playlist/playlistdelegates.cpp
@@ -431,7 +431,7 @@ QString NativeSeparatorsDelegate::displayText(const QVariant &value, const QLoca
 
 }
 
-SongSourceDelegate::SongSourceDelegate(QObject *parent, Player *player) : PlaylistDelegateBase(parent), player_(player) {}
+SongSourceDelegate::SongSourceDelegate(QObject *parent) : PlaylistDelegateBase(parent) {}
 
 QString SongSourceDelegate::displayText(const QVariant &value, const QLocale&) const {
   return QString();
diff --git a/src/playlist/playlistdelegates.h b/src/playlist/playlistdelegates.h
index ae9e47bdd..12d27d94b 100644
--- a/src/playlist/playlistdelegates.h
+++ b/src/playlist/playlistdelegates.h
@@ -172,14 +172,13 @@ class NativeSeparatorsDelegate : public PlaylistDelegateBase {
 
 class SongSourceDelegate : public PlaylistDelegateBase {
  public:
-  SongSourceDelegate(QObject *parent, Player *player);
+  SongSourceDelegate(QObject *parent);
   QString displayText(const QVariant &value, const QLocale &locale) const;
   void paint(QPainter *paint, const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
  private:
   QPixmap LookupPixmap(const Song::Source &type, const QSize &size) const;
 
-  Player *player_;
   mutable QPixmapCache cache_;
 };
 
diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index 435a49a63..39fa211b9 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -232,12 +232,7 @@ void PlaylistView::SetItemDelegates(CollectionBackend *backend) {
   setItemDelegateForColumn(Playlist::Column_Filename, new NativeSeparatorsDelegate(this));
   setItemDelegateForColumn(Playlist::Column_LastPlayed, new LastPlayedItemDelegate(this));
 
-  if (app_ && app_->player()) {
-    setItemDelegateForColumn(Playlist::Column_Source, new SongSourceDelegate(this, app_->player()));
-  }
-  else {
-    header_->HideSection(Playlist::Column_Source);
-  }
+  setItemDelegateForColumn(Playlist::Column_Source, new SongSourceDelegate(this));
 
 }
 
diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp
index eef2933d6..8b7c07281 100644
--- a/src/tidal/tidalservice.cpp
+++ b/src/tidal/tidalservice.cpp
@@ -163,7 +163,6 @@ void TidalService::HandleAuthReply(QNetworkReply *reply, int search_id) {
 
   login_sent_ = false;
 
-  //int http_status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
   if (reply->error() != QNetworkReply::NoError) {
     if (reply->error() < 200) {
       // This is a network error, there is nothing more to do.
@@ -308,7 +307,6 @@ QJsonObject TidalService::ExtractJsonObj(QNetworkReply *reply, bool sendlogin) {
 
   QByteArray data;
 
-  //int http_status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
   if (reply->error() == QNetworkReply::NoError) {
     data = reply->readAll();
   }
@@ -450,8 +448,8 @@ void TidalService::CancelSearch() {
 }
 void TidalService::ClearSearch() {
   search_id_ = 0;
-  search_text_ = QString();
-  search_error_ = QString();
+  search_text_.clear();
+  search_error_.clear();
   albums_requested_ = 0;
   songs_requested_ = 0;
   albums_received_ = 0;
diff --git a/src/tidal/tidalservice.h b/src/tidal/tidalservice.h
index f073e1c70..67625ca9b 100644
--- a/src/tidal/tidalservice.h
+++ b/src/tidal/tidalservice.h
@@ -57,7 +57,7 @@ class TidalService : public InternetService {
   void CancelSearch();
 
   const bool login_sent() { return login_sent_; }
-  const bool authenticated() { return (!session_id_.isEmpty() && !user_id_ == 0 && !country_code_.isEmpty()); }
+  const bool authenticated() { return (!session_id_.isEmpty() && !country_code_.isEmpty()); }
 
  signals:
   void Login(const int search_id = 0);