Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1106)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1107)
@@ -1475,9 +1475,5 @@
           for(Int kk = 0; kk < pcSlice->getVPS()->getNumLayersInIdList(layerSetIdxForOutputLayerSet); kk++)
           {
-#if R0235_SMALLEST_LAYER_ID
             if( pcSlice->getVPS()->getNecessaryLayerFlag(ii, kk) && pcSlice->getLayerId() == pcSlice->getVPS()->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, kk) )
-#else
-            if(pcSlice->getLayerId() == pcSlice->getVPS()->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, kk))
-#endif
             {
               chkAssert=1;
@@ -3102,18 +3098,15 @@
         //If OpTid of the output operation point is equal to vps_max_sub_layer_minus1, the conformance is indicated by general_profile_idc being equal to 7 or general_profile_compatibility_flag[ 7 ] being equal to 1
         //The following assert may be updated / upgraded to take care of general_profile_compatibility_flag.
-#if R0235_SMALLEST_LAYER_ID
+
         // The assertion below is not valid for independent non-base layers 
         if (vps->getNumAddLayerSets() == 0)
         {
-#endif
-        if( j > 0 && vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j) != 0 && vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j - 1) != 0 && vps->getNecessaryLayerFlag(i, j-1) )
-        {
-          assert(vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL()->getProfileIdc() == vps->getPTL(vps->getProfileLevelTierIdx(i, j - 1))->getGeneralPTL()->getProfileIdc() ||
-                 vps->getPTL(vps->getProfileLevelTierIdx(i, j - 1))->getGeneralPTL()->getProfileCompatibilityFlag(vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL()->getProfileIdc()) ||  
-                 vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL()->getProfileCompatibilityFlag(vps->getPTL(vps->getProfileLevelTierIdx(i, j - 1))->getGeneralPTL()->getProfileIdc())  );
-        }
-#if R0235_SMALLEST_LAYER_ID
-        }
-#endif
+          if( j > 0 && vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j) != 0 && vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j - 1) != 0 && vps->getNecessaryLayerFlag(i, j-1) )
+          {
+            assert(vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL()->getProfileIdc() == vps->getPTL(vps->getProfileLevelTierIdx(i, j - 1))->getGeneralPTL()->getProfileIdc() ||
+              vps->getPTL(vps->getProfileLevelTierIdx(i, j - 1))->getGeneralPTL()->getProfileCompatibilityFlag(vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL()->getProfileIdc()) ||  
+              vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL()->getProfileCompatibilityFlag(vps->getPTL(vps->getProfileLevelTierIdx(i, j - 1))->getGeneralPTL()->getProfileIdc())  );
+          }
+        }
 #endif
       }
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1106)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1107)
@@ -91,7 +91,5 @@
 #if SVC_EXTENSION 
   m_layerId = 0;
-#if R0235_SMALLEST_LAYER_ID
   m_smallestLayerId = 0;
-#endif
 #if AVC_BASE
   m_pBLReconFile = NULL;
@@ -736,5 +734,4 @@
 #if OUTPUT_LAYER_SET_INDEX
   // Following check should go wherever the VPS is activated
-#if R0235_SMALLEST_LAYER_ID
   if (!m_apcSlicePilot->getVPS()->getBaseLayerAvailableFlag())
   {
@@ -747,7 +744,4 @@
     }
   }  
-#else
-  checkValueOfTargetOutputLayerSetIdx( m_apcSlicePilot->getVPS());
-#endif
 #endif
   m_apcSlicePilot->initSlice( nalu.m_layerId );
@@ -876,9 +870,5 @@
 #if NO_OUTPUT_OF_PRIOR_PICS
 #if NO_CLRAS_OUTPUT_FLAG
-#if R0235_SMALLEST_LAYER_ID
   if (m_layerId == m_smallestLayerId && m_apcSlicePilot->getRapPicFlag())
-#else
-  if (m_layerId == 0 && m_apcSlicePilot->getRapPicFlag() )
-#endif
   {
     if (m_bFirstSliceInSequence)
@@ -912,9 +902,5 @@
   }
 
-#if R0235_SMALLEST_LAYER_ID
   m_apcSlicePilot->decodingRefreshMarking( m_cListPic, m_noClrasOutputFlag, m_smallestLayerId );
-#else
-  m_apcSlicePilot->decodingRefreshMarking( m_cListPic, m_noClrasOutputFlag );
-#endif
 #endif
 
@@ -2067,5 +2053,5 @@
   m_cEntropyDecoder.decodeVPS( vps );
   m_parameterSetManagerDecoder.storePrefetchedVPS(vps);
-#if R0235_SMALLEST_LAYER_ID
+#if SVC_EXTENSION
   checkValueOfTargetOutputLayerSetIdx(vps);
 #endif
@@ -2243,4 +2229,5 @@
       TComCodingStatistics::IncrementStatisticEP(STATS__BYTE_ALIGNMENT_BITS,nalu.m_Bitstream->readByteAlignment(),0);
 #endif
+#if SVC_EXTENSION
 #if Q0177_EOS_CHECKS
       m_isLastNALWasEos = false;
@@ -2265,5 +2252,4 @@
       }
 #endif
-#if R0235_SMALLEST_LAYER_ID
       xDeriveSmallestLayerId(m_parameterSetManagerDecoder.getPrefetchedVPS(0));
 #endif
@@ -2696,7 +2682,5 @@
   {
     // Check if the target decoded layer is the highest layer in the list
-#if R0235_SMALLEST_LAYER_ID
     assert( params->getTargetOutputLayerSetIdx() < vps->getNumOutputLayerSets() );
-#endif
 #if !CONFORMANCE_BITSTREAM_MODE
     assert( params->getTargetOutputLayerSetIdx() < vps->getNumLayerSets() );
@@ -2705,18 +2689,4 @@
 #if !CONFORMANCE_BITSTREAM_MODE
     assert( params->getTargetLayerId() == vps->getNumLayersInIdList( layerSetIdx ) - 1);
-#endif
-    
-#if !R0235_SMALLEST_LAYER_ID
-    Bool layerSetMatchFlag = true;
-    for(Int j = 0; j < vps->getNumLayersInIdList( layerSetIdx ); j++)
-    {
-      if( vps->getLayerSetLayerIdList( layerSetIdx, j ) != j )
-      {
-        layerSetMatchFlag = false;
-        break;
-      }
-    }
-
-    assert(layerSetMatchFlag);    // Signaled output layer set index does not match targetOutputLayerId.
 #endif
     
@@ -2803,9 +2773,5 @@
 Void TDecTop::xCheckLayerReset()
 {
-#if R0235_SMALLEST_LAYER_ID
   if (m_apcSlicePilot->isIRAP() && m_layerId > m_smallestLayerId)
-#else
-  if (m_apcSlicePilot->isIRAP() && m_layerId > 0)
-#endif
   {
     Bool layerResetFlag;
@@ -2891,5 +2857,5 @@
 #endif
 
-#if R0235_SMALLEST_LAYER_ID
+#if SVC_EXTENSION
 Void TDecTop::xDeriveSmallestLayerId(TComVPS* vps)
 {
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 1106)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 1107)
@@ -133,7 +133,5 @@
   UInt                    m_numLayer;
   TDecTop**               m_ppcTDecTop;
-#if R0235_SMALLEST_LAYER_ID
   UInt                    m_smallestLayerId;
-#endif
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
   Bool                    m_pocResettingFlag;
@@ -245,7 +243,5 @@
   Void      setLayerDec                     (TDecTop **p)                   { m_ppcTDecTop = p;                }
   TDecTop*  getLayerDec                     (UInt layerId)                  { return m_ppcTDecTop[layerId];    }
-#if R0235_SMALLEST_LAYER_ID
   Void      xDeriveSmallestLayerId(TComVPS* vps);
-#endif
 #if VPS_EXTN_DIRECT_REF_LAYERS
   TDecTop*  getRefLayerDec                  (UInt refLayerIdx);
@@ -288,5 +284,4 @@
 #if CONFORMANCE_BITSTREAM_MODE
   std::vector<TComPic>* getConfListPic() {return &m_confListPic; }
-  // std::string const getDecodedYuvLayerFileName(Int layerId) { return m_decodedYuvLayerFileName[layerId]; }
   Bool const getConfModeFlag() { return m_confModeFlag; }
   Void setConfModeFlag(Bool x) { m_confModeFlag = x; }