Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1115)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1116)
@@ -2005,7 +2005,4 @@
 #if VPS_EXTN_MASK_AND_DIM_INFO
   UInt i = 0, j = 0;
-#if !VPS_AVC_BL_FLAG_REMOVAL
-  WRITE_FLAG( vps->getAvcBaseLayerFlag(),              "avc_base_layer_flag" );
-#endif
 
   WRITE_FLAG( vps->getSplittingFlag(),                 "splitting_flag" );
Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 1115)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 1116)
@@ -1290,9 +1290,5 @@
       // inferring of the scaling list can be moved to the config file
       UInt refLayerId = 0;
-#if VPS_AVC_BL_FLAG_REMOVAL
       if( m_layerId > 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() && m_pcEncTop->getVPS()->getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
-#else
-      if( m_layerId > 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() && m_pcEncTop->getVPS()->getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
-#endif
       {
         m_pcEncTop->getSPS()->setInferScalingListFlag( true );
@@ -1324,9 +1320,5 @@
       // inferring of the scaling list can be moved to the config file
       UInt refLayerId = 0;
-#if VPS_AVC_BL_FLAG_REMOVAL
       if( m_layerId > 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() && m_pcEncTop->getVPS()->getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
-#else
-      if( m_layerId > 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() && m_pcEncTop->getVPS()->getRecursiveRefLayerFlag( m_layerId, refLayerId ) )
-#endif
       {
         m_pcEncTop->getSPS()->setInferScalingListFlag( true );
@@ -2292,9 +2284,5 @@
 
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( m_layerId == 0 && m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() )
-#else
-    if( m_layerId == 0 && m_pcEncTop->getVPS()->getAvcBaseLayerFlag() )
-#endif
     {
       pcPic->getPicYuvOrg()->copyToPic( pcPic->getPicYuvRec() );
@@ -2388,9 +2376,5 @@
       OutputNALUnit nalu( NAL_UNIT_VPS, 0, 0 ); // The value of nuh_layer_id of VPS NAL unit shall be equal to 0.
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
       if( ( m_layerId > 0 && m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getNonHEVCBaseLayerFlag() ) )
-#else
-      if( ( m_layerId > 0 && m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) )
-#endif
 #else
       if( m_layerId == 0 )