diff --git a/src/xvmc/i915_xvmc.c b/src/xvmc/i915_xvmc.c
index d27384dd..983b6fdf 100644
--- a/src/xvmc/i915_xvmc.c
+++ b/src/xvmc/i915_xvmc.c
@@ -60,15 +60,6 @@ static char I915KernelDriverName[] = "i915";
 static int error_base;
 static int event_base;
 
-static int i915_xvmc_mc_init()
-{
-    return 0;
-}
-
-static void i915_xvmc_mc_fini()
-{}
-
-
 static int findOverlap(unsigned int width, unsigned int height,
                        short *dstX, short *dstY,
                        short *srcX, short *srcY,
@@ -2538,8 +2529,6 @@ struct _intel_xvmc_driver i915_xvmc_mc_driver = {
     .type		= XVMC_I915_MPEG2_MC,
     .num_ctx		= 0,
     .ctx_list		= NULL,
-    .init		= i915_xvmc_mc_init,
-    .fini		= i915_xvmc_mc_fini,
     .create_context	= i915_xvmc_mc_create_context,
     .destroy_context	= i915_xvmc_mc_destroy_context,
     .create_surface	= i915_xvmc_mc_create_surface,
diff --git a/src/xvmc/intel_xvmc.h b/src/xvmc/intel_xvmc.h
index 8ebb14bf..3375ffc4 100644
--- a/src/xvmc/intel_xvmc.h
+++ b/src/xvmc/intel_xvmc.h
@@ -165,10 +165,6 @@ typedef struct _intel_xvmc_driver {
 
     void *private;
 
-    /* XXX: remove? */
-    int (*init)(void);
-    void (*fini)(void);
-
     /* driver specific xvmc callbacks */
     Status (*create_context)(Display* display, XvMCContext *context,
 	    int priv_count, CARD32 *priv_data);
@@ -191,7 +187,6 @@ typedef struct _intel_xvmc_driver {
 	    XvMCMacroBlockArray *macroblock_array,
 	    XvMCBlockArray *blocks);
 
-    /* XXX this should be same for all drivers */
     Status (*put_surface)(Display *display, XvMCSurface *surface,
 	    Drawable draw, short srcx, short srcy,
 	    unsigned short srcw, unsigned short srch,