diff --git a/include/libultraship/classes.h b/include/libultraship/classes.h
index d4e51ff4e..1599a7d94 100644
--- a/include/libultraship/classes.h
+++ b/include/libultraship/classes.h
@@ -31,9 +31,7 @@
 #include "utils/binarytools/BinaryWriter.h"
 #include "audio/Audio.h"
 #include "audio/AudioPlayer.h"
-#if defined(__linux__) || defined(__BSD__)
-#include "audio/PulseAudioPlayer.h"
-#elif defined(_WIN32)
+#if defined(_WIN32)
 #include "audio/WasapiAudioPlayer.h"
 #endif
 #include "audio/SDLAudioPlayer.h"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index de362932b..bf0e31345 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,16 +29,11 @@ set(Source_Files__Audio
 	${CMAKE_CURRENT_SOURCE_DIR}/audio/AudioPlayer.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/audio/SDLAudioPlayer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/audio/SDLAudioPlayer.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/audio/PulseAudioPlayer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/audio/PulseAudioPlayer.cpp
 )
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     list(APPEND Source_Files__Audio ${CMAKE_CURRENT_SOURCE_DIR}/audio/WasapiAudioPlayer.h)
     list(APPEND Source_Files__Audio ${CMAKE_CURRENT_SOURCE_DIR}/audio/WasapiAudioPlayer.cpp)
-elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    list(APPEND Source_Files__Audio ${CMAKE_CURRENT_SOURCE_DIR}/audio/PulseAudioPlayer.h)
-    list(APPEND Source_Files__Audio ${CMAKE_CURRENT_SOURCE_DIR}/audio/PulseAudioPlayer.cpp)
 endif()
 
 source_group("audio" FILES ${Source_Files__Audio})
@@ -127,7 +122,7 @@ set(Source_Files__Log
     ${CMAKE_CURRENT_SOURCE_DIR}/log/luslog.cpp
 )
 
-source_group("Log" FILES ${Source_Files__Log})
+source_group("log" FILES ${Source_Files__Log})
 
 target_sources(libultraship PRIVATE ${Source_Files__Log} ${Source_Files__Log__SPDLog})
 
diff --git a/src/audio/Audio.cpp b/src/audio/Audio.cpp
index 64fa82619..9fad4aff9 100644
--- a/src/audio/Audio.cpp
+++ b/src/audio/Audio.cpp
@@ -16,11 +16,6 @@ void Audio::InitAudioPlayer() {
         case AudioBackend::WASAPI:
             mAudioPlayer = std::make_shared<WasapiAudioPlayer>();
             break;
-#endif
-#if defined(__linux)
-        case AudioBackend::PULSE:
-            mAudioPlayer = std::make_shared<PulseAudioPlayer>();
-            break;
 #endif
         default:
             mAudioPlayer = std::make_shared<SDLAudioPlayer>();
diff --git a/src/audio/AudioPlayer.h b/src/audio/AudioPlayer.h
index d9d9f8e12..bab6e1c77 100644
--- a/src/audio/AudioPlayer.h
+++ b/src/audio/AudioPlayer.h
@@ -31,8 +31,6 @@ class AudioPlayer {
 
 #ifdef _WIN32
 #include "WasapiAudioPlayer.h"
-#elif defined(__linux)
-#include "PulseAudioPlayer.h"
 #endif
 
 #include "SDLAudioPlayer.h"
diff --git a/src/audio/PulseAudioPlayer.cpp b/src/audio/PulseAudioPlayer.cpp
deleted file mode 100644
index 5ebc291c8..000000000
--- a/src/audio/PulseAudioPlayer.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#if defined(__linux__) || defined(__BSD__)
-
-#include "PulseAudioPlayer.h"
-#include "Context.h"
-#include <spdlog/spdlog.h>
-
-namespace LUS {
-static void PasContextStateCb(pa_context* c, void* userData) {
-    switch (pa_context_get_state(c)) {
-        case PA_CONTEXT_READY:
-        case PA_CONTEXT_TERMINATED:
-        case PA_CONTEXT_FAILED:
-            *(bool*)userData = true;
-            break;
-        default:
-            break;
-    }
-}
-
-static void PasStreamStateCb(pa_stream* s, void* userData) {
-    switch (pa_stream_get_state(s)) {
-        case PA_STREAM_READY:
-        case PA_STREAM_FAILED:
-        case PA_STREAM_TERMINATED:
-            *(bool*)userData = true;
-            break;
-        default:
-            break;
-    }
-}
-
-static void PasStreamWriteCb(pa_stream* s, size_t length, void* userData) {
-}
-
-static void PasUpdateComplete(pa_stream* stream, int success, void* userData) {
-    *(bool*)userData = true;
-}
-
-static void PasWriteComplete(void* userData) {
-    *(bool*)userData = true;
-}
-
-PulseAudioPlayer::PulseAudioPlayer() : AudioPlayer() {
-}
-
-bool PulseAudioPlayer::DoInit() {
-    bool done = false;
-    const pa_buffer_attr* appliedAttr = nullptr;
-
-    // Create mainloop
-    mMainLoop = pa_mainloop_new();
-    if (mMainLoop == NULL) {
-        return false;
-    }
-
-    // Create context and connect
-    mContext =
-        pa_context_new(pa_mainloop_get_api(mMainLoop), ("libultraship - " + Context::GetInstance()->GetName()).c_str());
-    if (mContext == NULL) {
-        goto fail;
-    }
-
-    pa_context_set_state_callback(mContext, PasContextStateCb, &done);
-
-    if (pa_context_connect(mContext, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0) {
-        goto fail;
-    }
-
-    while (!done) {
-        pa_mainloop_iterate(mMainLoop, true, NULL);
-    }
-    pa_context_set_state_callback(mContext, NULL, NULL);
-    if (pa_context_get_state(mContext) != PA_CONTEXT_READY) {
-        goto fail;
-    }
-
-    // Create stream
-    pa_sample_spec ss;
-    ss.format = PA_SAMPLE_S16LE;
-    ss.rate = this->GetSampleRate();
-    ss.channels = 2;
-
-#define SAMPLES_HIGH 752
-#define SAMPLES_LOW 720
-
-    pa_buffer_attr attr;
-    // set the max length to the desired buffered level, plus
-    // 3x the high sample rate, which is what the n64 audio engine
-    // can output at one time, x2 to avoid overflow in case of the
-    // n64 audio engine running faster than pulseaudio, all multiplied
-    // by 4 because each sample is 4 bytes
-    attr.maxlength = (GetDesiredBuffered() + 3 * SAMPLES_HIGH * 2) * 4;
-
-    // slightly more than one double audio update
-    attr.prebuf = SAMPLES_HIGH * 3 * 1.5 * 4;
-
-    attr.minreq = 222 * 4;
-    attr.tlength = (GetSampleRate() / 20) * 4;
-
-    // initialize to a value that is deemed sensible by the server
-    attr.fragsize = (uint32_t)-1;
-
-    mStream = pa_stream_new(mContext, "zelda", &ss, NULL);
-    if (mStream == NULL) {
-        goto fail;
-    }
-
-    done = false;
-    pa_stream_set_state_callback(mStream, PasStreamStateCb, &done);
-    pa_stream_set_write_callback(mStream, PasStreamWriteCb, NULL);
-    if (pa_stream_connect_playback(mStream, NULL, &attr, PA_STREAM_ADJUST_LATENCY, NULL, NULL) < 0) {
-        goto fail;
-    }
-
-    while (!done) {
-        pa_mainloop_iterate(mMainLoop, true, NULL);
-    }
-    pa_stream_set_state_callback(mStream, NULL, NULL);
-    if (pa_stream_get_state(mStream) != PA_STREAM_READY) {
-        goto fail;
-    }
-
-    appliedAttr = pa_stream_get_buffer_attr(mStream);
-    SPDLOG_TRACE("maxlength: {}\ntlength: {}\nprebuf: {}\nminreq: {}\nfragsize: {}\n", appliedAttr->maxlength,
-                 appliedAttr->tlength, appliedAttr->prebuf, appliedAttr->minreq, appliedAttr->fragsize);
-    mAttr = *appliedAttr;
-
-    return true;
-
-fail:
-    if (mStream != NULL) {
-        pa_stream_unref(mStream);
-        mStream = NULL;
-    }
-    if (mContext != NULL) {
-        pa_context_disconnect(mContext);
-        pa_context_unref(mContext);
-        mContext = NULL;
-    }
-    if (mMainLoop != NULL) {
-        pa_mainloop_free(mMainLoop);
-        mMainLoop = NULL;
-    }
-
-    SPDLOG_ERROR("Failed to initialize PulseAudio stream!");
-    return false;
-}
-
-int PulseAudioPlayer::Buffered() {
-    if (mStream == NULL) {
-        return 0;
-    }
-
-    bool done = false;
-    pa_stream_update_timing_info(mStream, PasUpdateComplete, &done);
-    while (!done) {
-        pa_mainloop_iterate(mMainLoop, true, NULL);
-    }
-
-    const pa_timing_info* info = pa_stream_get_timing_info(mStream);
-    if (info == NULL) {
-        SPDLOG_ERROR("pa_stream_get_timing_info failed, state is %d\n", pa_stream_get_state(mStream));
-    }
-    return (info->write_index - info->read_index) / 4;
-}
-
-int PulseAudioPlayer::GetDesiredBuffered() {
-    return 2480;
-}
-
-void PulseAudioPlayer::Play(const uint8_t* buff, size_t len) {
-    if (mStream == NULL || mContext == NULL || mMainLoop == NULL) {
-        return;
-    }
-
-    size_t ws = mAttr.maxlength - Buffered() * 4;
-    if (ws < len) {
-        len = ws;
-    }
-    if (pa_stream_write_ext_free(mStream, buff, len, PasWriteComplete, &mWriteComplete, 0LL, PA_SEEK_RELATIVE) < 0) {
-        SPDLOG_ERROR("pa_stream_write failed");
-        return;
-    }
-    while (!mWriteComplete) {
-        pa_mainloop_iterate(mMainLoop, true, NULL);
-    }
-    mWriteComplete = false;
-}
-} // namespace LUS
-
-#endif
diff --git a/src/audio/PulseAudioPlayer.h b/src/audio/PulseAudioPlayer.h
deleted file mode 100644
index 0870a7e41..000000000
--- a/src/audio/PulseAudioPlayer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#if defined(__linux__) || defined(__BSD__)
-
-#include "AudioPlayer.h"
-#include <pulse/pulseaudio.h>
-
-namespace LUS {
-class PulseAudioPlayer : public AudioPlayer {
-  public:
-    PulseAudioPlayer();
-
-    int Buffered() override;
-    int GetDesiredBuffered() override;
-    void Play(const uint8_t* buff, size_t len) override;
-
-  protected:
-    bool DoInit() override;
-
-  private:
-    pa_context* mContext = nullptr;
-    pa_stream* mStream = nullptr;
-    pa_mainloop* mMainLoop = nullptr;
-    bool mWriteComplete = false;
-    pa_buffer_attr mAttr = { 0 };
-};
-} // namespace LUS
-#endif
diff --git a/src/config/Config.cpp b/src/config/Config.cpp
index 2952b5155..e6072e856 100644
--- a/src/config/Config.cpp
+++ b/src/config/Config.cpp
@@ -178,8 +178,10 @@ AudioBackend Config::GetAudioBackend() {
         return AudioBackend::WASAPI;
     }
 
+    // Migrate pulse player in config to sdl
     if (backendName == "pulse") {
-        return AudioBackend::PULSE;
+        SetAudioBackend(AudioBackend::SDL);
+        return AudioBackend::SDL;
     }
 
     if (backendName == "sdl") {
@@ -190,8 +192,6 @@ AudioBackend Config::GetAudioBackend() {
                  backendName);
 #ifdef _WIN32
     return AudioBackend::WASAPI;
-#elif defined(__linux)
-    return AudioBackend::PULSE;
 #endif
 
     return AudioBackend::SDL;
@@ -202,9 +202,6 @@ void Config::SetAudioBackend(AudioBackend backend) {
         case AudioBackend::WASAPI:
             SetString("Window.AudioBackend", "wasapi");
             break;
-        case AudioBackend::PULSE:
-            SetString("Window.AudioBackend", "pulse");
-            break;
         case AudioBackend::SDL:
             SetString("Window.AudioBackend", "sdl");
             break;