diff --git a/src/OpenTK/Graphics/OpenGL/GLHelper.cs b/src/OpenTK/Graphics/OpenGL/GLHelper.cs
index 2dac183a..87039a04 100644
--- a/src/OpenTK/Graphics/OpenGL/GLHelper.cs
+++ b/src/OpenTK/Graphics/OpenGL/GLHelper.cs
@@ -1366,223 +1366,6 @@ namespace OpenTK.Graphics.OpenGL
 
         #endregion
 
-        #region Obsolete
-
-        [Obsolete("Use DisableClientState(ArrayCap) instead")]
-        public static void DisableClientState(OpenTK.Graphics.OpenGL.EnableCap array)
-        {
-            DisableClientState((ArrayCap)array);
-        }
-
-        [Obsolete("Use EnableClientState(ArrayCap) instead.")]
-        public static void EnableClientState(OpenTK.Graphics.OpenGL.EnableCap array)
-        {
-            EnableClientState((ArrayCap)array);
-        }
-
-        [Obsolete("Use GetActiveUniforms(..., ActiveUniformParameter, ...) instead.")]
-        public static void GetActiveUniforms(Int32 program, Int32 uniformCount, Int32[] uniformIndices, ArbUniformBufferObject pname, [OutAttribute] Int32[] @params)
-        {
-            GetActiveUniforms(program, uniformCount, uniformIndices, (ActiveUniformParameter)pname, @params);
-        }
-
-        [Obsolete("Use GetActiveUniforms(..., ActiveUniformParameter, ...) instead.")]
-        public static void GetActiveUniforms(Int32 program, Int32 uniformCount, ref Int32 uniformIndices, ArbUniformBufferObject pname, [OutAttribute] out Int32 @params)
-        {
-            GetActiveUniforms(program, uniformCount, ref uniformIndices, (ActiveUniformParameter)pname, out @params);
-        }
-
-        [System.CLSCompliant(false)]
-        [Obsolete("Use GetActiveUniforms(..., ActiveUniformParameter, ...) instead.")]
-        public static unsafe void GetActiveUniforms(Int32 program, Int32 uniformCount, Int32* uniformIndices, ArbUniformBufferObject pname, [OutAttribute] Int32* @params)
-        {
-            GetActiveUniforms(program, uniformCount, uniformIndices, (ActiveUniformParameter)pname, @params);
-        }
-
-        [System.CLSCompliant(false)]
-        [Obsolete("Use GetActiveUniforms(..., ActiveUniformParameter, ...) instead.")]
-        public static void GetActiveUniforms(UInt32 program, Int32 uniformCount, UInt32[] uniformIndices, ArbUniformBufferObject pname, [OutAttribute] Int32[] @params)
-        {
-            GetActiveUniforms(program, uniformCount, uniformIndices, (ActiveUniformParameter)pname, @params);
-        }
-
-        [System.CLSCompliant(false)]
-        [Obsolete("Use GetActiveUniforms(..., ActiveUniformParameter, ...) instead.")]
-        public static void GetActiveUniforms(UInt32 program, Int32 uniformCount, ref UInt32 uniformIndices, ArbUniformBufferObject pname, [OutAttribute] out Int32 @params)
-        {
-            GetActiveUniforms(program, uniformCount, ref uniformIndices, (ActiveUniformParameter)pname, out @params);
-        }
-
-        [System.CLSCompliant(false)]
-        [Obsolete("Use GetActiveUniforms(..., ActiveUniformParameter, ...) instead.")]
-        public static unsafe void GetActiveUniforms(UInt32 program, Int32 uniformCount, UInt32* uniformIndices, ArbUniformBufferObject pname, [OutAttribute] Int32* @params)
-        {
-            GetActiveUniforms(program, uniformCount, uniformIndices, (ActiveUniformParameter)pname, @params);
-        }
-
-        [Obsolete("Use strongly-typed overload instead")]
-		public static void GetBufferParameteri64(Version32 target, Version32 pname, [OutAttribute] Int64[] @params)
-        {
-            GL.GetBufferParameter((BufferTarget)target, (BufferParameterName)pname, @params);
-        }
-
-        [Obsolete("Use strongly-typed overload instead")]
-		public static void GetBufferParameteri64(Version32 target, Version32 pname, out Int64 @params)
-        {
-            GL.GetBufferParameter((BufferTarget)target, (BufferParameterName)pname, out @params);
-        }
-
-        [Obsolete("Use strongly-typed overload instead")]
-		[CLSCompliant(false)]
-		public static unsafe void GetBufferParameteri64(Version32 target, Version32 pname, [OutAttribute] Int64* @params)
-        {
-            GL.GetBufferParameter((BufferTarget)target, (BufferParameterName)pname, @params);
-        }
-
-        [Obsolete("Use GL.Arb.FramebufferTextureFace instead (OpenGL spec bug)")]
-		public static void FramebufferTextureFace(Version32 target, Version32 attachment,
-            int texture, int level, Version32 face)
-        {
-            Arb.FramebufferTextureFace((FramebufferTarget)target,
-                (FramebufferAttachment)attachment, texture, level, (TextureTarget)face);
-        }
-
-        [Obsolete("Use GL.Arb.FramebufferTextureFace instead (OpenGL spec bug)")]
-		[CLSCompliant(false)]
-		public static void FramebufferTextureFace(Version32 target, Version32 attachment,
-			uint texture, int level, Version32 face)
-        {
-            Arb.FramebufferTextureFace((FramebufferTarget)target,
-                (FramebufferAttachment)attachment, texture, level, (TextureTarget)face);
-        }
-
-
-        public static partial class Arb
-        {
-            [Obsolete("Use ProgramParameter(..., AssemblyProgramParameterArb, ...) instead.")]
-            public static void ProgramParameter(Int32 program, ArbGeometryShader4 pname, Int32 value)
-            {
-                ProgramParameter(program, (AssemblyProgramParameterArb)pname, value);
-            }
-
-            [Obsolete("Use ProgramParameter(..., AssemblyProgramParameterArb, ...) instead.")]
-            [CLSCompliant(false)]
-            public static void ProgramParameter(UInt32 program, ArbGeometryShader4 pname, Int32 value)
-            {
-                ProgramParameter(program, (AssemblyProgramParameterArb)pname, value);
-            }
-        }
-
-        public static partial class Ext
-        {
-            /// <summary>[requires: EXT_direct_state_access]</summary>
-            [Obsolete("Use ClearNamedBufferSubData(..., format, type, data) instead.")]
-            public static void ClearNamedBufferSubData(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr offset, IntPtr size, IntPtr data)
-            {
-                ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
-            }
-
-            /// <summary>[requires: EXT_direct_state_access]</summary>
-            [Obsolete("Use ClearNamedBufferSubData(..., format, type, data) instead.")]
-            [CLSCompliant(false)]
-            public static void ClearNamedBufferSubData<T6>(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T6[] data)
-                where T6 : struct
-            {
-                ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
-            }
-
-            /// <summary>[requires: EXT_direct_state_access]</summary>
-            [Obsolete("Use ClearNamedBufferSubData(..., format, type, data) instead.")]
-            [CLSCompliant(false)]
-            public static void ClearNamedBufferSubData<T6>(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T6[,] data)
-                where T6 : struct
-            {
-                ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
-            }
-
-            /// <summary>[requires: EXT_direct_state_access]</summary>
-            [Obsolete("Use ClearNamedBufferSubData(..., format, type, data) instead.")]
-            [CLSCompliant(false)]
-            public static void ClearNamedBufferSubData<T6>(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T6[,,] data)
-                where T6 : struct
-            {
-                ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
-            }
-
-            /// <summary>[requires: EXT_direct_state_access]</summary>
-            [Obsolete("Use ClearNamedBufferSubData(..., format, type, data) instead.")]
-            [CLSCompliant(false)]
-            public static void ClearNamedBufferSubData<T6>(Int32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T6 data)
-                where T6 : struct
-            {
-                ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, ref data);
-            }
-
-            /// <summary>[requires: EXT_direct_state_access]</summary>
-            [Obsolete("Use ClearNamedBufferSubData(..., format, type, data) instead.")]
-            [CLSCompliant(false)]
-            public static void ClearNamedBufferSubData(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr offset, IntPtr size, IntPtr data)
-            {
-                ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
-            }
-
-            /// <summary>[requires: EXT_direct_state_access]</summary>
-            [Obsolete("Use ClearNamedBufferSubData(..., format, type, data) instead.")]
-            [CLSCompliant(false)]
-            public static void ClearNamedBufferSubData<T6>(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T6[] data)
-                where T6 : struct
-            {
-                ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
-            }
-
-            /// <summary>[requires: EXT_direct_state_access]</summary>
-            [Obsolete("Use ClearNamedBufferSubData(..., format, type, data) instead.")]
-            [CLSCompliant(false)]
-            public static void ClearNamedBufferSubData<T6>(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T6[,] data)
-                where T6 : struct
-            {
-                ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
-            }
-
-            /// <summary>[requires: EXT_direct_state_access]</summary>
-            [Obsolete("Use ClearNamedBufferSubData(..., format, type, data) instead.")]
-            [CLSCompliant(false)]
-            public static void ClearNamedBufferSubData<T6>(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] T6[,,] data)
-                where T6 : struct
-            {
-                ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
-            }
-
-            /// <summary>[requires: EXT_direct_state_access]</summary>
-            [Obsolete("Use ClearNamedBufferSubData(..., format, type, data) instead.")]
-            [CLSCompliant(false)]
-            public static void ClearNamedBufferSubData<T6>(UInt32 buffer, OpenTK.Graphics.OpenGL.ExtDirectStateAccess internalformat, OpenTK.Graphics.OpenGL.PixelFormat format, OpenTK.Graphics.OpenGL.PixelType type, IntPtr offset, IntPtr size, [InAttribute, OutAttribute] ref T6 data)
-                where T6 : struct
-            {
-                ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, ref data);
-            }
-
-            [Obsolete("Use ProgramParameter(..., AssemblyProgramParameterArb, ...) instead.")]
-            public static void ProgramParameter(Int32 program, ExtGeometryShader4 pname, Int32 value)
-            {
-                ProgramParameter(program, (AssemblyProgramParameterArb)pname, value);
-            }
-
-            [Obsolete("Use ProgramParameter(..., AssemblyProgramParameterArb, ...) instead.")]
-            [CLSCompliant(false)]
-            public static void ProgramParameter(UInt32 program, ExtGeometryShader4 pname, Int32 value)
-            {
-                ProgramParameter(program, (AssemblyProgramParameterArb)pname, value);
-            }
-        }
-
-        #endregion
-
-#pragma warning restore 3019
-#pragma warning restore 1591
-#pragma warning restore 1572
-#pragma warning restore 1573
-
         #endregion
     }