diff --git a/src/core/player.cpp b/src/core/player.cpp
index 18347a80..6174c9a6 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -160,7 +160,7 @@ void Player::Init() {
 
   QSettings s;
 
-  if (!engine_.get()) {
+  if (!engine_) {
     s.beginGroup(BackendSettingsPage::kSettingsGroup);
     Engine::EngineType enginetype = Engine::EngineTypeFromName(s.value("engine", EngineName(Engine::GStreamer)).toString().toLower());
     s.endGroup();
diff --git a/src/device/mtpdevice.cpp b/src/device/mtpdevice.cpp
index 8e45edb8..7b650ca1 100644
--- a/src/device/mtpdevice.cpp
+++ b/src/device/mtpdevice.cpp
@@ -213,7 +213,7 @@ void MtpDevice::StartDelete() { StartCopy(nullptr); }
 
 bool MtpDevice::DeleteFromStorage(const DeleteJob &job) {
 
-  if (!connection_.get() || !connection_->is_valid()) return false;
+  if (!connection_ || !connection_->is_valid()) return false;
 
   // Extract the ID from the song's URL
   QString filename = job.metadata_.url().path();
diff --git a/src/engine/macosdevicefinder.cpp b/src/engine/macosdevicefinder.cpp
index b5b79296..a77a85d3 100644
--- a/src/engine/macosdevicefinder.cpp
+++ b/src/engine/macosdevicefinder.cpp
@@ -78,7 +78,7 @@ QList<DeviceFinder::Device> MacOsDeviceFinder::ListDevices() {
 
   UInt32 device_size_bytes = 0;
   std::unique_ptr<AudioDeviceID> devices = GetProperty<AudioDeviceID>(kAudioObjectSystemObject, address, &device_size_bytes);
-  if (!devices.get()) {
+  if (!devices) {
     return ret;
   }
   const UInt32 device_count = device_size_bytes / sizeof(AudioDeviceID);
@@ -91,7 +91,7 @@ QList<DeviceFinder::Device> MacOsDeviceFinder::ListDevices() {
     address.mSelector = kAudioDevicePropertyDeviceNameCFString;
     std::unique_ptr<CFStringRef> device_name = GetProperty<CFStringRef>(id, address);
     ScopedCFTypeRef<CFStringRef> scoped_device_name(*device_name.get());
-    if (!device_name.get()) {
+    if (!device_name) {
       continue;
     }
 
diff --git a/src/qobuz/qobuzservice.cpp b/src/qobuz/qobuzservice.cpp
index baf33dc3..b584ffb0 100644
--- a/src/qobuz/qobuzservice.cpp
+++ b/src/qobuz/qobuzservice.cpp
@@ -484,7 +484,7 @@ void QobuzService::TryLogin() {
 
 void QobuzService::ResetArtistsRequest() {
 
-  if (artists_request_.get()) {
+  if (artists_request_) {
     QObject::disconnect(artists_request_.get(), nullptr, this, nullptr);
     QObject::disconnect(this, nullptr, artists_request_.get(), nullptr);
     artists_request_.reset();
@@ -539,7 +539,7 @@ void QobuzService::ArtistsUpdateProgressReceived(const int id, const int progres
 
 void QobuzService::ResetAlbumsRequest() {
 
-  if (albums_request_.get()) {
+  if (albums_request_) {
     QObject::disconnect(albums_request_.get(), nullptr, this, nullptr);
     QObject::disconnect(this, nullptr, albums_request_.get(), nullptr);
     albums_request_.reset();
@@ -592,7 +592,7 @@ void QobuzService::AlbumsUpdateProgressReceived(const int id, const int progress
 
 void QobuzService::ResetSongsRequest() {
 
-  if (songs_request_.get()) {
+  if (songs_request_) {
     QObject::disconnect(songs_request_.get(), nullptr, this, nullptr);
     QObject::disconnect(this, nullptr, songs_request_.get(), nullptr);
     songs_request_.reset();
diff --git a/src/subsonic/subsonicservice.cpp b/src/subsonic/subsonicservice.cpp
index 4252f04d..91eb9d95 100644
--- a/src/subsonic/subsonicservice.cpp
+++ b/src/subsonic/subsonicservice.cpp
@@ -393,7 +393,7 @@ void SubsonicService::Scrobble(const QString &song_id, const bool submission, co
     return;
   }
 
-  if (!scrobble_request_.get()) {
+  if (!scrobble_request_) {
     // we're doing requests every 30-240s the whole time, so keep reusing this instance
     scrobble_request_.reset(new SubsonicScrobbleRequest(this, url_handler_, app_, this));
   }
@@ -404,7 +404,7 @@ void SubsonicService::Scrobble(const QString &song_id, const bool submission, co
 
 void SubsonicService::ResetSongsRequest() {
 
-  if (songs_request_.get()) {
+  if (songs_request_) {
     QObject::disconnect(songs_request_.get(), nullptr, this, nullptr);
     QObject::disconnect(this, nullptr, songs_request_.get(), nullptr);
     songs_request_.reset();
diff --git a/src/tidal/tidalservice.cpp b/src/tidal/tidalservice.cpp
index bd587b3e..ab472d3d 100644
--- a/src/tidal/tidalservice.cpp
+++ b/src/tidal/tidalservice.cpp
@@ -720,7 +720,7 @@ void TidalService::TryLogin() {
 
 void TidalService::ResetArtistsRequest() {
 
-  if (artists_request_.get()) {
+  if (artists_request_) {
     QObject::disconnect(artists_request_.get(), nullptr, this, nullptr);
     QObject::disconnect(this, nullptr, artists_request_.get(), nullptr);
     artists_request_.reset();
@@ -779,7 +779,7 @@ void TidalService::ArtistsUpdateProgressReceived(const int id, const int progres
 
 void TidalService::ResetAlbumsRequest() {
 
-  if (albums_request_.get()) {
+  if (albums_request_) {
     QObject::disconnect(albums_request_.get(), nullptr, this, nullptr);
     QObject::disconnect(this, nullptr, albums_request_.get(), nullptr);
     albums_request_.reset();
@@ -836,7 +836,7 @@ void TidalService::AlbumsUpdateProgressReceived(const int id, const int progress
 
 void TidalService::ResetSongsRequest() {
 
-  if (songs_request_.get()) {
+  if (songs_request_) {
     QObject::disconnect(songs_request_.get(), nullptr, this, nullptr);
     QObject::disconnect(this, nullptr, songs_request_.get(), nullptr);
     songs_request_.reset();
diff --git a/tests/src/collectionbackend_test.cpp b/tests/src/collectionbackend_test.cpp
index 846dfde6..b50dda45 100644
--- a/tests/src/collectionbackend_test.cpp
+++ b/tests/src/collectionbackend_test.cpp
@@ -415,7 +415,7 @@ TEST_F(SingleSong, TestUrls) {
     EXPECT_TRUE(new_song.is_valid());
     EXPECT_EQ(new_song.url(), url);
 
-    QSqlDatabase db(database_.get()->Connect());
+    QSqlDatabase db(database_->Connect());
     QSqlQuery q(db);
     q.prepare(QString("SELECT url FROM %1 WHERE url = :url").arg(SCollection::kSongsTable));