diff --git a/src/generated/org/lwjgl/opengl/ContextCapabilities.java b/src/generated/org/lwjgl/opengl/ContextCapabilities.java
index 255b8ded..2e7c6952 100644
--- a/src/generated/org/lwjgl/opengl/ContextCapabilities.java
+++ b/src/generated/org/lwjgl/opengl/ContextCapabilities.java
@@ -1040,9 +1040,6 @@ public class ContextCapabilities {
 	long NV_occlusion_query_glEndOcclusionQueryNV_pointer;
 	long NV_occlusion_query_glGetOcclusionQueryuivNV_pointer;
 	long NV_occlusion_query_glGetOcclusionQueryivNV_pointer;
-	long NV_parameter_buffer_object_glBindBufferRangeNV_pointer;
-	long NV_parameter_buffer_object_glBindBufferOffsetNV_pointer;
-	long NV_parameter_buffer_object_glBindBufferBaseNV_pointer;
 	long NV_parameter_buffer_object_glProgramBufferParametersfvNV_pointer;
 	long NV_parameter_buffer_object_glProgramBufferParametersIivNV_pointer;
 	long NV_parameter_buffer_object_glProgramBufferParametersIuivNV_pointer;
@@ -2288,9 +2285,6 @@ public class ContextCapabilities {
 
 	private boolean NV_parameter_buffer_object_initNativeFunctionAddresses() {
 		return 
-			(NV_parameter_buffer_object_glBindBufferRangeNV_pointer = GLContext.getFunctionAddress("glBindBufferRangeNV")) != 0 &&
-			(NV_parameter_buffer_object_glBindBufferOffsetNV_pointer = GLContext.getFunctionAddress("glBindBufferOffsetNV")) != 0 &&
-			(NV_parameter_buffer_object_glBindBufferBaseNV_pointer = GLContext.getFunctionAddress("glBindBufferBaseNV")) != 0 &&
 			(NV_parameter_buffer_object_glProgramBufferParametersfvNV_pointer = GLContext.getFunctionAddress("glProgramBufferParametersfvNV")) != 0 &&
 			(NV_parameter_buffer_object_glProgramBufferParametersIivNV_pointer = GLContext.getFunctionAddress("glProgramBufferParametersIivNV")) != 0 &&
 			(NV_parameter_buffer_object_glProgramBufferParametersIuivNV_pointer = GLContext.getFunctionAddress("glProgramBufferParametersIuivNV")) != 0;
diff --git a/src/generated/org/lwjgl/opengl/NVParameterBufferObject.java b/src/generated/org/lwjgl/opengl/NVParameterBufferObject.java
index 4eea534c..a8a4795e 100644
--- a/src/generated/org/lwjgl/opengl/NVParameterBufferObject.java
+++ b/src/generated/org/lwjgl/opengl/NVParameterBufferObject.java
@@ -26,27 +26,6 @@ public final class NVParameterBufferObject {
 	}
 
 
-	public static void glBindBufferRangeNV(int target, int index, int buffer, long offset, long size) {
-		long function_pointer = GLContext.getCapabilities().NV_parameter_buffer_object_glBindBufferRangeNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBindBufferRangeNV(target, index, buffer, offset, size, function_pointer);
-	}
-	private static native void nglBindBufferRangeNV(int target, int index, int buffer, long offset, long size, long function_pointer);
-
-	public static void glBindBufferOffsetNV(int target, int index, int buffer, long offset) {
-		long function_pointer = GLContext.getCapabilities().NV_parameter_buffer_object_glBindBufferOffsetNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBindBufferOffsetNV(target, index, buffer, offset, function_pointer);
-	}
-	private static native void nglBindBufferOffsetNV(int target, int index, int buffer, long offset, long function_pointer);
-
-	public static void glBindBufferBaseNV(int target, int index, int buffer) {
-		long function_pointer = GLContext.getCapabilities().NV_parameter_buffer_object_glBindBufferBaseNV_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		nglBindBufferBaseNV(target, index, buffer, function_pointer);
-	}
-	private static native void nglBindBufferBaseNV(int target, int index, int buffer, long function_pointer);
-
 	public static void glProgramBufferParametersNV(int target, int buffer, int index, FloatBuffer params) {
 		long function_pointer = GLContext.getCapabilities().NV_parameter_buffer_object_glProgramBufferParametersfvNV_pointer;
 		BufferChecks.checkFunctionAddress(function_pointer);
diff --git a/src/native/generated/org_lwjgl_opengl_NVParameterBufferObject.c b/src/native/generated/org_lwjgl_opengl_NVParameterBufferObject.c
index a9fc08c5..7c771bd2 100644
--- a/src/native/generated/org_lwjgl_opengl_NVParameterBufferObject.c
+++ b/src/native/generated/org_lwjgl_opengl_NVParameterBufferObject.c
@@ -3,28 +3,10 @@
 #include <jni.h>
 #include "extgl.h"
 
-typedef void (APIENTRY *glBindBufferRangeNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-typedef void (APIENTRY *glBindBufferOffsetNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
-typedef void (APIENTRY *glBindBufferBaseNVPROC) (GLenum target, GLuint index, GLuint buffer);
 typedef void (APIENTRY *glProgramBufferParametersfvNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat * params);
 typedef void (APIENTRY *glProgramBufferParametersIivNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint * params);
 typedef void (APIENTRY *glProgramBufferParametersIuivNVPROC) (GLenum target, GLuint buffer, GLuint index, GLuint count, const GLuint * params);
 
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVParameterBufferObject_nglBindBufferRangeNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong size, jlong function_pointer) {
-	glBindBufferRangeNVPROC glBindBufferRangeNV = (glBindBufferRangeNVPROC)((intptr_t)function_pointer);
-	glBindBufferRangeNV(target, index, buffer, offset, size);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVParameterBufferObject_nglBindBufferOffsetNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong offset, jlong function_pointer) {
-	glBindBufferOffsetNVPROC glBindBufferOffsetNV = (glBindBufferOffsetNVPROC)((intptr_t)function_pointer);
-	glBindBufferOffsetNV(target, index, buffer, offset);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVParameterBufferObject_nglBindBufferBaseNV(JNIEnv *env, jclass clazz, jint target, jint index, jint buffer, jlong function_pointer) {
-	glBindBufferBaseNVPROC glBindBufferBaseNV = (glBindBufferBaseNVPROC)((intptr_t)function_pointer);
-	glBindBufferBaseNV(target, index, buffer);
-}
-
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_NVParameterBufferObject_nglProgramBufferParametersfvNV(JNIEnv *env, jclass clazz, jint target, jint buffer, jint index, jint count, jobject params, jint params_position, jlong function_pointer) {
 	const GLfloat *params_address = ((const GLfloat *)(*env)->GetDirectBufferAddress(env, params)) + params_position;
 	glProgramBufferParametersfvNVPROC glProgramBufferParametersfvNV = (glProgramBufferParametersfvNVPROC)((intptr_t)function_pointer);
diff --git a/src/templates/org/lwjgl/opengl/NV_parameter_buffer_object.java b/src/templates/org/lwjgl/opengl/NV_parameter_buffer_object.java
index a53bb6da..3c2a4959 100644
--- a/src/templates/org/lwjgl/opengl/NV_parameter_buffer_object.java
+++ b/src/templates/org/lwjgl/opengl/NV_parameter_buffer_object.java
@@ -52,12 +52,6 @@ public interface NV_parameter_buffer_object {
 	int GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA3;
 	int GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV = 0x8DA4;
 
-	void glBindBufferRangeNV(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset, @GLsizeiptr long size);
-
-	void glBindBufferOffsetNV(@GLenum int target, @GLuint int index, @GLuint int buffer, @GLintptr long offset);
-
-	void glBindBufferBaseNV(@GLenum int target, @GLuint int index, @GLuint int buffer);
-
 	@StripPostfix("params")
 	void glProgramBufferParametersfvNV(@GLenum int target, @GLuint int buffer, @GLuint int index,
 									   @AutoSize(value = "params", expression = " >> 2") @GLsizei int count, @Const FloatBuffer params);
@@ -70,8 +64,4 @@ public interface NV_parameter_buffer_object {
 	void glProgramBufferParametersIuivNV(@GLenum int target, @GLuint int buffer, @GLuint int index,
 										 @AutoSize(value = "params", expression = " >> 2") @GLuint int count, @Const @GLuint IntBuffer params);
 
-	// TODO: This is weird and breaks the generator, re-examine when the spec's final version is out
-	//@StripPostfix("data")
-	//void glGetIntegerIndexedvEXT(@GLenum int value, @GLuint int index, @Check("4") @GLboolean ByteBuffer data);
-
 }
\ No newline at end of file