diff --git a/source/Lib/CommonLib/LoopFilter.cpp b/source/Lib/CommonLib/LoopFilter.cpp
index 68d2303bf8c78988d1c122456973776b74d23d21..a4b47b866e3a8ec74a785e9ad82b61b9348b661d 100644
--- a/source/Lib/CommonLib/LoopFilter.cpp
+++ b/source/Lib/CommonLib/LoopFilter.cpp
@@ -303,10 +303,6 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
     }
   }
 
-#if DB_TU_FIX==0
-  const unsigned PartIdxIncr  = ( cu.cs->pcv->noRQT && cu.cs->pcv->only2Nx2N ? 1 : ( DEBLOCK_SMALLEST_BLOCK / uiPelsInPart ? DEBLOCK_SMALLEST_BLOCK / uiPelsInPart : 1 ) );
-  const unsigned uiSizeInPU   = ( cu.cs->pcv->noRQT && cu.cs->pcv->only2Nx2N ? 1 : pcv.partsInCtuWidth >> cu.qtDepth );
-#endif
   const unsigned shiftFactor  = edgeDir == EDGE_VER ? ::getComponentScaleX( COMPONENT_Cb, pcv.chrFormat ) : ::getComponentScaleY( COMPONENT_Cb, pcv.chrFormat );
   const bool bAlwaysDoChroma  = pcv.chrFormat == CHROMA_444 || pcv.noRQT;
 
@@ -321,7 +317,6 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
       return;
   }
 
-#if DB_TU_FIX
   unsigned int orthogonalLength = 1;
   unsigned int orthogonalIncrement = 1;
 
@@ -350,20 +345,6 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
       xEdgeFilterChroma(cu, edgeDir, edge);
     }
   }
-#else
-  for( int iEdge = 0; iEdge < uiSizeInPU; iEdge += PartIdxIncr )
-  {
-    if( cu.blocks[COMPONENT_Y].valid() )
-    {
-      xEdgeFilterLuma  ( cu, edgeDir, iEdge );
-    }
-
-    if( cu.blocks[COMPONENT_Cb].valid() && pcv.chrFormat != CHROMA_400 && ( bAlwaysDoChroma || ( uiPelsInPart > DEBLOCK_SMALLEST_BLOCK ) || ( iEdge % ( ( DEBLOCK_SMALLEST_BLOCK << shiftFactor ) / uiPelsInPart ) ) == 0 ) )
-    {
-      xEdgeFilterChroma( cu, edgeDir, iEdge );
-    }
-  }
-#endif
 }
 
 
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 92a614c704b1a48c4f2bea201ec48de1d31726bb..7e7eb2065a598b336573f8ec7d7a0aa779ed6192 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -55,7 +55,6 @@
 
 
 
-#define DB_TU_FIX                                         1 // fix in JVET_K0307, JVET-K0237, JVET-K0369, JVET-K0232, JVET-K0315
 
 #define JVET_K0190                                        1 //Only Keep CCLM