diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 2eabfdbc891392651ed76250ca0e964225d825c5..879ea15fd5a4eba81505070fca39c9abd1c16e02 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -344,10 +344,6 @@ typedef struct AV1Common {
   qm_val_t *v_iqmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
 
   // Encoder
-  qm_val_t *y_qmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
-  qm_val_t *u_qmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
-  qm_val_t *v_qmatrix[MAX_SEGMENTS][TX_SIZES_ALL];
-
   int using_qmatrix;
   int min_qmlevel;
   int max_qmlevel;
diff --git a/av1/encoder/context_tree.h b/av1/encoder/context_tree.h
index 212a6a9840788fb1e7dad664e042b7dbecdd4efe..385225185e7a0964a45c8ea0db4570511243c923 100644
--- a/av1/encoder/context_tree.h
+++ b/av1/encoder/context_tree.h
@@ -77,11 +77,7 @@ typedef struct PC_TREE {
   PICK_MODE_CONTEXT horizontal4[4];
   PICK_MODE_CONTEXT vertical4[4];
 #endif
-  // TODO(jingning): remove leaf_split[] when cb4x4 experiment flag is removed.
-  union {
-    struct PC_TREE *split[4];
-    PICK_MODE_CONTEXT *leaf_split[4];
-  };
+  struct PC_TREE *split[4];
 } PC_TREE;
 
 void av1_setup_pc_tree(struct AV1Common *cm, struct ThreadData *td);
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index fbfc94c370efdfc0c58a2dd1b9df5389172c0438..0ef2e02bfb4d529428d3dc78862f707e9731f2fb 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -91,9 +91,6 @@ FRAME_COUNTS aggregate_fc_per_type[FRAME_CONTEXTS];
                                        // chosen.
 
 // #define OUTPUT_YUV_REC
-#ifdef OUTPUT_YUV_DENOISED
-FILE *yuv_denoised_file = NULL;
-#endif
 #ifdef OUTPUT_YUV_SKINMAP
 FILE *yuv_skinmap_file = NULL;
 #endif