diff --git a/configure b/configure
index 5f39413f2f975dce6c158ffa30e1d08cb3030109..c9b71c5a92e4e7a0b8b12e9dc0c11073cd54ee49 100755
--- a/configure
+++ b/configure
@@ -214,11 +214,7 @@ HAVE_LIST="
     unistd_h
 "
 EXPERIMENT_LIST="
-    t8x8
     csm
-    qimode
-    uvintra
-    compred
     enhanced_interp
     featureupdates
     high_precision_mv
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index ee0ed292112f819d3d5ca37ba3baa0d88ee296fb..ef34dd33e26a7fd8b90f06eabcfef8f5629e86b6 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -854,13 +854,6 @@ static void encode_sb(VP8_COMP *cpi,
             check_segref(xd, *segment_id, LAST_FRAME) +
             check_segref(xd, *segment_id, GOLDEN_FRAME) +
             check_segref(xd, *segment_id, ALTREF_FRAME)) > 1)) {
-// TODO this may not be a good idea as it makes sample size small and means
-// the predictor functions cannot use data about most likely value only most
-// likely unpredicted value.
-// #if CONFIG_COMPRED
-//        // Only update count for incorrectly predicted cases
-//        if ( !ref_pred_flag )
-// #endif
         {
           cpi->count_mb_ref_frame_usage
           [xd->mode_info_context->mbmi.ref_frame]++;
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 3eb25d255f482e5302c79e30d5523326be86e79d..7a9022a1d21d1f07796f893048d60f7ebff5550d 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3013,12 +3013,6 @@ static void encode_frame_to_data_rate
     }
   }
 
-// #if !CONFIG_COMPRED
-  // This function has been deprecated for now but we may want to do
-  // something here at a late date
-  // update_rd_ref_frame_probs(cpi);
-// #endif
-
   // Test code for new segment features
   init_seg_features(cpi);
 
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 00732fdc738b914c9e45bcddba7b0e540f72e682..2c04b54b1a75da7cf4a1f8b448afc7f035350c79 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -3748,9 +3748,6 @@ int vp8cx_pick_mode_inter_macroblock
   int distortion;
   int intra_error = 0;
   unsigned char *segment_id = &xd->mode_info_context->mbmi.segment_id;
-#if CONFIG_COMPRED
-  unsigned char ref_pred_flag;
-#endif
 
   if (xd->segmentation_enabled)
     x->encode_breakout = cpi->segment_encode_breakout[*segment_id];