diff --git a/source/ApplicationState.cpp b/source/ApplicationState.cpp
index c43fc4a..a9d202a 100644
--- a/source/ApplicationState.cpp
+++ b/source/ApplicationState.cpp
@@ -848,7 +848,6 @@ void ApplicationState::dumpAppFiles() {
                 contentI++;
             }
             if (forceExit) {
-                exit(0);
                 break;
             }
         }
diff --git a/source/WUD/DefaultNUSDataProcessor.cpp b/source/WUD/DefaultNUSDataProcessor.cpp
index 9ec0f66..a1d495f 100644
--- a/source/WUD/DefaultNUSDataProcessor.cpp
+++ b/source/WUD/DefaultNUSDataProcessor.cpp
@@ -56,5 +56,4 @@ DefaultNUSDataProcessor::DefaultNUSDataProcessor(
         std::shared_ptr<NUSDecryption> pNUSDecryption) :
         dataProvider(std::move(pDataProvider)),
         nusDecryption(std::move(pNUSDecryption)) {
-    DEBUG_FUNCTION_LINE();
 }
diff --git a/source/WUD/DiscReaderDiscDrive.cpp b/source/WUD/DiscReaderDiscDrive.cpp
index 07e8983..ef15a5f 100644
--- a/source/WUD/DiscReaderDiscDrive.cpp
+++ b/source/WUD/DiscReaderDiscDrive.cpp
@@ -24,7 +24,6 @@
 
 
 DiscReaderDiscDrive::DiscReaderDiscDrive() : DiscReader() {
-    DEBUG_FUNCTION_LINE();
     auto *sector_buf = (uint8_t *) malloc(READ_SECTOR_SIZE);
     if (sector_buf == nullptr) {
         return;
@@ -76,7 +75,6 @@ bool DiscReaderDiscDrive::IsReady() {
 }
 
 DiscReaderDiscDrive::~DiscReaderDiscDrive() {
-    DEBUG_FUNCTION_LINE();
     if (device_handle != -1) {
         IOSUHAX_FSA_RawOpen(gFSAfd, "/dev/odd01", &device_handle);
     }
diff --git a/source/WUD/NUSDataProviderWUD.cpp b/source/WUD/NUSDataProviderWUD.cpp
index 81a81ea..3bb9d00 100644
--- a/source/WUD/NUSDataProviderWUD.cpp
+++ b/source/WUD/NUSDataProviderWUD.cpp
@@ -17,14 +17,11 @@
 #include "NUSDataProviderWUD.h"
 
 NUSDataProviderWUD::NUSDataProviderWUD(const std::shared_ptr<WiiUGMPartition> &pGamePartition, const std::shared_ptr<DiscReader> &pDiscReader) {
-    DEBUG_FUNCTION_LINE();
     gamePartition = pGamePartition;
     discReader = pDiscReader;
 }
 
-NUSDataProviderWUD::~NUSDataProviderWUD() {
-    DEBUG_FUNCTION_LINE();
-}
+NUSDataProviderWUD::~NUSDataProviderWUD() = default;
 
 bool NUSDataProviderWUD::readRawContent(const std::shared_ptr<Content> &content, uint8_t *buffer, uint64_t offset, uint32_t size) {
     if (buffer == nullptr) {
@@ -41,7 +38,6 @@ bool NUSDataProviderWUD::readRawContent(const std::shared_ptr<Content> &content,
 bool NUSDataProviderWUD::getContentH3Hash(const std::shared_ptr<Content> &content, std::vector<uint8_t> &out_data) {
     auto cur = gamePartition->getVolumes().begin()->second->h3HashArrayList[content->index];
     if (cur == nullptr || cur->size == 0) {
-        DEBUG_FUNCTION_LINE();
         return false;
     }
     out_data.resize(cur->size);
diff --git a/source/WUD/NUSDecryption.cpp b/source/WUD/NUSDecryption.cpp
index 83b772b..5abf879 100644
--- a/source/WUD/NUSDecryption.cpp
+++ b/source/WUD/NUSDecryption.cpp
@@ -25,5 +25,4 @@ void NUSDecryption::decryptData(const std::array<uint8_t, 0x10> &IV, uint8_t *in
 }
 
 NUSDecryption::NUSDecryption(std::shared_ptr<Ticket> pTicket) : ticket(std::move(pTicket)) {
-    DEBUG_FUNCTION_LINE();
 }
\ No newline at end of file
diff --git a/source/WUD/NUSTitle.cpp b/source/WUD/NUSTitle.cpp
index fc45306..07ceb8f 100644
--- a/source/WUD/NUSTitle.cpp
+++ b/source/WUD/NUSTitle.cpp
@@ -61,7 +61,7 @@ std::optional<std::shared_ptr<NUSTitle>> NUSTitle::loadTitle(const std::shared_p
     auto fstOpt = FST::make_shared(dataBuffer, 0, VolumeBlockSize(1));
 
     if (!fstOpt.has_value()) {
-        DEBUG_FUNCTION_LINE();
+        DEBUG_FUNCTION_LINE("Failed to parse FST");
         return {};
     }
 
@@ -89,7 +89,6 @@ NUSTitle::NUSTitle(std::shared_ptr<TitleMetaData> pTMD,
 
 std::optional<std::shared_ptr<NUSTitle>>
 NUSTitle::loadTitleFromGMPartition(const std::shared_ptr<WiiUGMPartition> &pPartition, const std::shared_ptr<DiscReader> &pDrive, const std::array<uint8_t, 16> &commonKey) {
-    DEBUG_FUNCTION_LINE();
     return loadTitle(std::shared_ptr<NUSDataProvider>(new NUSDataProviderWUD(pPartition, pDrive)), commonKey);
 }
 
diff --git a/source/WUD/Ticket.cpp b/source/WUD/Ticket.cpp
index 4877558..f6f1022 100644
--- a/source/WUD/Ticket.cpp
+++ b/source/WUD/Ticket.cpp
@@ -21,8 +21,6 @@
 Ticket::Ticket(const std::array<uint8_t, 16> &pEncryptedKey, const std::array<uint8_t, 16> &pDecryptedKey) :
         ticketKeyEnc(pEncryptedKey),
         ticketKeyDec(pDecryptedKey) {
-    DEBUG_FUNCTION_LINE();
-
 }
 
 std::optional<std::shared_ptr<Ticket>> Ticket::make_shared(const std::vector<uint8_t> &data, std::optional<const std::array<uint8_t, 16>> commonKey) {
diff --git a/source/WUD/content/partitions/WiiUPartitions.cpp b/source/WUD/content/partitions/WiiUPartitions.cpp
index b234ee3..62375e1 100644
--- a/source/WUD/content/partitions/WiiUPartitions.cpp
+++ b/source/WUD/content/partitions/WiiUPartitions.cpp
@@ -189,6 +189,5 @@ WiiUPartitions::make_unique(const std::shared_ptr<DiscReader> &discReader, uint3
 }
 
 WiiUPartitions::WiiUPartitions(std::vector<std::shared_ptr<WiiUPartition>> pPartitions) : partitions(std::move(pPartitions)) {
-    DEBUG_FUNCTION_LINE();
 }
 
diff --git a/source/WUD/content/partitions/volumes/VolumeHeader.cpp b/source/WUD/content/partitions/volumes/VolumeHeader.cpp
index 43deb62..642d1a3 100644
--- a/source/WUD/content/partitions/volumes/VolumeHeader.cpp
+++ b/source/WUD/content/partitions/volumes/VolumeHeader.cpp
@@ -76,8 +76,6 @@ std::optional<std::shared_ptr<VolumeHeader>> VolumeHeader::make_shared(const std
     auto minorVersion = buffer[39];
     auto expiringMajorVersion = buffer[40];
 
-    DEBUG_FUNCTION_LINE("FSTSize: %08X", FSTSize);
-
     free(buffer);
 
     auto bufferH3 = (uint8_t *) malloc(ROUNDUP(h3HashArrayListSize, 16));
diff --git a/source/WUD/entities/FST/nodeentry/NodeEntries.h b/source/WUD/entities/FST/nodeentry/NodeEntries.h
index 509077d..327297b 100644
--- a/source/WUD/entities/FST/nodeentry/NodeEntries.h
+++ b/source/WUD/entities/FST/nodeentry/NodeEntries.h
@@ -29,11 +29,6 @@
 class NodeEntries {
 
 public:
-
-    virtual ~NodeEntries() {
-        DEBUG_FUNCTION_LINE("Bye");
-    }
-
     static std::optional<std::shared_ptr<NodeEntry>>
     DeserializeImpl(const std::vector<uint8_t> &data,
                     uint32_t offset,
diff --git a/source/WUD/header/WiiUDiscHeader.cpp b/source/WUD/header/WiiUDiscHeader.cpp
index 1b626b9..c288338 100644
--- a/source/WUD/header/WiiUDiscHeader.cpp
+++ b/source/WUD/header/WiiUDiscHeader.cpp
@@ -58,7 +58,6 @@ std::optional<std::unique_ptr<WiiUDiscHeader>> WiiUDiscHeader::make_unique(const
         DEBUG_FUNCTION_LINE("Unexpected offset");
         return {};
     }
-    DEBUG_FUNCTION_LINE();
     return std::unique_ptr<WiiUDiscHeader>(new WiiUDiscHeader(
             std::move(manufactorDiscIDOpt.value()),
             std::move(discIdOpt.value()),
diff --git a/source/input/VPADInput.h b/source/input/VPADInput.h
index 6ac73cf..93bbf2b 100644
--- a/source/input/VPADInput.h
+++ b/source/input/VPADInput.h
@@ -27,7 +27,7 @@ public:
     }
 
     //!Destructor
-    ~VPadInput() override {}
+    ~VPadInput() override = default;
 
     bool update(int32_t width, int32_t height) {
         lastData = data;
diff --git a/source/main.cpp b/source/main.cpp
index 9f65c43..84d6999 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -66,10 +66,7 @@ void main_loop() {
     ApplicationState state;
     VPadInput input;
 
-    DEBUG_FUNCTION_LINE();
-
     if (gFSAfd < 0 || !sIosuhaxMount) {
-        DEBUG_FUNCTION_LINE();
         state.setError(ApplicationState::eErrorState::ERROR_IOSUHAX_FAILED);
     }
 
@@ -79,7 +76,6 @@ void main_loop() {
         state.update(&input);
         state.render();
     }
-    exit(0);
 }
 
 void initIOSUHax() {