diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/Shader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/Shader.kt
index 1b9e289de..6103dca20 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/Shader.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/Shader.kt
@@ -28,7 +28,6 @@ import kotlin.math.max
 interface Shader {
     val loaded: Boolean
     val renderWindow: RenderWindow
-    val uniforms: Set<String>
     val defines: MutableMap<String, Any>
 
     val log: String
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/code/glsl/GLSLShaderCode.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/code/glsl/GLSLShaderCode.kt
index f9e57f8b7..9d9b2b103 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/code/glsl/GLSLShaderCode.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/code/glsl/GLSLShaderCode.kt
@@ -24,23 +24,8 @@ class GLSLShaderCode(
     private val rawCode: String,
 ) {
     val defines: MutableMap<String, Any> = mutableMapOf()
-    val uniforms: MutableSet<String> = mutableSetOf()
 
     init {
-        // ToDo: This is complete trash and should be replaced
-
-        for (line in rawCode.lines()) {
-            if (!line.startsWith("uniform ")) {
-                continue
-            }
-            val reader = GLSLStringReader(line.removePrefix("uniform "))
-            reader.skipWhitespaces()
-            reader.readUnquotedString() // data type
-            reader.skipWhitespaces()
-
-            uniforms += reader.readWord() ?: continue
-        }
-
         for ((name, value) in Shader.DEFAULT_DEFINES) {
             value(renderWindow)?.let { defines[name] = it }
         }
@@ -70,7 +55,6 @@ class GLSLShaderCode(
                         val include = ResourceLocation(reader.readString()!!)
 
                         val includeCode = GLSLShaderCode(renderWindow, renderWindow.connection.assetsManager[ResourceLocation(include.namespace, "rendering/shader/includes/${include.path}.glsl")].readAsString())
-                        this.uniforms += includeCode.uniforms
 
                         code.append('\n')
                         code.append(includeCode.code)
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt
index 99a5e83a5..72160f625 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt
@@ -41,8 +41,6 @@ class OpenGLShader(
         private set
     override val defines: MutableMap<String, Any> = mutableMapOf()
     private var shader = -1
-    override var uniforms: MutableSet<String> = mutableSetOf()
-        private set
     private val uniformLocations: Object2IntOpenHashMap<String> = Object2IntOpenHashMap()
 
     private fun load(resourceLocation: ResourceLocation, shaderType: Int): Int {
@@ -58,8 +56,6 @@ class OpenGLShader(
 
         glShaderSource(program, code.code)
 
-        this.uniforms += code.uniforms
-
         glCompileShader(program)
 
         if (glGetShaderi(program, GL_COMPILE_STATUS) == GL_FALSE) {