diff --git a/graphics/glfw/src/main/java/module-info.java b/graphics/glfw/src/main/java/module-info.java
index b49b57cb..b73ab171 100644
--- a/graphics/glfw/src/main/java/module-info.java
+++ b/graphics/glfw/src/main/java/module-info.java
@@ -12,12 +12,10 @@ module sosengine.graphics.glfw.main {
     // API access
     exports de.staropensource.sosengine.graphics.glfw;
     exports de.staropensource.sosengine.graphics.glfw.classes;
-    exports de.staropensource.sosengine.graphics.glfw.events;
     exports de.staropensource.sosengine.graphics.glfw.exceptions;
 
     // Reflection access
     opens de.staropensource.sosengine.graphics.glfw;
     opens de.staropensource.sosengine.graphics.glfw.classes;
-    opens de.staropensource.sosengine.graphics.glfw.events;
     opens de.staropensource.sosengine.graphics.glfw.exceptions;
 }
diff --git a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java
index 4301de55..e5c02310 100644
--- a/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java
+++ b/graphics/opengl/src/main/java/de/staropensource/sosengine/graphics/opengl/OpenGlSubsystem.java
@@ -21,7 +21,6 @@ package de.staropensource.sosengine.graphics.opengl;
 
 import de.staropensource.sosengine.base.annotations.EngineSubsystem;
 import de.staropensource.sosengine.base.annotations.EventListener;
-import de.staropensource.sosengine.base.classes.helpers.EventHelper;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
 import de.staropensource.sosengine.base.data.versioning.StarOpenSourceVersioningSystem;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
@@ -34,8 +33,8 @@ import de.staropensource.sosengine.graphics.classes.ApiInternalClass;
 import de.staropensource.sosengine.graphics.classes.ApiMainClass;
 import de.staropensource.sosengine.graphics.classes.ApiManagementClass;
 import de.staropensource.sosengine.graphics.events.GraphicsApiErrorEvent;
+import de.staropensource.sosengine.graphics.events.GraphicsErrorEvent;
 import de.staropensource.sosengine.graphics.glfw.GlfwSubsystem;
-import de.staropensource.sosengine.graphics.glfw.events.GraphicsErrorEvent;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.system.MemoryUtil;
@@ -122,9 +121,6 @@ public final class OpenGlSubsystem implements ApiMainClass {
     /** {@inheritDoc} */
     @Override
     public void initializeSubsystem() {
-        // Precompute event listeners
-        EventHelper.precomputeEventListeners(GraphicsErrorEvent.class);
-
         // Register Graphics API
         GraphicsSubsystem.getInstance().registerGraphicsApi(this);
     }