diff --git a/src/nvtt/BlockCompressor.cpp b/src/nvtt/BlockCompressor.cpp
index d5bad30..097675b 100644
--- a/src/nvtt/BlockCompressor.cpp
+++ b/src/nvtt/BlockCompressor.cpp
@@ -208,14 +208,17 @@ void FloatColorCompressor::compress(AlphaMode alphaMode, uint w, uint h, uint d,
 // BC1
 #include "icbc.h"
 
-void FastCompressorDXT1::compressBlock(Vector4 colors[16], float weights[16], const CompressionOptions::Private & compressionOptions, void * output)
-{
-    icbc::compress_dxt1(icbc::Quality_Fast, (float*)colors, weights, compressionOptions.colorWeight.component, /*three_color_mode*/true, /*three_color_black*/true, output);
+inline icbc::Quality qualityLevel(const CompressionOptions::Private & compressionOptions) {
+    if (compressionOptions.quality == Quality_Fastest) 
+        return icbc::Quality_Fast;
+    else if (compressionOptions.quality == Quality_Production) 
+        return icbc::Quality_Max;
+    return icbc::Quality_Default;
 }
+
 void CompressorDXT1::compressBlock(Vector4 colors[16], float weights[16], const CompressionOptions::Private & compressionOptions, void * output)
 {
-    auto quality_level = compressionOptions.quality > Quality_Normal ? icbc::Quality_Max : icbc::Quality_Default;
-    icbc::compress_dxt1(quality_level, (float*)colors, weights, compressionOptions.colorWeight.component, /*three_color_mode*/true, /*three_color_black*/true, output);
+    icbc::compress_dxt1(qualityLevel(compressionOptions), (float*)colors, weights, compressionOptions.colorWeight.component, /*three_color_mode*/true, /*three_color_black*/true, output);
 }
 
 
diff --git a/src/nvtt/BlockCompressor.h b/src/nvtt/BlockCompressor.h
index ad24c1b..294531a 100644
--- a/src/nvtt/BlockCompressor.h
+++ b/src/nvtt/BlockCompressor.h
@@ -26,11 +26,6 @@ namespace nv
 
 
     // BC1
-    struct FastCompressorDXT1 : public FloatColorCompressor
-    {
-        virtual void compressBlock(Vector4 colors[16], float weights[16], const nvtt::CompressionOptions::Private & compressionOptions, void * output);
-        virtual uint blockSize(const nvtt::CompressionOptions::Private &) const { return 8; }
-    };
     struct CompressorDXT1 : public FloatColorCompressor
     {
         virtual void compressBlock(Vector4 colors[16], float weights[16], const nvtt::CompressionOptions::Private & compressionOptions, void * output);
diff --git a/src/nvtt/Context.cpp b/src/nvtt/Context.cpp
index 3ee07ed..5e3220c 100644
--- a/src/nvtt/Context.cpp
+++ b/src/nvtt/Context.cpp
@@ -1053,11 +1053,6 @@ CompressorInterface * Compressor::Private::chooseCpuCompressor(const Compression
         else
 #endif
 
-        if (compressionOptions.quality == Quality_Fastest)
-        {
-            return new FastCompressorDXT1;
-        }
-
         return new CompressorDXT1;
     }
     else if (compressionOptions.format == Format_DXT1a)