diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index 304867f..12a5561 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -767,49 +767,24 @@
     return is_inter ? EXT_TX_SET_DCT_IDTX : EXT_TX_SET_DTT4_IDTX;
   if (tx_size_sqr_up == TX_32X32)
     return is_inter ? EXT_TX_SET_DCT_IDTX : EXT_TX_SET_DCTONLY;
-  if (is_inter)
-    return (tx_size_sqr == TX_16X16 ?
-#if EXT_TX_16X16_SET == 0
-                                    EXT_TX_SET_ALL16_16X16
-#elif EXT_TX_16X16_SET == 1
-                                    EXT_TX_SET_DTT9_IDTX_1DDCT
-#else
-                                    EXT_TX_SET_DTT9_IDTX
-#endif  // EXT_TX_16X16_SET
+  if (is_inter) {
+    return (tx_size_sqr == TX_16X16 ? EXT_TX_SET_DTT9_IDTX_1DDCT
                                     : EXT_TX_SET_ALL16);
-  else
-    return (tx_size_sqr == TX_16X16 ?
-#if EXT_TX_16X16_SET == 0
-                                    EXT_TX_SET_DTT4_IDTX_1DDCT_16X16
-#else
-                                    EXT_TX_SET_DTT4_IDTX
-#endif  // EXT_TX_16X16_SET
+  } else {
+    return (tx_size_sqr == TX_16X16 ? EXT_TX_SET_DTT4_IDTX
                                     : EXT_TX_SET_DTT4_IDTX_1DDCT);
+  }
 }
 
 // Maps tx set types to the indices.
 static const int ext_tx_set_index[2][EXT_TX_SET_TYPES] = {
   {
       // Intra
-      0, -1,
-#if EXT_TX_16X16_SET == 0
-      -1, 2,
-#else
-      2, -1,
-#endif  // EXT_TX_16X16_SET
-      1, -1, -1, -1, -1,
+      0, -1, 2, -1, 1, -1, -1, -1, -1,
   },
   {
       // Inter
-      0, 3, -1, -1, -1,
-#if EXT_TX_16X16_SET == 0
-      -1, -1, 2,
-#elif EXT_TX_16X16_SET == 1
-      -1, 2, -1,
-#else
-      2, -1, -1,
-#endif  // EXT_TX_16X16_SET
-      1,
+      0, 3, -1, -1, -1, -1, 2, -1, 1,
   },
 };
 
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 194337b..333ca0c 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -1889,70 +1889,6 @@
               { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
           },
       },
-#if EXT_TX_16X16_SET == 0
-      {
-          {
-              { AOM_CDF7(1024, 28800, 29048, 29296, 30164, 31466) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 27118) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1152, 25852, 26284, 26717, 28230, 30499) },
-              { AOM_CDF7(1024, 2016, 3938, 5860, 29404, 31086) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 27118) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
-              { AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-          },
-          {
-              { AOM_CDF7(1024, 28800, 29048, 29296, 30164, 31466) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 27118) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1152, 25852, 26284, 26717, 28230, 30499) },
-              { AOM_CDF7(1024, 2016, 3938, 5860, 29404, 31086) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 27118) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
-              { AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-          },
-          {
-              { AOM_CDF7(1024, 28800, 29048, 29296, 30164, 31466) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 27118) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1152, 25852, 26284, 26717, 28230, 30499) },
-              { AOM_CDF7(1024, 2016, 3938, 5860, 29404, 31086) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 27118) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
-              { AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-          },
-          {
-              { AOM_CDF7(1024, 28800, 29048, 29296, 30164, 31466) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 27118) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1152, 25852, 26284, 26717, 28230, 30499) },
-              { AOM_CDF7(1024, 2016, 3938, 5860, 29404, 31086) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 27118) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
-              { AOM_CDF7(1280, 4109, 5900, 7691, 15528, 27380) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-              { AOM_CDF7(1280, 5216, 6938, 8660, 10167, 15817) },
-          },
-      },
-#else
       {
           {
               { AOM_CDF5(1024, 28800, 29792, 31280) },
@@ -2015,7 +1951,6 @@
               { AOM_CDF5(1280, 5216, 6938, 13396) },
           },
       },
-#endif  // EXT_TX_16X16_SET == 0
     };
 static const aom_cdf_prob
     default_inter_ext_tx_cdf[EXT_TX_SETS_INTER][EXT_TX_SIZES][CDF_SIZE(
@@ -2029,16 +1964,6 @@
                     21733, 24241, 26749, 28253, 29758, 31263) },
         { AOM_CDF16(1280, 1453, 1626, 2277, 2929, 3580, 4232, 16717, 19225,
                     21733, 24241, 26749, 28253, 29758, 31263) } },
-#if EXT_TX_16X16_SET == 0
-      { { AOM_CDF16(1280, 1453, 1626, 2277, 2929, 3580, 4232, 16717, 19225,
-                    21733, 24241, 26749, 28253, 29758, 31263) },
-        { AOM_CDF16(1280, 1453, 1626, 2277, 2929, 3580, 4232, 16717, 19225,
-                    21733, 24241, 26749, 28253, 29758, 31263) },
-        { AOM_CDF16(1280, 1453, 1626, 2277, 2929, 3580, 4232, 16717, 19225,
-                    21733, 24241, 26749, 28253, 29758, 31263) },
-        { AOM_CDF16(1280, 1453, 1626, 2277, 2929, 3580, 4232, 16717, 19225,
-                    21733, 24241, 26749, 28253, 29758, 31263) } },
-#elif EXT_TX_16X16_SET == 1
       { { AOM_CDF12(1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904, 28370,
                     29836, 31302) },
         { AOM_CDF12(1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904, 28370,
@@ -2047,16 +1972,6 @@
                     29836, 31302) },
         { AOM_CDF12(1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904, 28370,
                     29836, 31302) } },
-#else
-      { { AOM_CDF10(1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904,
-                    28370) },
-        { AOM_CDF10(1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904,
-                    28370) },
-        { AOM_CDF10(1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904,
-                    28370) },
-        { AOM_CDF10(1280, 3125, 4970, 17132, 19575, 22018, 24461, 26904,
-                    28370) } },
-#endif  // EXT_TX_16X16_SET
       { { AOM_CDF2(1536) },
         { AOM_CDF2(1536) },
         { AOM_CDF2(1536) },
diff --git a/av1/common/entropymode.h b/av1/common/entropymode.h
index 5919346..65b2509 100644
--- a/av1/common/entropymode.h
+++ b/av1/common/entropymode.h
@@ -317,19 +317,6 @@
                                                [KF_MODE_CONTEXTS]
                                                [CDF_SIZE(INTRA_MODES)];
 
-// Decides what set to assign to 16x16 transforms.
-// Set 0:
-//        Inter: All 16 txfms
-//        Intra: Discrete Trig transforms w/0 flip (4) + Identity (1) +
-//               1D Hor/vert DCT (2)
-// Set 1:
-//        Inter: Discrete Trig transforms w/ flip (9) + Identity (1) +
-//               1D Hor/Ver DCT (2)
-//        Intra: Discrete Trig transforms w/0 flip (4) + Identity (1)
-// Set 2:
-//        Inter: Discrete Trig transforms w/ flip (9) + Identity (1)
-//        Intra: Discrete Trig transforms w/0 flip (4) + Identity (1)
-#define EXT_TX_16X16_SET 1
 static const int av1_ext_tx_ind[EXT_TX_SET_TYPES][TX_TYPES] = {
   {
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 3413184..a4069a3 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -83,23 +83,11 @@
                                                       EXT_TX_SETS_INTER)] = {
   {
       // Intra
-      EXT_TX_SET_DCTONLY, EXT_TX_SET_DTT4_IDTX_1DDCT,
-#if EXT_TX_16X16_SET == 0
-      EXT_TX_SET_DTT4_IDTX_1DDCT_16X16,
-#else
-      EXT_TX_SET_DTT4_IDTX,
-#endif  // EXT_TX_16X16_SET
+      EXT_TX_SET_DCTONLY, EXT_TX_SET_DTT4_IDTX_1DDCT, EXT_TX_SET_DTT4_IDTX,
   },
   {
       // Inter
-      EXT_TX_SET_DCTONLY, EXT_TX_SET_ALL16,
-#if EXT_TX_16X16_SET == 0
-      EXT_TX_SET_ALL16_16X16,
-#elif EXT_TX_16X16_SET == 1
-      EXT_TX_SET_DTT9_IDTX_1DDCT,
-#else
-      EXT_TX_SET_DTT9_IDTX,
-#endif  // EXT_TX_16X16_SET
+      EXT_TX_SET_DCTONLY, EXT_TX_SET_ALL16, EXT_TX_SET_DTT9_IDTX_1DDCT,
       EXT_TX_SET_DCT_IDTX,
   },
 };