diff --git a/source/App/DecoderApp/DecApp.cpp b/source/App/DecoderApp/DecApp.cpp
index 974ca4cea7b8c72d6c356804cd15c4327fcf13d9..bafbc99b71590f47888ca4291d4b606bf6087e26 100644
--- a/source/App/DecoderApp/DecApp.cpp
+++ b/source/App/DecoderApp/DecApp.cpp
@@ -272,13 +272,11 @@ uint32_t DecApp::decode()
         xWriteOutput( pcListPic, nalu.m_temporalId );
       }
     }
-#if JVET_Q0488_SEI_REPETITION_CONSTRAINT
     if( bNewPicture )
     {
       m_cDecLib.checkSeiInPictureUnit();
       m_cDecLib.resetPictureSeiNalus();
     }
-#endif
 #if JVET_R0201_PREFIX_SUFFIX_APS_CLEANUP
     if (bNewPicture || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS)
     {
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 8215981238cb46fba7340eceaa26e9874d852e24..0d57bfcc137f62ff9ec55dd68896f4d721963989 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -80,7 +80,6 @@
 
 
 
-#define JVET_Q0488_SEI_REPETITION_CONSTRAINT              1 // JVET-Q0488: SEI repetition constraint
 
 #define JVET_R0332_HLS_ORDER                              1 // JVET-R0332: Grouping syntax elements in SPS based on slice type
 
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index b17e7c34d44b5cbefabea8df3eef2488433fd1e9..65482d091ae0909d57f5c29df838d484cd680eee 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -1014,7 +1014,6 @@ void DecLib::checkSEIInAccessUnit()
   }
 }
 
-#if JVET_Q0488_SEI_REPETITION_CONSTRAINT
 #define SEI_REPETITION_CONSTRAINT_LIST_SIZE  21
 
 /**
@@ -1122,7 +1121,6 @@ void DecLib::resetPictureSeiNalus()
   }
 }
 
-#endif
 /**
  - Determine if the first VCL NAL unit of a picture is also the first VCL NAL of an Access Unit
  */
@@ -2766,17 +2764,13 @@ bool DecLib::decode(InputNALUnit& nalu, int& iSkipFrame, int& iPOCLastDisplay, i
     case NAL_UNIT_PREFIX_SEI:
       // Buffer up prefix SEI messages until SPS of associated VCL is known.
       m_prefixSEINALUs.push_back(new InputNALUnit(nalu));
-#if JVET_Q0488_SEI_REPETITION_CONSTRAINT
       m_pictureSeiNalus.push_back(new InputNALUnit(nalu));
-#endif
       return false;
 
     case NAL_UNIT_SUFFIX_SEI:
       if (m_pcPic)
       {
-#if JVET_Q0488_SEI_REPETITION_CONSTRAINT
         m_pictureSeiNalus.push_back(new InputNALUnit(nalu));
-#endif
         m_accessUnitSeiTids.push_back(nalu.m_temporalId);
         const SPS *sps = m_parameterSetManager.getActiveSPS();
         const VPS *vps = m_parameterSetManager.getVPS(sps->getVPSId());
diff --git a/source/Lib/DecoderLib/DecLib.h b/source/Lib/DecoderLib/DecLib.h
index da48efb895d37d73478467af8b17847bfd39dca1..1d9569feb01363f02a21c2192db349731d10587a 100644
--- a/source/Lib/DecoderLib/DecLib.h
+++ b/source/Lib/DecoderLib/DecLib.h
@@ -178,9 +178,7 @@ private:
 #if JVET_R0201_PREFIX_SUFFIX_APS_CLEANUP
   std::vector<NalUnitType> m_pictureUnitNals;
 #endif
-#if JVET_Q0488_SEI_REPETITION_CONSTRAINT
   std::list<InputNALUnit*> m_pictureSeiNalus; 
-#endif 
 
   VPS*                    m_vps;
   int                     m_maxDecSubPicIdx;
@@ -242,10 +240,8 @@ public:
   void checkIncludedInFirstAu();
   void CheckNoOutputPriorPicFlagsInAccessUnit();
   void resetAccessUnitNoOutputPriorPicFlags() { m_accessUnitNoOutputPriorPicFlags.clear(); }
-#if JVET_Q0488_SEI_REPETITION_CONSTRAINT
   void checkSeiInPictureUnit();
   void resetPictureSeiNalus();
-#endif 
   bool isSliceNaluFirstInAU( bool newPicture, InputNALUnit &nalu );
 
 #if JVET_R0201_PREFIX_SUFFIX_APS_CLEANUP