diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index ee442514d6094601f9353d97bfafd68ab6a94c21..b0df1520747c693261320369a04cb62aa1bd32bf 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -927,8 +927,6 @@ static void encode_sb(VP9_COMP *cpi,
     if (output_enabled) {
       (*tp)->Token = EOSB_TOKEN;
       (*tp)++;
-      if (mb_row < cm->mb_rows)
-        cpi->tplist[mb_row].stop = *tp;
     }
   } else {
     int i;
@@ -958,8 +956,6 @@ static void encode_sb(VP9_COMP *cpi,
       if (output_enabled) {
         (*tp)->Token = EOSB_TOKEN;
        (*tp)++;
-        if (mb_row + y_idx < cm->mb_rows)
-          cpi->tplist[mb_row + y_idx].stop = *tp;
       }
     }
   }
@@ -993,8 +989,6 @@ static void encode_sb64(VP9_COMP *cpi,
 
     (*tp)->Token = EOSB_TOKEN;
     (*tp)++;
-    if (mb_row < cm->mb_rows)
-      cpi->tplist[mb_row].stop = *tp;
   } else {
     int i;
 
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index aab072e65ae453aa0a81461447a7636c9085852a..c1203f04b57fa465969ffad8f4b91771f14c642a 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -300,9 +300,6 @@ static void setup_features(VP9_COMP *cpi) {
 
 
 static void dealloc_compressor_data(VP9_COMP *cpi) {
-  vpx_free(cpi->tplist);
-  cpi->tplist = NULL;
-
   // Delete last frame MV storage buffers
   vpx_free(cpi->lfmv);
   cpi->lfmv = 0;
@@ -934,11 +931,6 @@ void vp9_alloc_compressor_data(VP9_COMP *cpi) {
       !cpi->twopass.this_frame_stats)
     vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR,
                        "Failed to allocate firstpass stats");
-
-  vpx_free(cpi->tplist);
-
-  CHECK_MEM_ERROR(cpi->tplist,
-                  vpx_malloc(sizeof(TOKENLIST) * (cpi->common.mb_rows)));
 }
 
 
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h
index f4a93f23468e913490db3fc86a6906ec8f49171f..ac59acc08bf676b6e39bb473ddf21ff5cf14f861 100644
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -566,8 +566,6 @@ typedef struct VP9_COMP {
   unsigned char *active_map;
   unsigned int active_map_enabled;
 
-  TOKENLIST *tplist;
-
   fractional_mv_step_fp *find_fractional_mv_step;
   vp9_full_search_fn_t full_search_sad;
   vp9_refining_search_fn_t refining_search_sad;