diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 162d0326b09314c2aa28fb84c89a5a064496d424..7974ccfa009914d72e9a432526197ee1ea1f053c 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -3912,32 +3912,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, PicHeader* picHeader, Par
 #endif
   {
     uint32_t bitsSubPicId;
-#if JVET_Q0119_CLEANUPS
-    if (sps->getSubPicIdMappingExplicitlySignalledFlag())
-#else
-    if (sps->getSubPicIdSignallingPresentFlag())
-#endif
-    {
-      bitsSubPicId = sps->getSubPicIdLen();
-    }
-#if !JVET_Q0119_CLEANUPS
-    else if (picHeader->getSubPicIdSignallingPresentFlag())
-    {
-      bitsSubPicId = picHeader->getSubPicIdLen();
-    }
-#endif
-#if JVET_Q0119_CLEANUPS
-    else if (pps->getSubPicIdMappingInPpsFlag())
-#else
-    else if (pps->getSubPicIdSignallingPresentFlag())
-#endif
-    {
-      bitsSubPicId = pps->getSubPicIdLen();
-    }
-    else
-    {
-      bitsSubPicId = ceilLog2(sps->getNumSubPics());
-    }
+    bitsSubPicId = sps->getSubPicIdLen();
     READ_CODE(bitsSubPicId, uiCode, "slice_subpic_id");    pcSlice->setSliceSubPicId(uiCode);
   }
 #if JVET_Q0119_CLEANUPS
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index c4a8b2ed075f1528e78524bf353ac959b094c5c8..e9136c655196566e5935beb13e721622398e3eaa 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -2732,32 +2732,7 @@ void HLSWriter::codeSliceHeader         ( Slice* pcSlice )
 #endif
   {
     uint32_t bitsSubPicId;
-#if JVET_Q0119_CLEANUPS
-    if (pcSlice->getSPS()->getSubPicIdMappingExplicitlySignalledFlag())
-#else
-    if (pcSlice->getSPS()->getSubPicIdSignallingPresentFlag())
-#endif
-    {
-      bitsSubPicId = pcSlice->getSPS()->getSubPicIdLen();
-    }
-#if !JVET_Q0119_CLEANUPS
-    else if (picHeader->getSubPicIdSignallingPresentFlag())
-    {
-      bitsSubPicId = picHeader->getSubPicIdLen();
-    }
-#endif
-#if JVET_Q0119_CLEANUPS
-    else if (pcSlice->getPPS()->getSubPicIdMappingInPpsFlag())
-#else
-    else if (pcSlice->getPPS()->getSubPicIdSignallingPresentFlag())
-#endif
-    {
-      bitsSubPicId = pcSlice->getPPS()->getSubPicIdLen();
-    }
-    else
-    {
-      bitsSubPicId = ceilLog2(pcSlice->getSPS()->getNumSubPics());
-    }
+    bitsSubPicId = pcSlice->getSPS()->getSubPicIdLen();
     WRITE_CODE(pcSlice->getSliceSubPicId(), bitsSubPicId, "slice_subpic_id");
   }