diff --git a/src/Application.cpp b/src/Application.cpp
index 33e527f..e83a9dd 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -31,6 +31,9 @@ void Application::Quit()
 	{
 		delete topology;
 
+		lol::ShaderManager::GetInstance().Cleanup();
+		lol::ObjectManager<lol::Texture1D>::GetInstance().Cleanup();
+
 		glfwDestroyWindow(window);
 		window = nullptr;
 	}
diff --git a/src/Topology.cpp b/src/Topology.cpp
index a4d95cf..ebb0bf4 100644
--- a/src/Topology.cpp
+++ b/src/Topology.cpp
@@ -119,8 +119,8 @@ Topology::Topology(const glm::vec2& size, const glm::uvec2& subdivisions) :
 
 Topology::~Topology()
 {
-	lol::ShaderManager::GetInstance().Cleanup();
-	lol::ObjectManager<lol::Texture1D>::GetInstance().Cleanup();
+	lol::ShaderManager::GetInstance().CleanupUnused();
+	lol::ObjectManager<lol::Texture1D>::GetInstance().CleanupUnused();
 
 	if (texture != nullptr)
 		delete texture;
diff --git a/vendor/lol b/vendor/lol
index 48d2dbc..e23d221 160000
--- a/vendor/lol
+++ b/vendor/lol
@@ -1 +1 @@
-Subproject commit 48d2dbcb7e2c126b67c2fabd82567cbbb89e1c22
+Subproject commit e23d22153c88822a2a15e798ad2643fdcbdf6dc3