diff --git a/src/beauty/beauty-demo.cpp b/src/beauty/beauty-demo.cpp
index ce93d29e1..39ddb787b 100644
--- a/src/beauty/beauty-demo.cpp
+++ b/src/beauty/beauty-demo.cpp
@@ -290,5 +290,7 @@ int main(int argc, char **argv) {
         app::print_fps();
     }
 
+    app::terminate();
+
     return 0;
 }
diff --git a/src/common/subsystems.hpp b/src/common/subsystems.hpp
index 2491278f2..4761bcda3 100644
--- a/src/common/subsystems.hpp
+++ b/src/common/subsystems.hpp
@@ -226,18 +226,6 @@ void error_callback(int error, const char *description) {
     fprintf(stderr, "Error: %s\n", description);
 }
 
-//EGLContext get_egl_display() {
-//    return glfwGetEGLDisplay();
-//}
-//
-//EGLContext get_egl_context() {
-//    return glfwGetEGLContext(window);
-//}
-//
-//EGLSurface get_egl_surface() {
-//    return glfwGetEGLSurface(window);
-//}
-
 void init(const string &title, int major = 4, int minor = 6) {
     assert(glfwInit());
     glfwSetErrorCallback(error_callback);
diff --git a/src/font/font-demo.cpp b/src/font/font-demo.cpp
index f548170f2..ba74c1774 100644
--- a/src/font/font-demo.cpp
+++ b/src/font/font-demo.cpp
@@ -175,5 +175,7 @@ int main(int argc, char **argv) {
         app::print_fps();
     }
 
+    app::terminate();
+
     return 0;
 }
diff --git a/src/nanovg/nanovg-demo.cpp b/src/nanovg/nanovg-demo.cpp
index e3e47885d..1cace2397 100644
--- a/src/nanovg/nanovg-demo.cpp
+++ b/src/nanovg/nanovg-demo.cpp
@@ -221,5 +221,7 @@ int main(int argc, char **argv) {
         app::print_fps();
     }
 
+    app::terminate();
+
     return 0;
 }
diff --git a/src/optflow/optflow-demo.cpp b/src/optflow/optflow-demo.cpp
index 7fe9f9cab..932d81636 100644
--- a/src/optflow/optflow-demo.cpp
+++ b/src/optflow/optflow-demo.cpp
@@ -257,5 +257,7 @@ int main(int argc, char **argv) {
         app::print_fps();
     }
 
+    app::terminate();
+
     return 0;
 }
diff --git a/src/pedestrian/pedestrian-demo.cpp b/src/pedestrian/pedestrian-demo.cpp
index b0eb25acc..b62669fe7 100644
--- a/src/pedestrian/pedestrian-demo.cpp
+++ b/src/pedestrian/pedestrian-demo.cpp
@@ -211,5 +211,7 @@ int main(int argc, char **argv) {
         app::print_fps();
     }
 
+    app::terminate();
+
     return 0;
 }
diff --git a/src/tetra/tetra-demo.cpp b/src/tetra/tetra-demo.cpp
index bc427831b..73bd3e8c2 100644
--- a/src/tetra/tetra-demo.cpp
+++ b/src/tetra/tetra-demo.cpp
@@ -133,5 +133,7 @@ int main(int argc, char **argv) {
         app::print_fps();
     }
 
+    app::terminate();
+
     return 0;
 }
diff --git a/src/video/video-demo.cpp b/src/video/video-demo.cpp
index 0f0e3a014..c37a3be25 100644
--- a/src/video/video-demo.cpp
+++ b/src/video/video-demo.cpp
@@ -171,5 +171,7 @@ int main(int argc, char **argv) {
         app::print_fps();
     }
 
+    app::terminate();
+
     return 0;
 }