diff --git a/source/Lib/CommonLib/TrQuant.cpp b/source/Lib/CommonLib/TrQuant.cpp
index e2350390b1cbc58843c65b3755deb7a87b8fccfa..821319c8c50ae259cbb7e3d2e58555d2126e25c6 100644
--- a/source/Lib/CommonLib/TrQuant.cpp
+++ b/source/Lib/CommonLib/TrQuant.cpp
@@ -217,8 +217,7 @@ void TrQuant::init( const Quant* otherQuant,
 #if T0196_SELECTIVE_RDOQ
                     const bool useSelectiveRDOQ,
 #endif
-                    const bool bEnc,
-                    const bool useTransformSkipFast
+                    const bool bEnc
 )
 {
   delete m_quant;
diff --git a/source/Lib/CommonLib/TrQuant.h b/source/Lib/CommonLib/TrQuant.h
index f4da7ed64b7c25ec7afc65bf6c7aa4a0297d94c5..bbcf2c80647ad41fca02427c39978447fd69ac15 100644
--- a/source/Lib/CommonLib/TrQuant.h
+++ b/source/Lib/CommonLib/TrQuant.h
@@ -70,13 +70,12 @@ public:
   void init      (
                     const Quant* otherQuant,
                     const uint32_t uiMaxTrSize,
-                    const bool bUseRDOQ             = false,
-                    const bool bUseRDOQTS           = false,
+                    const bool bUseRDOQ,
+                    const bool bUseRDOQTS,
 #if T0196_SELECTIVE_RDOQ
-                    const bool useSelectiveRDOQ     = false,
+                    const bool useSelectiveRDOQ,
 #endif
-                    const bool bEnc                 = false,
-                    const bool useTransformSkipFast = false
+                    const bool bEnc
   );
   void getTrTypes(const TransformUnit tu, const ComponentID compID, int &trTypeHor, int &trTypeVer);
 
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index e820fbfcf369bb82f6296fee76fc370ea0c0f250..65f7c9a941e261d5c12ff8b06d5345000238c323 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -925,9 +925,9 @@ void DecLib::xActivateParameterSets()
       m_cCuDecoder.initDecCuReshaper(&m_cReshaper, sps->getChromaFormatIdc());
     }
 #if MAX_TB_SIZE_SIGNALLING
-    m_cTrQuant.init( nullptr, sps->getMaxTbSize(), false, false, false, false, false );
+    m_cTrQuant.init( nullptr, sps->getMaxTbSize(), false, false, false, false );
 #else
-    m_cTrQuant.init( nullptr, MAX_TB_SIZEY, false, false, false, false, false );
+    m_cTrQuant.init( nullptr, MAX_TB_SIZEY, false, false, false, false );
 #endif
 
     // RdCost
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 963cd63e6febdf6b87841b3160eec3013afe3fbc..8ab0e9dd82c20cc9d49bae8d5afb73e17f0e8265 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -406,8 +406,7 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
 #if T0196_SELECTIVE_RDOQ
                    m_useSelectiveRDOQ,
 #endif
-                   true,
-                   m_useTransformSkipFast
+                   true
   );
 
   // initialize encoder search class