Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h	(revision 541)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h	(revision 542)
@@ -60,5 +60,5 @@
 #define HM_VERSION        "11.0"                ///< 
 #else
-#define NV_VERSION        "10.1"                 ///< Current software version
+#define NV_VERSION        "11.0"                 ///< Current software version
 #endif
 
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp	(revision 541)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp	(revision 542)
@@ -3095,18 +3095,6 @@
 #endif
         //pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
-#if H_3D_CLEANUPS //Notes from QC: for BVSP coded blocks, the reference index shall not be equal to -1 due to the adoption of JCT3V-D0191
+#if H_3D //Notes from QC: for BVSP coded blocks, the reference index shall not be equal to -1 due to the adoption of JCT3V-D0191
         pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
-#else
-        if (pcMvFieldNeighbours[iCount<<1].getRefIdx()<0)
-        {
-          for (Int i=0; i<getSlice()->getNumRefIdx(REF_PIC_LIST_0); i++)
-          {
-            if (getSlice()->getRefPOC(REF_PIC_LIST_0, i) == getSlice()->getPOC())
-            {
-              pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,i);
-              break;
-            }
-          }
-        }
 #endif
       }
@@ -3124,27 +3112,7 @@
           clipMv(cMvPred);
 #endif
-          //pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
-#if H_3D_CLEANUPS
           pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
-#else
-          if (pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx()<0)
-          {
-            for (Int i=0; i<getSlice()->getNumRefIdx(REF_PIC_LIST_1); i++)
-            {
-              if (getSlice()->getRefPOC(REF_PIC_LIST_1, i) == getSlice()->getPOC())
-              {
-                pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,i);
-                break;
-              }
-            }
-          }
-#endif
         }
       }
-#if !H_3D_CLEANUPS
-      if (!((pcMvFieldNeighbours[iCount<<1].getRefIdx()<0 && !getSlice()->isInterB())
-        || (pcMvFieldNeighbours[iCount<<1].getRefIdx()<0 && pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx()<0 && getSlice()->isInterB())))
-      {
-#endif
 #if H_3D_NBDV
       pcMvFieldNeighbours[iCount<<1    ].getMv().setIDVFlag (false);
@@ -3156,11 +3124,4 @@
       }
       iCount ++;
-#if !H_3D_CLEANUPS
-      }
-      else
-      {
-        assert(0);
-      }
-#endif
     }
   }
@@ -3174,9 +3135,6 @@
     
   Int iPdmInterDir;
-#if H_3D_CLEANUPS
+
   if( iPdmDir[0] )
-#else
-  if( iPdmDir[0] && ivMvPredFlag )
-#endif
   {
     abCandIsInter        [ iCount ] = true;
@@ -3199,5 +3157,4 @@
     iCount ++;
   } 
-#if H_3D_CLEANUPS
   // early termination
   if (iCount == getSlice()->getMaxNumMergeCand()) 
@@ -3206,25 +3163,5 @@
   }
 #endif
-#endif
-
-#if !H_3D_IV_MERGE
-#if H_3D_NBDV //Notes from QC: DvMCP related variables.  
-  //acPdmMv[0].m_bDvMcp = acPdmMv[1].m_bDvMcp = acPdmMv[2].m_bDvMcp = acPdmMv[3].m_bDvMcp = false; 
-#endif
-
-#if H_3D_NBDV //Notes from QC: Some examples to show how to use the NBDV and DoNBDV variables. Remove this comment once it is done 
-  DisInfo cDisInfo;
-  cDisInfo.bDV = false; 
-  //if(!bNoPdmMerge) 
-  //{
-    //cDisInfo.bDV = getDvInfo(uiAbsPartIdx).bDV;
-    //cDisInfo.m_aVIdxCan = getDvInfo(uiAbsPartIdx).m_aVIdxCan;
-    //cDisInfo.m_acNBDV = getDvInfo(uiAbsPartIdx).m_acNBDV;
-//#if H_3D_NBDV_REF
-    //cDisInfo.m_acDoNBDV = getDvInfo(uiAbsPartIdx).m_acDoNBDV;
-//#endif
-  //}
-#endif
-#endif
+
   //left
   UInt uiLeftPartIdx = 0;
@@ -3402,9 +3339,5 @@
 
 #if H_3D_IV_MERGE 
-#if H_3D_CLEANUPS
   if( iPdmDir[1] )
-#else
-  if(ivMvPredFlag && iPdmDir[1] )
-#endif
   {
     assert(iCount < getSlice()->getMaxNumMergeCand());
@@ -5087,24 +5020,14 @@
           clipMv( cDispVec );
           pDInfo->m_acNBDV = cDispVec;
-#if H_3D_CLEANUPS
           pDInfo->m_aVIdxCan = cIDVInfo.m_aVIdxCan[iList][ curPos ];
           assert(pDInfo->m_aVIdxCan == 0); //Notes from QC: only works for CTC
-#else
-          pDInfo->m_aVIdxCan = 0;
-#endif
 #if H_3D_NBDV_REF
-#if H_3D_CLEANUPS
           TComPic* picDepth = getSlice()->getIvPic( true, pDInfo->m_aVIdxCan );
-#else
-          TComPic* picDepth = getSlice()->getIvPic( true, 0 );
-#endif
           assert(picDepth!=NULL);
 
           if (picDepth && bDepthRefine)
-#if H_3D_CLEANUPS
+          {
             estimateDVFromDM (pDInfo->m_aVIdxCan, uiPartIdx, picDepth, uiPartAddr, &cDispVec);
-#else
-            estimateDVFromDM(0, uiPartIdx, picDepth, uiPartAddr, &cDispVec ); // from base view
-#endif
+          }
           pDInfo->m_acDoNBDV = cDispVec;
 #endif
@@ -5338,35 +5261,5 @@
 {
   TComSlice*    pcSlice         = getSlice ();  
-#if H_3D_CLEANUPS //Notes from QC: to be aligned with the spec. 
   Int iViewIndex = pDInfo->m_aVIdxCan;
-#else
-  Bool valid     = false;
-
-  Int iViewIndex = 0;
-
-  for( UInt uiBIndex = 0; uiBIndex < pcSlice->getViewIndex( ) && !valid; uiBIndex++ )
-  {
-    UInt        uiBaseIndex = uiBIndex;    
-    TComPic*    pcBasePic   = pcSlice->getIvPic( false, uiBaseIndex );
-    for( Int iRefListId = 0; iRefListId < 2 && !valid; iRefListId++ )
-    {
-      RefPicList  eRefPicListTest = RefPicList( iRefListId );
-      Int         iNumRefPics = pcSlice->getNumRefIdx( eRefPicListTest ) ;
-      for( Int iRefIndex = 0; iRefIndex < iNumRefPics; iRefIndex++ )
-      { 
-        if(pcBasePic->getPOC() == pcSlice->getRefPic( eRefPicListTest, iRefIndex )->getPOC() 
-          && pcBasePic->getViewIndex() == pcSlice->getRefPic( eRefPicListTest, iRefIndex )->getViewIndex())
-        {
-          valid = true;
-          iViewIndex = uiBaseIndex;
-          break;
-        }
-      }
-    }
-  }
-
-  if (!valid)
-    return false;
-#endif
   //--- get base CU/PU and check prediction mode ---
   TComPic*    pcBasePic   = pcSlice->getIvPic( false, iViewIndex );
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp	(revision 541)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp	(revision 542)
@@ -118,5 +118,5 @@
 , m_icSkipParseFlag               ( false )
 #endif
-#if H_3D_GEN
+#if H_3D
 , m_depthToDisparityB             ( NULL )
 , m_depthToDisparityF             ( NULL )
@@ -158,5 +158,5 @@
   delete[] m_puiSubstreamSizes;
   m_puiSubstreamSizes = NULL;
-#if H_3D_GEN    
+#if H_3D
   for( UInt i = 0; i < getViewIndex(); i++ )
   {
@@ -1529,5 +1529,5 @@
 #endif
   }
-#if H_3D_GEN
+#if H_3D
   for( Int i = 0; i < MAX_NUM_LAYERS; i++ )
   {
@@ -2636,5 +2636,5 @@
 }
 #endif
-#if H_3D_GEN
+#if H_3D
 Void TComSlice::setIvPicLists( TComPicLists* m_ivPicLists )
 {
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h	(revision 541)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h	(revision 542)
@@ -1568,5 +1568,5 @@
   Bool      m_icSkipParseFlag;
 #endif
-#if H_3D_GEN
+#if H_3D
   TComPic*   m_ivPicsCurrPoc [2][MAX_NUM_LAYERS];  
   Int**      m_depthToDisparityB; 
@@ -1630,5 +1630,5 @@
   TComPic*  getRefPic           ( RefPicList e, Int iRefIdx)    { return  m_apcRefPicList[e][iRefIdx];  }
   Int       getRefPOC           ( RefPicList e, Int iRefIdx)    { return  m_aiRefPOCList[e][iRefIdx];   }
-#if H_3D_GEN
+#if H_3D
   TComPic*  getIvPic            ( Bool depthFlag, Int viewIndex){ return  m_ivPicsCurrPoc[ depthFlag ? 1 : 0 ][ viewIndex ]; }
 #endif
@@ -1849,5 +1849,5 @@
 #endif
 #endif
-#if H_3D_GEN
+#if H_3D
   Void    setIvPicLists( TComPicLists* m_ivPicLists );
   Void    setDepthToDisparityLUTs();
Index: branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h	(revision 541)
+++ branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h	(revision 542)
@@ -55,5 +55,5 @@
 
 #ifndef HEVC_EXT
-#define HEVC_EXT                    2
+#define HEVC_EXT                    1
 #endif
 
@@ -76,5 +76,4 @@
                                               // HHI_QTLPC_RAU_OFF_C0160     // JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units 
 
-#define H_3D_PDM_CAM_PARAS                0 ///< PDM related parts of camera parameters, should be removed if not used anymore.
 #define H_3D_VSO                          1   // VSO, View synthesis optimization, includes: 
                                               // HHI_VSO
@@ -110,14 +109,4 @@
                                               // LG_D0092: Multiple VSP candidate allowed
 
-#if H_3D_VSP
-#define H_3D_VSP_POSITION                 3   // The only supported position
-#define H_3D_VSP_BLOCKSIZE                4   // Supported values: 1, 2, and 4
-#if H_3D_VSP_BLOCKSIZE == 1
-#define H_3D_VSP_CONSTRAINED              1   // Constrained VSP @ 1x1
-#else
-#define H_3D_VSP_CONSTRAINED              0
-#endif
-#endif
-
 #define H_3D_IV_MERGE                     1   // Inter-view motion merge candidate
                                               // HHI_INTER_VIEW_MOTION_PRED 
@@ -130,8 +119,5 @@
 #define H_3D_TMVP                         1   // QC_TMVP_C0047 
                                               // Sony_M23639
-#define H_3D_GEN                          1   // Some general changes can be removed after merge 
-#define H_3D_CLEANUPS                     1   // Temporary for minor fixes can be removed after merge 
-#define H_3D_FIX                          1   // Temporary for minor fixes can be removed after merge 
-#define H_3D_VSO_FIX_BORDRE_EXTENSION     1   // Temporary for minor fixes can be removed after merge 
+
 #define H_3D_DIM                          1   // DIM, Depth intra modes, includes:
                                               // HHI_DMM_WEDGE_INTRA
@@ -156,4 +142,5 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 
+
 ///// ***** VIEW SYNTHESIS OPTIMIZAION *********
 #if H_3D_VSO                                  
@@ -169,5 +156,4 @@
 ////   ****** Neighbouring block-based Disparity Vector  *********
 #if H_3D_NBDV
-#if H_3D_CLEANUPS
 #define DVFROM_LEFTBELOW                  0
 #define DVFROM_LEFT                       1
@@ -176,12 +162,4 @@
 #define DVFROM_ABOVELEFT                  4
 #define IDV_CANDS                         5
-#else
-#define IDV_CANDS                         6
-#define DVFROM_LEFTBELOW                  1
-#define DVFROM_LEFT                       2
-#define DVFROM_ABOVERIGHT                 3
-#define DVFROM_ABOVE                      4
-#define DVFROM_ABOVELEFT                  5
-#endif
 #endif
 ///// ***** ADVANCED INTERVIEW RESIDUAL PREDICTION *********
@@ -198,4 +176,15 @@
                                               // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
                                               // LG_ZEROINTRADEPTHRESI_A0087
+#endif
+
+///// ***** VIEW SYNTHESIS PREDICTION *********
+#if H_3D_VSP
+#define H_3D_VSP_POSITION                 3   // The only supported position
+#define H_3D_VSP_BLOCKSIZE                4   // Supported values: 1, 2, and 4
+#if H_3D_VSP_BLOCKSIZE == 1
+#define H_3D_VSP_CONSTRAINED              1   // Constrained VSP @ 1x1
+#else
+#define H_3D_VSP_CONSTRAINED              0
+#endif
 #endif
 
