diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index b68ddfe29d88f768a8c18d1b79055577da779e74..c8f911f2e6600e1c74cc1fdf0290ffb33d9be314 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -280,11 +280,7 @@ strToLevel[] =
   {"6",   Level::LEVEL6},
   {"6.1", Level::LEVEL6_1},
   {"6.2", Level::LEVEL6_2},
-#if JVET_R0245_LEVEL_CODING
   {"15.5", Level::LEVEL15_5},
-#else
-  {"8.5", Level::LEVEL8_5},
-#endif
 };
 
 #if U0132_TARGET_BITS_SATURATION
@@ -720,11 +716,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
   SMultiValueInput<uint32_t>  cfg_subPicId(0, std::numeric_limits<uint16_t>::max(), 0, MAX_NUM_SUB_PICS);
 
   SMultiValueInput<int>          cfg_sliFractions(0, 100, 0, std::numeric_limits<int>::max());
-#if JVET_R0245_LEVEL_CODING
   SMultiValueInput<Level::Name>  cfg_sliRefLevels(Level::NONE, Level::LEVEL15_5,  0, 8);
-#else
-  SMultiValueInput<Level::Name>  cfg_sliRefLevels(Level::NONE, Level::LEVEL8_5,  0, 8);
-#endif
 
   int warnUnknowParameter = 0;
 
diff --git a/source/Lib/CommonLib/ProfileLevelTier.cpp b/source/Lib/CommonLib/ProfileLevelTier.cpp
index 0883e29d87d45ab1de21fbcc56e61e0c3ad2da9c..10bbb136ee7a59375ba512ec973cc28dfa635623 100644
--- a/source/Lib/CommonLib/ProfileLevelTier.cpp
+++ b/source/Lib/CommonLib/ProfileLevelTier.cpp
@@ -70,11 +70,7 @@ static const LevelTierFeatures mainLevelTierInfo[] =
     { Level::LEVEL6  , 35651584, {    80000,   240000 },      600,       22,       20, 1069547520ULL, {   60000,   240000 }, { 8, 4} },
     { Level::LEVEL6_1, 35651584, {   120000,   480000 },      600,       22,       20, 2139095040ULL, {  120000,   480000 }, { 8, 4} },
     { Level::LEVEL6_2, 35651584, {   180000,   800000 },      600,       22,       20, 4278190080ULL, {  240000,   800000 }, { 8, 4} },
-#if JVET_R0245_LEVEL_CODING
     { Level::LEVEL15_5, MAX_UINT, { MAX_UINT, MAX_UINT }, MAX_UINT, MAX_UINT, MAX_UINT, MAX_CNFUINT64, {MAX_UINT, MAX_UINT }, { 0, 0} },
-#else
-    { Level::LEVEL8_5, MAX_UINT, { MAX_UINT, MAX_UINT }, MAX_UINT, MAX_UINT, MAX_UINT, MAX_CNFUINT64, {MAX_UINT, MAX_UINT }, { 0, 0} },
-#endif
     { Level::NONE    }
 };
 
@@ -122,11 +118,7 @@ ProfileLevelTierFeatures::extractPTLInformation(const SPS &sps)
     // Now identify the level:
     const LevelTierFeatures *pLTF = m_pProfile->pLevelTiersListInfo;
     const Level::Name spsLevelName = spsPtl.getLevelIdc();
-#if JVET_R0245_LEVEL_CODING
     if (spsLevelName!=Level::LEVEL15_5 || m_pProfile->canUseLevel15p5)
-#else
-    if (spsLevelName!=Level::LEVEL8_5 || m_pProfile->canUseLevel8p5)
-#endif
     {
       for(int i=0; pLTF[i].level!=Level::NONE; i++)
       {
diff --git a/source/Lib/CommonLib/ProfileLevelTier.h b/source/Lib/CommonLib/ProfileLevelTier.h
index 6136fb5494c78e22d3d153b15d6cb2c2cd6da115..6d89d5ae35cf808c6d10f6040a112cfad1559051 100644
--- a/source/Lib/CommonLib/ProfileLevelTier.h
+++ b/source/Lib/CommonLib/ProfileLevelTier.h
@@ -70,11 +70,7 @@ struct ProfileFeatures
   uint32_t                 maxBitDepth;
   ChromaFormat             maxChromaFormat;
 
-#if JVET_R0245_LEVEL_CODING
   bool                     canUseLevel15p5;
-#else
-  bool                     canUseLevel8p5;
-#endif
   uint32_t                 cpbVclFactor;
   uint32_t                 cpbNalFactor;
   uint32_t                 formatCapabilityFactorx1000;
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index d245ff15f8502f99f255dda2ca95a246729e7f05..b789b47334885721ddaa7bcc284000d8137fae39 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -152,7 +152,6 @@
 
 
 
-#define JVET_R0245_LEVEL_CODING                           1 // JVET-R0245: level coding numbering scheme
 
 #define STILL_PICTURE_PROFILES                            1 // Adds support for still picture profiles
 
@@ -803,7 +802,6 @@ namespace Level
 
   enum Name
   {
-#if JVET_R0245_LEVEL_CODING
     // code = (major_level * 16 + minor_level * 3)
     NONE     = 0,
     LEVEL1   = 16,
@@ -820,24 +818,6 @@ namespace Level
     LEVEL6_1 = 99,
     LEVEL6_2 = 102,
     LEVEL15_5 = 255,
-#else
-    // code = (level * 30)
-    NONE     = 0,
-    LEVEL1   = 30,
-    LEVEL2   = 60,
-    LEVEL2_1 = 63,
-    LEVEL3   = 90,
-    LEVEL3_1 = 93,
-    LEVEL4   = 120,
-    LEVEL4_1 = 123,
-    LEVEL5   = 150,
-    LEVEL5_1 = 153,
-    LEVEL5_2 = 156,
-    LEVEL6   = 180,
-    LEVEL6_1 = 183,
-    LEVEL6_2 = 186,
-    LEVEL8_5 = 255,
-#endif
   };
 }
 
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 94cdc383f118742a172e841e1ec1b1f849bf44b6..2ca92dcdceda12c133a1796766ff6995a3be3ce4 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -1181,11 +1181,7 @@ validateMinCrRequirements(const ProfileLevelTierFeatures &plt, std::size_t numBy
   //  numBytesInVclNalUnits shall be less than or equal to
   //     FormatCapabilityFactor * MaxLumaSr * framePeriod / MinCr,
   //     ( = FormatCapabilityFactor * MaxLumaSr / (MinCr * frameRate),
-#if JVET_R0245_LEVEL_CODING
   if (plt.getLevelTierFeatures() && plt.getProfileFeatures() && plt.getLevelTierFeatures()->level!=Level::LEVEL15_5)
-#else
-  if (plt.getLevelTierFeatures() && plt.getProfileFeatures() && plt.getLevelTierFeatures()->level!=Level::LEVEL8_5)
-#endif
   {
     const uint32_t formatCapabilityFactorx1000 = plt.getProfileFeatures()->formatCapabilityFactorx1000;
     const uint64_t maxLumaSr = plt.getLevelTierFeatures()->maxLumaSr;