diff --git a/presto-hive-metastore/pom.xml b/presto-hive-metastore/pom.xml
index 391b2a0eaf738..18c6669ed1d05 100644
--- a/presto-hive-metastore/pom.xml
+++ b/presto-hive-metastore/pom.xml
@@ -126,11 +126,6 @@
             <artifactId>validation-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.facebook.hive</groupId>
-            <artifactId>hive-dwrf</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.openjdk.jol</groupId>
             <artifactId>jol-core</artifactId>
diff --git a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveStorageFormat.java b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveStorageFormat.java
index 2ed329b09d403..85399f82671f1 100644
--- a/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveStorageFormat.java
+++ b/presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveStorageFormat.java
@@ -54,9 +54,9 @@ public enum HiveStorageFormat
             OrcOutputFormat.class.getName(),
             new DataSize(256, Unit.MEGABYTE)),
     DWRF(
-            com.facebook.hive.orc.OrcSerde.class.getName(),
-            com.facebook.hive.orc.OrcInputFormat.class.getName(),
-            com.facebook.hive.orc.OrcOutputFormat.class.getName(),
+            "com.facebook.hive.orc.OrcSerde",
+            "com.facebook.hive.orc.OrcInputFormat",
+            "com.facebook.hive.orc.OrcOutputFormat",
             new DataSize(256, Unit.MEGABYTE)),
     ALPHA(
             "com.facebook.alpha.AlphaSerde",
diff --git a/presto-hive/pom.xml b/presto-hive/pom.xml
index 8a756083122a9..a848fc5478c71 100644
--- a/presto-hive/pom.xml
+++ b/presto-hive/pom.xml
@@ -42,11 +42,6 @@
             <artifactId>presto-plugin-toolkit</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.facebook.hive</groupId>
-            <artifactId>hive-dwrf</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.facebook.presto</groupId>
             <artifactId>presto-orc</artifactId>
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/AbstractDwrfEncryptionInformationSource.java b/presto-hive/src/main/java/com/facebook/presto/hive/AbstractDwrfEncryptionInformationSource.java
index 4a5ab15b59927..93b27fdca10d2 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/AbstractDwrfEncryptionInformationSource.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/AbstractDwrfEncryptionInformationSource.java
@@ -13,7 +13,6 @@
  */
 package com.facebook.presto.hive;
 
-import com.facebook.hive.orc.OrcSerde;
 import com.facebook.presto.hive.ColumnEncryptionInformation.ColumnWithStructSubfield;
 import com.facebook.presto.hive.metastore.Partition;
 import com.facebook.presto.hive.metastore.Table;
@@ -131,10 +130,6 @@ else if (columnEncryptionInformation.isPresent()) {
 
     private static Optional<DwrfTableEncryptionProperties> getTableEncryptionProperties(Table table)
     {
-        if (!OrcSerde.class.getName().equals(table.getStorage().getStorageFormat().getSerDe())) {
-            return Optional.empty();
-        }
-
         return fromHiveTableProperties(table.getParameters());
     }
 }
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java
index ba8f130569839..d2fbb234a670e 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java
@@ -87,7 +87,6 @@
 import static com.facebook.presto.hive.HiveSessionProperties.isStringDictionaryEncodingEnabled;
 import static com.facebook.presto.hive.HiveSessionProperties.isStringDictionarySortingEnabled;
 import static com.facebook.presto.hive.HiveType.toHiveTypes;
-import static com.facebook.presto.orc.OrcEncoding.DWRF;
 import static com.facebook.presto.orc.OrcEncoding.ORC;
 import static com.facebook.presto.orc.OrcWriterOptions.DEFAULT_MAX_FLATTENED_MAP_KEY_COUNT;
 import static com.facebook.presto.orc.metadata.KeyProvider.CRYPTO_SERVICE;
@@ -212,9 +211,6 @@ public Optional<HiveFileWriter> createFileWriter(
         if (OrcOutputFormat.class.getName().equals(storageFormat.getOutputFormat())) {
             orcEncoding = ORC;
         }
-        else if (com.facebook.hive.orc.OrcOutputFormat.class.getName().equals(storageFormat.getOutputFormat())) {
-            orcEncoding = DWRF;
-        }
         else {
             return Optional.empty();
         }
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfAggregatedPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfAggregatedPageSourceFactory.java
index 19ba823ef895a..59106bdcbe586 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfAggregatedPageSourceFactory.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfAggregatedPageSourceFactory.java
@@ -13,7 +13,6 @@
  */
 package com.facebook.presto.hive.orc;
 
-import com.facebook.hive.orc.OrcSerde;
 import com.facebook.presto.common.type.TypeManager;
 import com.facebook.presto.hive.EncryptionInformation;
 import com.facebook.presto.hive.FileFormatDataSourceStats;
@@ -102,10 +101,6 @@ public Optional<? extends ConnectorPageSource> createPageSource(
             HiveFileContext hiveFileContext,
             Optional<EncryptionInformation> encryptionInformation)
     {
-        if (!OrcSerde.class.getName().equals(storage.getStorageFormat().getSerDe())) {
-            return Optional.empty();
-        }
-
         if (fileSplit.getFileSize() == 0) {
             throw new PrestoException(HIVE_BAD_DATA, "ORC file is empty: " + fileSplit.getPath());
         }
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfBatchPageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfBatchPageSourceFactory.java
index 7babcc020c82a..584f1bb936a93 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfBatchPageSourceFactory.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfBatchPageSourceFactory.java
@@ -13,7 +13,6 @@
  */
 package com.facebook.presto.hive.orc;
 
-import com.facebook.hive.orc.OrcSerde;
 import com.facebook.presto.common.predicate.TupleDomain;
 import com.facebook.presto.common.type.TypeManager;
 import com.facebook.presto.hive.EncryptionInformation;
@@ -101,10 +100,6 @@ public Optional<? extends ConnectorPageSource> createPageSource(
             Optional<EncryptionInformation> encryptionInformation,
             Optional<byte[]> rowIDPartitionComponent)
     {
-        if (!OrcSerde.class.getName().equals(storage.getStorageFormat().getSerDe())) {
-            return Optional.empty();
-        }
-
         if (fileSplit.getFileSize() == 0) {
             throw new PrestoException(HIVE_BAD_DATA, "ORC file is empty: " + fileSplit.getPath());
         }
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfSelectivePageSourceFactory.java b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfSelectivePageSourceFactory.java
index 124efccd8f3f3..2a4df33f5fd33 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfSelectivePageSourceFactory.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfSelectivePageSourceFactory.java
@@ -13,7 +13,6 @@
  */
 package com.facebook.presto.hive.orc;
 
-import com.facebook.hive.orc.OrcSerde;
 import com.facebook.presto.common.Subfield;
 import com.facebook.presto.common.predicate.TupleDomain;
 import com.facebook.presto.common.type.TypeManager;
@@ -111,10 +110,6 @@ public Optional<? extends ConnectorPageSource> createPageSource(
             boolean appendRowNumberEnabled,
             Optional<byte[]> rowIDPartitionComponent)
     {
-        if (!OrcSerde.class.getName().equals(storage.getStorageFormat().getSerDe())) {
-            return Optional.empty();
-        }
-
         if (fileSplit.getFileSize() == 0) {
             throw new PrestoException(HIVE_BAD_DATA, "ORC file is empty: " + fileSplit.getPath());
         }
diff --git a/presto-hive/src/main/java/com/facebook/presto/hive/util/ConfigurationUtils.java b/presto-hive/src/main/java/com/facebook/presto/hive/util/ConfigurationUtils.java
index d533ac5d2e64d..e74f302f56db2 100644
--- a/presto-hive/src/main/java/com/facebook/presto/hive/util/ConfigurationUtils.java
+++ b/presto-hive/src/main/java/com/facebook/presto/hive/util/ConfigurationUtils.java
@@ -24,7 +24,6 @@
 
 import java.util.Map;
 
-import static com.facebook.hive.orc.OrcConf.ConfVars.HIVE_ORC_COMPRESSION;
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.COMPRESSRESULT;
 import static org.apache.hadoop.io.SequenceFile.CompressionType.BLOCK;
@@ -102,8 +101,6 @@ private static void setCompressionProperties(Configuration config, HiveCompressi
         config.setBoolean(COMPRESSRESULT.varname, compressed);
         config.setBoolean("mapred.output.compress", compressed);
         config.setBoolean(FileOutputFormat.COMPRESS, compressed);
-        // For DWRF
-        com.facebook.hive.orc.OrcConf.setVar(config, HIVE_ORC_COMPRESSION, compression.getOrcCompressionKind().name());
         // For ORC
         OrcConf.COMPRESS.setString(config, compression.getOrcCompressionKind().name());
         // For RCFile and Text