diff --git a/src/CRE/GL/array_buffer.cpp b/src/CRE/GL/array_buffer.cpp
index 49f6d5cd..d3030f01 100644
--- a/src/CRE/GL/array_buffer.cpp
+++ b/src/CRE/GL/array_buffer.cpp
@@ -82,30 +82,6 @@ namespace GL {
         return 0;
     }
 
-    void* ArrayBuffer::MapMemory(size_t offset, size_t length) {
-        if (!buffer)
-            return 0;
-
-        void* data;
-        if (GL_VERSION_4_5)
-            data = glMapNamedBufferRange(buffer, (GLintptr)offset, (GLsizeiptr)length, GL_WRITE_ONLY);
-        else {
-            gl_state_bind_array_buffer(buffer);
-            data = glMapBufferRange(GL_ARRAY_BUFFER, (GLintptr)offset, (GLsizeiptr)length, GL_WRITE_ONLY);
-        }
-
-        if (data)
-            return data;
-
-        if (GL_VERSION_4_5)
-            glUnmapNamedBuffer(buffer);
-        else {
-            glUnmapBuffer(GL_ARRAY_BUFFER);
-            gl_state_bind_array_buffer(0);
-        }
-        return 0;
-    }
-
     void ArrayBuffer::UnmapMemory() {
         if (!buffer)
             return;
diff --git a/src/CRE/GL/array_buffer.hpp b/src/CRE/GL/array_buffer.hpp
index 55a71fae..9f5ac318 100644
--- a/src/CRE/GL/array_buffer.hpp
+++ b/src/CRE/GL/array_buffer.hpp
@@ -31,7 +31,6 @@ namespace GL {
         void Create(size_t size, const void* data, bool dynamic = false);
         void Destroy();
         void* MapMemory();
-        void* MapMemory(size_t offset, size_t length);
         void UnmapMemory();
         void WriteMemory(size_t offset, size_t size, const void* data);
 
diff --git a/src/CRE/GL/element_array_buffer.cpp b/src/CRE/GL/element_array_buffer.cpp
index 0a8345c7..a0ec9674 100644
--- a/src/CRE/GL/element_array_buffer.cpp
+++ b/src/CRE/GL/element_array_buffer.cpp
@@ -82,30 +82,6 @@ namespace GL {
         return 0;
     }
 
-    void* ElementArrayBuffer::MapMemory(size_t offset, size_t length) {
-        if (!buffer)
-            return 0;
-
-        void* data;
-        if (GL_VERSION_4_5)
-            data = glMapNamedBufferRange(buffer, (GLintptr)offset, (GLsizeiptr)length, GL_WRITE_ONLY);
-        else {
-            gl_state_bind_element_array_buffer(buffer);
-            data = glMapBufferRange(GL_ELEMENT_ARRAY_BUFFER, (GLintptr)offset, (GLsizeiptr)length, GL_WRITE_ONLY);
-        }
-
-        if (data)
-            return data;
-
-        if (GL_VERSION_4_5)
-            glUnmapNamedBuffer(buffer);
-        else {
-            glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
-            gl_state_bind_element_array_buffer(0);
-        }
-        return 0;
-    }
-
     void ElementArrayBuffer::UnmapMemory() {
         if (!buffer)
             return;
diff --git a/src/CRE/GL/element_array_buffer.hpp b/src/CRE/GL/element_array_buffer.hpp
index f0baf34e..f89a5a06 100644
--- a/src/CRE/GL/element_array_buffer.hpp
+++ b/src/CRE/GL/element_array_buffer.hpp
@@ -18,6 +18,10 @@ namespace GL {
 
         }
 
+        inline ElementArrayBuffer(GLuint buffer) : buffer(buffer) {
+
+        }
+
         inline ~ElementArrayBuffer() {
 
         }
@@ -27,7 +31,6 @@ namespace GL {
         void Create(size_t size, const void* data, bool dynamic = false);
         void Destroy();
         void* MapMemory();
-        void* MapMemory(size_t offset, size_t length);
         void UnmapMemory();
         void WriteMemory(size_t offset, size_t size, const void* data);
 
diff --git a/src/CRE/GL/shader_storage_buffer.cpp b/src/CRE/GL/shader_storage_buffer.cpp
index b15979da..e8e28f60 100644
--- a/src/CRE/GL/shader_storage_buffer.cpp
+++ b/src/CRE/GL/shader_storage_buffer.cpp
@@ -82,30 +82,6 @@ namespace GL {
         return 0;
     }
 
-    void* ShaderStorageBuffer::MapMemory(size_t offset, size_t length) {
-        if (!buffer)
-            return 0;
-
-        void* data;
-        if (GL_VERSION_4_5)
-            data = glMapNamedBufferRange(buffer, (GLintptr)offset, (GLsizeiptr)length, GL_WRITE_ONLY);
-        else {
-            gl_state_bind_shader_storage_buffer(buffer);
-            data = glMapBufferRange(GL_SHADER_STORAGE_BUFFER, (GLintptr)offset, (GLsizeiptr)length, GL_WRITE_ONLY);
-        }
-
-        if (data)
-            return data;
-
-        if (GL_VERSION_4_5)
-            glUnmapNamedBuffer(buffer);
-        else {
-            glUnmapBuffer(GL_SHADER_STORAGE_BUFFER);
-            gl_state_bind_shader_storage_buffer(0);
-        }
-        return 0;
-    }
-
     void ShaderStorageBuffer::UnmapMemory() {
         if (!buffer)
             return;
diff --git a/src/CRE/GL/shader_storage_buffer.hpp b/src/CRE/GL/shader_storage_buffer.hpp
index 09766916..dd4023f8 100644
--- a/src/CRE/GL/shader_storage_buffer.hpp
+++ b/src/CRE/GL/shader_storage_buffer.hpp
@@ -18,6 +18,10 @@ namespace GL {
 
         }
 
+        inline ShaderStorageBuffer(GLuint buffer) : buffer(buffer) {
+
+        }
+
         inline ~ShaderStorageBuffer() {
 
         }
@@ -27,7 +31,6 @@ namespace GL {
         void Create(size_t size, const void* data, bool dynamic = false);
         void Destroy();
         void* MapMemory();
-        void* MapMemory(size_t offset, size_t length);
         void UnmapMemory();
         void WriteMemory(size_t offset, size_t size, const void* data);
 
diff --git a/src/CRE/GL/uniform_buffer.cpp b/src/CRE/GL/uniform_buffer.cpp
index 00c631d3..44bdfa39 100644
--- a/src/CRE/GL/uniform_buffer.cpp
+++ b/src/CRE/GL/uniform_buffer.cpp
@@ -82,30 +82,6 @@ namespace GL {
         return 0;
     }
 
-    void* UniformBuffer::MapMemory(size_t offset, size_t length) {
-        if (!buffer)
-            return 0;
-
-        void* data;
-        if (GL_VERSION_4_5)
-            data = glMapNamedBufferRange(buffer, (GLintptr)offset, (GLsizeiptr)length, GL_WRITE_ONLY);
-        else {
-            gl_state_bind_uniform_buffer(buffer);
-            data = glMapBufferRange(GL_UNIFORM_BUFFER, (GLintptr)offset, (GLsizeiptr)length, GL_WRITE_ONLY);
-        }
-
-        if (data)
-            return data;
-
-        if (GL_VERSION_4_5)
-            glUnmapNamedBuffer(buffer);
-        else {
-            glUnmapBuffer(GL_UNIFORM_BUFFER);
-            gl_state_bind_uniform_buffer(0);
-        }
-        return 0;
-    }
-
     void UniformBuffer::UnmapMemory() {
         if (!buffer)
             return;
diff --git a/src/CRE/GL/uniform_buffer.hpp b/src/CRE/GL/uniform_buffer.hpp
index 94b2ea14..086b3d14 100644
--- a/src/CRE/GL/uniform_buffer.hpp
+++ b/src/CRE/GL/uniform_buffer.hpp
@@ -18,6 +18,10 @@ namespace GL {
 
         }
 
+        inline UniformBuffer(GLuint buffer) : buffer(buffer) {
+
+        }
+
         inline ~UniformBuffer() {
 
         }
@@ -27,7 +31,6 @@ namespace GL {
         void Create(size_t size, const void* data, bool dynamic = false);
         void Destroy();
         void* MapMemory();
-        void* MapMemory(size_t offset, size_t length);
         void UnmapMemory();
         void WriteMemory(size_t offset, size_t size, const void* data);