diff --git a/src/artistmodel.cpp b/src/artistmodel.cpp
index 51437831..55493725 100644
--- a/src/artistmodel.cpp
+++ b/src/artistmodel.cpp
@@ -6,8 +6,6 @@
 
 #include <asyncytmusic.h>
 
-#include <QDebug>
-
 ArtistModel::ArtistModel(QObject *parent)
     : QAbstractListModel(parent)
 {
diff --git a/src/asyncytmusic.cpp b/src/asyncytmusic.cpp
index 482fac5f..ef2bcc7c 100644
--- a/src/asyncytmusic.cpp
+++ b/src/asyncytmusic.cpp
@@ -5,7 +5,6 @@
 #include "asyncytmusic.h"
 
 #include <QThread>
-#include <exception>
 #include <QDebug>
 
 #include <pybind11/embed.h>
diff --git a/src/errorhandler.cpp b/src/errorhandler.cpp
index fbd4d5b4..ecf0180a 100644
--- a/src/errorhandler.cpp
+++ b/src/errorhandler.cpp
@@ -4,8 +4,6 @@
 
 #include "errorhandler.h"
 
-#include <QDebug>
-
 ErrorHandler::ErrorHandler(QObject *parent)
     : QObject(parent)
 {
diff --git a/src/playlistutils.cpp b/src/playlistutils.cpp
index 3d74b29f..3c334fb7 100644
--- a/src/playlistutils.cpp
+++ b/src/playlistutils.cpp
@@ -12,7 +12,7 @@
 
 QString PlaylistUtils::artistsToString(const std::vector<meta::Artist> &artists)
 {
-    if (artists.size() > 0) {
+    if (!artists.empty()) {
         return std::accumulate(artists.begin() + 1, artists.end(),
                                QString::fromStdString(artists.front().name),
                                [](QString &string, const meta::Artist &artist) {
diff --git a/src/searchmodel.cpp b/src/searchmodel.cpp
index 798dbf77..49d6510a 100644
--- a/src/searchmodel.cpp
+++ b/src/searchmodel.cpp
@@ -4,8 +4,6 @@
 
 #include "searchmodel.h"
 
-#include <QDebug>
-
 SearchModel::SearchModel(QObject *parent)
     : QAbstractListModel(parent)
 {
diff --git a/src/userplaylistmodel.cpp b/src/userplaylistmodel.cpp
index 23220fcf..2c2876eb 100644
--- a/src/userplaylistmodel.cpp
+++ b/src/userplaylistmodel.cpp
@@ -56,9 +56,8 @@ QVariant UserPlaylistModel::data(const QModelIndex &index, int role) const
         return QString::fromStdString(m_playlist.tracks[index.row()].title);
     case VideoId:
         return QString::fromStdString(m_playlist.tracks[index.row()].video_id);
-    case Artists: {
+    case Artists:
         return PlaylistUtils::artistsToString(m_playlist.tracks[index.row()].artists);
-    }
     case IsCurrent:
         return m_playlist.tracks[index.row()].video_id == m_currentVideoId.toStdString();
     }
diff --git a/src/videoinfoextractor.cpp b/src/videoinfoextractor.cpp
index 7f2fbd34..ec0629f6 100644
--- a/src/videoinfoextractor.cpp
+++ b/src/videoinfoextractor.cpp
@@ -6,8 +6,6 @@
 
 #include <asyncytmusic.h>
 
-#include <QDebug>
-
 VideoInfoExtractor::VideoInfoExtractor(QObject *parent)
     : QObject(parent)
 {