Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1115)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1116)
@@ -1003,7 +1003,5 @@
   READ_FLAG( uiCode, "vps_base_layer_internal_flag");             pcVPS->setBaseLayerInternalFlag( uiCode ? true : false );
   READ_FLAG( uiCode, "vps_base_layer_available_flag");            pcVPS->setBaseLayerAvailableFlag( uiCode ? true : false );
-#if VPS_AVC_BL_FLAG_REMOVAL
   pcVPS->setNonHEVCBaseLayerFlag( (pcVPS->getBaseLayerAvailableFlag() && !pcVPS->getBaseLayerInternalFlag()) ? true : false);
-#endif
 #else
   READ_CODE( 2,  uiCode,  "vps_reserved_three_2bits" );           assert(uiCode == 3);
@@ -2722,8 +2720,4 @@
   UInt numScalabilityTypes = 0, i = 0, j = 0;
 
-#if !VPS_AVC_BL_FLAG_REMOVAL
-  READ_FLAG( uiCode, "avc_base_layer_flag" ); vps->setAvcBaseLayerFlag(uiCode ? true : false);
-#endif
-
   READ_FLAG( uiCode, "splitting_flag" ); vps->setSplittingFlag(uiCode ? true : false);
 
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1115)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1116)
@@ -498,9 +498,5 @@
 
     // When avc_base_layer_flag is equal to 1, it is a requirement of bitstream conformance that the value of sps_scaling_list_ref_layer_id shall be greater than 0
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( activeVPS->getNonHEVCBaseLayerFlag() )
-#else
-    if( activeVPS->getAvcBaseLayerFlag() )
-#endif
     {
       assert( refLayerId > 0 );
@@ -531,9 +527,5 @@
 
     // When avc_base_layer_flag is equal to 1, it is a requirement of bitstream conformance that the value of sps_scaling_list_ref_layer_id shall be greater than 0
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( activeVPS->getNonHEVCBaseLayerFlag() )
-#else
-    if( activeVPS->getAvcBaseLayerFlag() )
-#endif
     {
       assert( refLayerId > 0 );
@@ -561,9 +553,5 @@
 
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
   if( activeVPS->getNonHEVCBaseLayerFlag() )
-#else
-  if( activeVPS->getAvcBaseLayerFlag() )
-#endif
   {
     TComPic* pBLPic = (*m_ppcTDecTop[0]->getListPic()->begin());
@@ -1389,9 +1377,5 @@
   {
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
     if( m_layerId > 0 && m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getNonHEVCBaseLayerFlag() )
-#else
-    if( m_layerId > 0 && m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getAvcBaseLayerFlag() )
-#endif
     {
       TComPic* pBLPic = (*m_ppcTDecTop[0]->getListPic()->begin());
@@ -1748,9 +1732,5 @@
         UInt refLayerId = pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc);
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
         if( refLayerId == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getNonHEVCBaseLayerFlag() )
-#else
-        if( refLayerId == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getAvcBaseLayerFlag() )
-#endif
         {          
           TComPic* pic = *m_ppcTDecTop[0]->getListPic()->begin();
@@ -1864,9 +1844,5 @@
         UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(i);
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
         if( pcSlice->getVPS()->getRefLayerId( m_layerId, refLayerIdc ) == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getNonHEVCBaseLayerFlag() )
-#else
-        if( pcSlice->getVPS()->getRefLayerId( m_layerId, refLayerIdc ) == 0 && m_parameterSetManagerDecoder.getActiveVPS()->getAvcBaseLayerFlag() )
-#endif
         {
           pcSlice->setBaseColPic ( refLayerIdc, *m_ppcTDecTop[0]->getListPic()->begin() );
@@ -2233,9 +2209,5 @@
 #endif
 #if AVC_BASE
-#if VPS_AVC_BL_FLAG_REMOVAL
       if( m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getNonHEVCBaseLayerFlag() )
-#else
-      if( m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getAvcBaseLayerFlag() )
-#endif
       {
         if( !m_ppcTDecTop[0]->getBLReconFile()->good() )