Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1118)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1119)
@@ -2321,5 +2321,4 @@
     assert( vps->getVpsNumRepFormats() > 0 && vps->getVpsNumRepFormats() <= 256 );
 
-#if O0096_REP_FORMAT_INDEX
 #if !VPS_EXTN_UEV_CODING
     WRITE_CODE( vps->getVpsNumRepFormats() - 1, 8, "vps_num_rep_formats_minus1" );
@@ -2327,7 +2326,5 @@
     WRITE_UVLC( vps->getVpsNumRepFormats() - 1, "vps_num_rep_formats_minus1" );
 #endif
-#else
-    WRITE_CODE( vps->getVpsNumRepFormats() - 1, 4, "vps_num_rep_formats_minus1" );
-#endif
+
   }
   for(i = 0; i < vps->getVpsNumRepFormats(); i++)
@@ -2343,5 +2340,4 @@
       if( vps->getVpsNumRepFormats() > 1 )
       {
-#if O0096_REP_FORMAT_INDEX
 #if !VPS_EXTN_UEV_CODING
         WRITE_CODE( vps->getVpsRepFormatIdx(i), 8, "vps_rep_format_idx[i]" );
@@ -2354,12 +2350,10 @@
         WRITE_CODE( vps->getVpsRepFormatIdx(i), numBits, "vps_rep_format_idx[i]" );
 #endif
-#else
-        WRITE_CODE( vps->getVpsRepFormatIdx(i), 4, "vps_rep_format_idx[i]" );
-#endif
-      }
-    }
-  }
-#endif
-#endif
+
+      }
+    }
+  }
+#endif
+#endif //REPN_FORMAT_IN_VPS
 
   WRITE_FLAG(vps->getMaxOneActiveRefLayerFlag(), "max_one_active_ref_layer_flag");
Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp	(revision 1118)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp	(revision 1119)
@@ -1491,32 +1491,11 @@
 Void TEncTop::xInitILRP()
 {
-#if O0096_REP_FORMAT_INDEX
   RepFormat *repFormat = m_cVPS.getVpsRepFormat( m_cSPS.getUpdateRepFormatFlag() ? m_cSPS.getUpdateRepFormatIndex() : m_cVPS.getVpsRepFormatIdx( m_cVPS.getLayerIdxInVps(m_layerId) ) );
-#else
-  RepFormat *repFormat = m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_cVPS.getLayerIdxInVps(m_layerId) ) );
-#endif
   Int bitDepthY,bitDepthC,picWidth,picHeight;
 
-#if O0096_REP_FORMAT_INDEX
   bitDepthY   = repFormat->getBitDepthVpsLuma();
   bitDepthC   = repFormat->getBitDepthVpsChroma();
   picWidth    = repFormat->getPicWidthVpsInLumaSamples();
   picHeight   = repFormat->getPicHeightVpsInLumaSamples();
-#else
-  if( m_cSPS.getUpdateRepFormatFlag() )
-  {
-    bitDepthY   = m_cSPS.getBitDepthY();
-    bitDepthC   = m_cSPS.getBitDepthC();
-    picWidth    = m_cSPS.getPicWidthInLumaSamples();
-    picHeight   = m_cSPS.getPicHeightInLumaSamples();
-  }
-  else
-  {
-    bitDepthY   = repFormat->getBitDepthVpsLuma();
-    bitDepthC   = repFormat->getBitDepthVpsChroma();
-    picWidth    = repFormat->getPicWidthVpsInLumaSamples();
-    picHeight   = repFormat->getPicHeightVpsInLumaSamples();
-  }
-#endif
   
   if(m_layerId > 0)