Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecGop.cpp
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecGop.cpp	(revision 646)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecGop.cpp	(revision 647)
@@ -158,12 +158,10 @@
     rpcPic->setNumDdvCandPics(rpcPic->getDisCandRefPictures(iColPoc));
   }
-#endif
-#if MTK_NBDV_TN_FIX_E0172 
+
   if(pcSlice->getViewIndex() && !pcSlice->getIsDepth() && !pcSlice->isIntra()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.
   {
     rpcPic->checkTemporalIVRef();
   }
-#endif
-#if MTK_TEXTURE_MRGCAND_BUGFIX_E0182
+
   if(pcSlice->getIsDepth())
   {
Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecSbac.cpp
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecSbac.cpp	(revision 646)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecSbac.cpp	(revision 647)
@@ -1207,7 +1207,4 @@
   if( puIdx == 2 )
   {
-#if !LGE_SDC_REMOVE_DC_E0158
-    while( binNum < 2 && symbol )
-#endif
     {
       ctxDepthMode = puIdx*3 + binNum;
@@ -1217,10 +1214,5 @@
     }
          if( modeCode == 0 ) { dir = PLANAR_IDX; sdcFlag = 1;}
-#if LGE_SDC_REMOVE_DC_E0158
     else if( modeCode == 1 ) { dir = 0;          sdcFlag = 0;}
-#else
-    else if( modeCode == 2 ) { dir = 0;          sdcFlag = 0;}
-    else if( modeCode == 3 ) { dir =     DC_IDX; sdcFlag = 1;}
-#endif
   }
   else if( puIdx == 0 )
Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecTop.cpp	(revision 646)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibDecoder/TDecTop.cpp	(revision 647)
@@ -979,5 +979,5 @@
     pcSlice->setIvPicLists( m_ivPicLists );         
 #if H_3D_IV_MERGE
-#if H_3D_FCO_E0163
+#if H_3D_FCO
     //assert( !getIsDepth() );
 #else