diff --git a/src/core/libraries/np/np_matching2.cpp b/src/core/libraries/np/np_matching2.cpp
index 7a0af2dfa..dcd2a9c23 100644
--- a/src/core/libraries/np/np_matching2.cpp
+++ b/src/core/libraries/np/np_matching2.cpp
@@ -5,7 +5,6 @@
 #include <mutex>
 
 #include "common/logging/log.h"
-#include "common/config.h"
 #include "core/emulator_settings.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
diff --git a/src/core/libraries/system/systemservice.cpp b/src/core/libraries/system/systemservice.cpp
index f03c7e7cb..0e40c723f 100644
--- a/src/core/libraries/system/systemservice.cpp
+++ b/src/core/libraries/system/systemservice.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <cstdlib>
-#include "common/config.h"
 #include "common/singleton.h"
 #include "core/emulator_settings.h"
 #include "core/file_sys/fs.h"
diff --git a/src/core/user_manager.cpp b/src/core/user_manager.cpp
index ea80a55e4..73e881e8e 100644
--- a/src/core/user_manager.cpp
+++ b/src/core/user_manager.cpp
@@ -113,7 +113,6 @@ Users UserManager::CreateDefaultUsers() {
             .player_index = 4,
         },
     };
-    default_users.default_user_id = default_users.user[0].user_id;
 
     for (auto& u : default_users.user) {
         const auto user_dir = EmulatorSettings.GetHomeDir() / std::to_string(u.user_id);
@@ -135,7 +134,6 @@ bool UserManager::SetDefaultUser(u32 user_id) {
     if (it == m_users.user.end())
         return false;
 
-    m_users.default_user_id = user_id;
     SetControllerPort(user_id, 1); // Set default user to port 1
     return Save();
 }
diff --git a/src/input/controller.cpp b/src/input/controller.cpp
index a8652b298..ee855e50f 100644
--- a/src/input/controller.cpp
+++ b/src/input/controller.cpp
@@ -415,7 +415,7 @@ u8 GameControllers::GetGamepadIndexFromJoystickId(SDL_JoystickID id) {
             return i;
         }
     }
-    LOG_TRACE(Input, "Gamepad index: {}", index);
+    //LOG_TRACE(Input, "Gamepad index: {}", index);
     return -1;
 }
 
@@ -426,7 +426,7 @@ u8 GameControllers::GetMoveIndexFromJoystickId(SDL_JoystickID id) {
             return i;
         }
     }
-    LOG_TRACE(Input, "Move index: {}", index);
+    //LOG_TRACE(Input, "Move index: {}", index);
     return -1;
 }