diff --git a/src/collection/collectiondirectorymodel.cpp b/src/collection/collectiondirectorymodel.cpp
index 4510233db..79842ccb3 100644
--- a/src/collection/collectiondirectorymodel.cpp
+++ b/src/collection/collectiondirectorymodel.cpp
@@ -53,13 +53,7 @@ CollectionDirectoryModel::~CollectionDirectoryModel() {}
 
 void CollectionDirectoryModel::DirectoryDiscovered(const Directory &dir) {
 
-  QStandardItem *item;
-  if (Application::kIsPortable && Utilities::UrlOnSameDriveAsStrawberry(QUrl::fromLocalFile(dir.path))) {
-    item = new QStandardItem(Utilities::GetRelativePathToStrawberryBin(QUrl::fromLocalFile(dir.path)).toLocalFile());
-  }
-  else {
-    item = new QStandardItem(dir.path);
-  }
+  QStandardItem *item = new QStandardItem(dir.path);
   item->setData(dir.id, kIdRole);
   item->setIcon(dir_icon_);
   storage_ << std::shared_ptr<MusicStorage>(new FilesystemMusicStorage(dir.path));
diff --git a/src/core/application.cpp b/src/core/application.cpp
index aa679fc5f..34fb9f818 100644
--- a/src/core/application.cpp
+++ b/src/core/application.cpp
@@ -86,8 +86,6 @@
 #  include "moodbar/moodbarloader.h"
 #endif
 
-bool Application::kIsPortable = false;
-
 class ApplicationImpl {
  public:
   explicit ApplicationImpl(Application *app) :
diff --git a/src/core/application.h b/src/core/application.h
index 418d3e4cb..cd187b21a 100644
--- a/src/core/application.h
+++ b/src/core/application.h
@@ -68,8 +68,6 @@ class Application : public QObject {
   Q_OBJECT
 
  public:
-  static bool kIsPortable;
-
   explicit Application(QObject *parent = nullptr);
   ~Application();
 
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 3ca852020..085d99e3d 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -427,15 +427,7 @@ void Song::set_bitdepth(int v) { d->bitdepth_ = v; }
 
 void Song::set_source(Source v) { d->source_ = v; }
 void Song::set_directory_id(int v) { d->directory_id_ = v; }
-void Song::set_url(const QUrl &v) {
-  if (Application::kIsPortable) {
-    QUrl base = QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + "/");
-    d->url_ = base.resolved(v);
-  }
-  else {
-    d->url_ = v;
-  }
-}
+void Song::set_url(const QUrl &v) { d->url_ = v; }
 void Song::set_basefilename(const QString &v) { d->basefilename_ = v; }
 void Song::set_filetype(FileType v) { d->filetype_ = v; }
 void Song::set_filesize(int v) { d->filesize_ = v; }
@@ -1288,18 +1280,7 @@ void Song::BindToQuery(QSqlQuery *query) const {
 
   query->bindValue(":source", d->source_);
   query->bindValue(":directory_id", notnullintval(d->directory_id_));
-
-  QString url;
-  if (d->url_.isValid()) {
-    if (Application::kIsPortable && Utilities::UrlOnSameDriveAsStrawberry(d->url_)) {
-      url = Utilities::GetRelativePathToStrawberryBin(d->url_).toEncoded();
-    }
-    else {
-      url = d->url_.toEncoded();
-    }
-  }
-  query->bindValue(":url", url);
-
+  query->bindValue(":url", d->url_.toString(QUrl::FullyEncoded));
   query->bindValue(":filetype", d->filetype_);
   query->bindValue(":filesize", notnullintval(d->filesize_));
   query->bindValue(":mtime", notnullintval(d->mtime_));
diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index 60a8a878f..dd271a81a 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -736,19 +736,6 @@ void IncreaseFDLimit() {
 
 }
 
-void CheckPortable() {
-
-  QFile f(QApplication::applicationDirPath() + QDir::separator() + "data");
-  if (f.exists()) {
-    // We are portable. Set the bool and change the qsettings path
-    Application::kIsPortable = true;
-
-    QSettings::setDefaultFormat(QSettings::IniFormat);
-    QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, f.fileName());
-  }
-
-}
-
 QString GetRandomStringWithChars(const int len) {
   const QString UseCharacters("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
   return GetRandomString(len, UseCharacters);
diff --git a/src/core/utilities.h b/src/core/utilities.h
index 54717eca9..ef87f47d4 100644
--- a/src/core/utilities.h
+++ b/src/core/utilities.h
@@ -124,7 +124,6 @@ QString FiddleFileExtension(const QString &filename, const QString &new_extensio
 QString GetEnv(const QString &key);
 void SetEnv(const char *key, const QString &value);
 void IncreaseFDLimit();
-void CheckPortable();
 
 // Borrowed from schedutils
 enum IoPriority {
diff --git a/src/main.cpp b/src/main.cpp
index b899c3ea1..7573ad4f1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -134,7 +134,6 @@ int main(int argc, char* argv[]) {
     // Only start a core application now so we can check if there's another instance without requiring an X server.
     // This MUST be done before parsing the commandline options so QTextCodec gets the right system locale for filenames.
     SingleCoreApplication core_app(argc, argv, true, SingleCoreApplication::Mode::User | SingleCoreApplication::Mode::ExcludeAppVersion | SingleCoreApplication::Mode::ExcludeAppPath);
-    Utilities::CheckPortable();
     // Parse commandline options - need to do this before starting the full QApplication so it works without an X server
     if (!options.Parse()) return 1;
     logging::SetLevels(options.log_levels());