diff --git a/source/Lib/CommonLib/IntraPrediction.cpp b/source/Lib/CommonLib/IntraPrediction.cpp
index 9c7a8f829e352ea6e95f771cf6cc7b33e89f41ab..7a2416aabdb5854222d8ebb627e499a1f98485c8 100644
--- a/source/Lib/CommonLib/IntraPrediction.cpp
+++ b/source/Lib/CommonLib/IntraPrediction.cpp
@@ -7196,8 +7196,6 @@ void IntraPrediction::xFillReferenceSamplesOBMC( const CPelBuf &recoBuf, Pel* re
 
   // ----- Step 1: analyze neighborhood -----
   const Position posLT          = area;
-  const Position posRT          = area.topRight();
-  const Position posLB          = area.bottomLeft();
 
 #if JVET_Y0116_EXTENDED_MRL_LIST
 #if JVET_AC0094_REF_SAMPLES_OPT
@@ -7208,18 +7206,10 @@ void IntraPrediction::xFillReferenceSamplesOBMC( const CPelBuf &recoBuf, Pel* re
 #else
   bool  neighborFlags[4 * MAX_NUM_PART_IDXS_IN_CTU_WIDTH + 1];
 #endif
-  int   numIntraNeighbor = 0;
 
   memset( neighborFlags, 0, totalUnits );
 
   neighborFlags[totalLeftUnits+leftMrlUnitNum] = isAboveLeftAvailable( cu, chType, posLT.offset(-multiRefIdx, -multiRefIdx) );
-  numIntraNeighbor += neighborFlags[totalLeftUnits+leftMrlUnitNum] ? 1 : 0;
-  numIntraNeighbor += isAboveAvailableOBMC     ( cu, chType, posLT.offset(-aboveMrlUnitNum*unitWidth, -multiRefIdx), aboveMrlUnitNum,      unitWidth,  (neighborFlags + totalLeftUnits + 1 + leftMrlUnitNum), m_intraOBMCNeighState );
-  numIntraNeighbor += isLeftAvailableOBMC      ( cu, chType, posLT.offset(-multiRefIdx, -leftMrlUnitNum*unitHeight), leftMrlUnitNum,       unitHeight, (neighborFlags + totalLeftUnits - 1 + leftMrlUnitNum), m_intraOBMCNeighState );
-  numIntraNeighbor += isAboveAvailableOBMC     ( cu, chType, posLT.offset(0, -multiRefIdx), numAboveUnits,      unitWidth,  (neighborFlags + totalLeftUnits + 1 + leftMrlUnitNum + aboveMrlUnitNum), m_intraOBMCNeighState );
-  numIntraNeighbor += isAboveRightAvailableOBMC( cu, chType, posRT.offset(0, -multiRefIdx), numAboveRightUnits, unitWidth,  (neighborFlags + totalLeftUnits + 1 + leftMrlUnitNum + aboveMrlUnitNum + numAboveUnits), m_intraOBMCNeighState );
-  numIntraNeighbor += isLeftAvailableOBMC      ( cu, chType, posLT.offset(-multiRefIdx, 0), numLeftUnits,       unitHeight, (neighborFlags + totalLeftUnits - 1), m_intraOBMCNeighState );
-  numIntraNeighbor += isBelowLeftAvailableOBMC ( cu, chType, posLB.offset(-multiRefIdx, 0), numLeftBelowUnits,  unitHeight, (neighborFlags + totalLeftUnits - 1 - numLeftUnits), m_intraOBMCNeighState );
 
   // ----- Step 2: fill reference samples (depending on neighborhood) -----
 
diff --git a/source/Lib/CommonLib/TrQuant.cpp b/source/Lib/CommonLib/TrQuant.cpp
index 1192b02bba5f9d805d5bbd4941090d93a9e40b6e..a67c5d82218719c17ffb54d36421f6d620e8bb8d 100644
--- a/source/Lib/CommonLib/TrQuant.cpp
+++ b/source/Lib/CommonLib/TrQuant.cpp
@@ -2640,7 +2640,7 @@ void TrQuant::predCoeffSigns(TransformUnit &tu, const ComponentID compID, const
   bool bJccrWithCr = bIsJCCR && !(tu.jointCbCr >> 1);
 #if JVET_AI0096_SIGN_PRED_BIT_DEPTH_FIX
 #if JVET_AJ0237_INTERNAL_12BIT
-  const int signPredShift = SIGN_PRED_RESIDUAL_BITS;
+  int signPredShift = SIGN_PRED_RESIDUAL_BITS;
 #else
   const int signPredShift = 10 + SIGN_PRED_RESIDUAL_BITS  - tu.cs->sps->getBitDepth(toChannelType(COMPONENT_Y));
 #endif