diff --git a/borders-plus-plus/main.cpp b/borders-plus-plus/main.cpp
index 4f68303..bd2f30b 100644
--- a/borders-plus-plus/main.cpp
+++ b/borders-plus-plus/main.cpp
@@ -6,6 +6,7 @@
 #include <hyprland/src/Compositor.hpp>
 #include <hyprland/src/desktop/Window.hpp>
 #include <hyprland/src/config/ConfigManager.hpp>
+#include <hyprland/src/render/Renderer.hpp>
 
 #include "borderDeco.hpp"
 #include "globals.hpp"
@@ -59,5 +60,5 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
 }
 
 APICALL EXPORT void PLUGIN_EXIT() {
-    ;
+    g_pHyprRenderer->m_sRenderPass.removeAllOfType("CBorderPPPassElement");
 }
diff --git a/hyprbars/main.cpp b/hyprbars/main.cpp
index 9ef2565..a340a06 100644
--- a/hyprbars/main.cpp
+++ b/hyprbars/main.cpp
@@ -6,6 +6,7 @@
 #include <hyprland/src/Compositor.hpp>
 #include <hyprland/src/desktop/Window.hpp>
 #include <hyprland/src/config/ConfigManager.hpp>
+#include <hyprland/src/render/Renderer.hpp>
 
 #include "barDeco.hpp"
 #include "globals.hpp"
@@ -141,4 +142,6 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
 APICALL EXPORT void PLUGIN_EXIT() {
     for (auto& m : g_pCompositor->m_vMonitors)
         m->scheduledRecalc = true;
+    
+    g_pHyprRenderer->m_sRenderPass.removeAllOfType("CBarPassElement");
 }
diff --git a/hyprexpo/main.cpp b/hyprexpo/main.cpp
index b509055..b11678b 100644
--- a/hyprexpo/main.cpp
+++ b/hyprexpo/main.cpp
@@ -6,6 +6,7 @@
 #include <hyprland/src/desktop/Window.hpp>
 #include <hyprland/src/config/ConfigManager.hpp>
 #include <hyprland/src/desktop/DesktopTypes.hpp>
+#include <hyprland/src/render/Renderer.hpp>
 
 #include "globals.hpp"
 #include "overview.hpp"
@@ -229,5 +230,5 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
 }
 
 APICALL EXPORT void PLUGIN_EXIT() {
-    ;
+    g_pHyprRenderer->m_sRenderPass.removeAllOfType("COverviewPassElement");
 }
diff --git a/hyprtrails/main.cpp b/hyprtrails/main.cpp
index f984e5c..83eab9e 100644
--- a/hyprtrails/main.cpp
+++ b/hyprtrails/main.cpp
@@ -7,6 +7,7 @@
 #include <hyprland/src/desktop/Window.hpp>
 #include <hyprland/src/config/ConfigManager.hpp>
 #include <hyprland/src/render/Shaders.hpp>
+#include <hyprland/src/render/Renderer.hpp>
 
 #include "globals.hpp"
 #include "shaders.hpp"
@@ -135,4 +136,5 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
 
 APICALL EXPORT void PLUGIN_EXIT() {
     wl_event_source_remove(g_pGlobalState->tick);
+    g_pHyprRenderer->m_sRenderPass.removeAllOfType("CTrailPassElement");
 }