diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index 3af1a069c11..b97481a7ded 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -302,8 +302,6 @@ GL_IDirect3DDeviceImpl_7_3T_2T_1T_Release(LPDIRECT3DDEVICE7 iface)
 	if (This->current_texture[0] != NULL)
 	    IDirect3DTexture2_Release(ICOM_INTERFACE(This->current_texture[0], IDirect3DTexture2));
 
-	if (glThis->handler) HeapFree(GetProcessHeap(), 0, This);
-	
 	ENTER_GL();
 	glXDestroyContext(glThis->display, glThis->gl_context);
 	LEAVE_GL();
diff --git a/dlls/ddraw/mesa_private.h b/dlls/ddraw/mesa_private.h
index 1f7a8f449bc..6f4ad311edf 100644
--- a/dlls/ddraw/mesa_private.h
+++ b/dlls/ddraw/mesa_private.h
@@ -99,12 +99,6 @@ typedef struct IDirect3DTextureGLImpl
     void (*unlock_update)(IDirectDrawSurfaceImpl* This, LPCRECT pRect);
 } IDirect3DTextureGLImpl;
 
-typedef struct {
-    int offset;
-    int extra;
-    void (*handler)(char *vertex, int offset, int extra);
-} D3DFVF_GENERIC;
-
 typedef struct IDirect3DDeviceGLImpl
 {
     struct IDirect3DDeviceImpl parent;
@@ -118,12 +112,6 @@ typedef struct IDirect3DDeviceGLImpl
     BOOLEAN last_vertices_transformed;
     BOOLEAN last_vertices_lit;
 
-    /* This is to optimize a little bit the 'slow generic' path for the DrawPrimitive stuff */
-    D3DFVF_GENERIC *handler;
-    DWORD last_vertex_format;
-    DWORD last_vertex_format_size;
-    DWORD last_vertex_format_elements;
-    
     D3DMATRIX *world_mat;
     D3DMATRIX *view_mat;
     D3DMATRIX *proj_mat;