diff --git a/source/Lib/CommonLib/Picture.cpp b/source/Lib/CommonLib/Picture.cpp
index 4fd8f73d7d9c799c707d1cec9c87b4065aa092a5..4f1abcf415663388846c46652e071d0ddf3c76dc 100644
--- a/source/Lib/CommonLib/Picture.cpp
+++ b/source/Lib/CommonLib/Picture.cpp
@@ -1003,8 +1003,6 @@ void Picture::finishParallelPart( const UnitArea& area )
     const int destID = scheduler.getSplitPicId( tId );
 
     M_BUFS( destID, PIC_RECONSTRUCTION ).subBuf( clipdArea ).copyFrom( M_BUFS( sourceID, PIC_RECONSTRUCTION ).subBuf( clipdArea ) );
-    M_BUFS( destID, PIC_PREDICTION     )                    .copyFrom( M_BUFS( sourceID, PIC_PREDICTION     )                     );
-    M_BUFS( destID, PIC_RESIDUAL       )                    .copyFrom( M_BUFS( sourceID, PIC_RESIDUAL       )                     );
   }
 }
 
diff --git a/source/Lib/EncoderLib/EncCu.cpp b/source/Lib/EncoderLib/EncCu.cpp
index 1ec435fdfe4624908eb6208928aba5f38b18fa14..39c6a5e43f2da57a27ea220cea09c076fbaf948b 100644
--- a/source/Lib/EncoderLib/EncCu.cpp
+++ b/source/Lib/EncoderLib/EncCu.cpp
@@ -1164,11 +1164,8 @@ void EncCu::copyState( EncCu* other, Partitioner& partitioner, const UnitArea& c
     const CodingStructure* src = other->m_pBestCS[wIdx][hIdx];
     bool keepResi = KEEP_PRED_AND_RESI_SIGNALS;
 
-#if JVET_M0427_INLOOP_RESHAPER
-    dst->useSubStructure( *src, partitioner.chType, currArea, true, true, keepResi, true );
-#else
     dst->useSubStructure( *src, partitioner.chType, currArea, KEEP_PRED_AND_RESI_SIGNALS, true, keepResi, keepResi );
-#endif
+
     dst->cost           =  src->cost;
     dst->dist           =  src->dist;
     dst->fracBits       =  src->fracBits;