diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c
index 721edeb306..c17a97305c 100644
--- a/libavcodec/wmv2enc.c
+++ b/libavcodec/wmv2enc.c
@@ -66,19 +66,6 @@ static av_cold int wmv2_encode_init(AVCodecContext *avctx){
     return 0;
 }
 
-#if 0 /* unused, remove? */
-static av_cold int wmv2_encode_end(AVCodecContext *avctx){
-
-    if(MPV_encode_end(avctx) < 0)
-        return -1;
-
-    avctx->extradata_size= 0;
-    av_freep(&avctx->extradata);
-
-    return 0;
-}
-#endif
-
 int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
 {
     Wmv2Context * const w= (Wmv2Context*)s;
@@ -91,7 +78,6 @@ int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
 
     s->dc_table_index = 1;
     s->mv_table_index = 1; /* only if P frame */
-//    s->use_skip_mb_code = 1; /* only if P frame */
     s->per_mb_rl_table = 0;
     s->mspel= 0;
     w->per_mb_abt=0;
@@ -203,10 +189,6 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
             }
             coded_cbp |= val << (5 - i);
         }
-#if 0
-        if (coded_cbp)
-            printf("cbp=%x %x\n", cbp, coded_cbp);
-#endif
 
         if (s->pict_type == FF_I_TYPE) {
             put_bits(&s->pb,