diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 226833e31d63e45ac0ec292296069fd5c4d02d49..841c0f3d1c5dd6963d2a726a93bb0112c42204ad 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -111,7 +111,6 @@
 
 
 
-#define JVET_R0068_ASPECT6_ENC_RESTRICTION                1 // encoder restriction for JVET-R0068 apsect 6
 
 #define JVET_S0178_GENERAL_SEI_CHECK                      1 // JVET-S0178: General SEI semantics and constraints
 
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 0c8328cdcb224b43ba8099efec13dc75236376d6..c28e59478ef50cfc2c388e962d40133602cb3eca 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -266,7 +266,6 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
   // initialize PPS
   pps0.setPicWidthInLumaSamples( m_iSourceWidth );
   pps0.setPicHeightInLumaSamples( m_iSourceHeight );
-#if JVET_R0068_ASPECT6_ENC_RESTRICTION
   if (pps0.getPicWidthInLumaSamples() == sps0.getMaxPicWidthInLumaSamples() && pps0.getPicHeightInLumaSamples() == sps0.getMaxPicHeightInLumaSamples())
   {
     pps0.setConformanceWindow( sps0.getConformanceWindow() );
@@ -277,9 +276,6 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
     pps0.setConformanceWindow( m_conformanceWindow );
     pps0.setConformanceWindowFlag( m_conformanceWindow.getWindowEnabledFlag() );
   }
-#else
-  pps0.setConformanceWindow( m_conformanceWindow );
-#endif
   xInitPPS(pps0, sps0);
   // initialize APS
   xInitRPL(sps0, isFieldCoding);
@@ -302,7 +298,6 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
 
     Window conformanceWindow;
     conformanceWindow.setWindow( 0, ( width - scaledWidth ) / SPS::getWinUnitX( sps0.getChromaFormatIdc() ), 0, ( height - scaledHeight ) / SPS::getWinUnitY( sps0.getChromaFormatIdc() ) );
-#if JVET_R0068_ASPECT6_ENC_RESTRICTION
     if (pps.getPicWidthInLumaSamples() == sps0.getMaxPicWidthInLumaSamples() && pps.getPicHeightInLumaSamples() == sps0.getMaxPicHeightInLumaSamples())
     {
       pps.setConformanceWindow( sps0.getConformanceWindow() );
@@ -313,9 +308,6 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
       pps.setConformanceWindow( conformanceWindow );
       pps.setConformanceWindowFlag( pps.getConformanceWindow().getWindowEnabledFlag() );
     }
-#else
-    pps.setConformanceWindow( conformanceWindow );
-#endif
 
     Window scalingWindow;
     scalingWindow.setWindow( 0, ( width - scaledWidth ) / SPS::getWinUnitX( sps0.getChromaFormatIdc() ), 0, ( height - scaledHeight ) / SPS::getWinUnitY( sps0.getChromaFormatIdc() ) );
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index f14b73a7361debeeafad7d47890fa5c38be8e677..e697d284bd2c9b29c8004f69e61f5ba04b2ece12 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -279,13 +279,8 @@ void HLSWriter::codePPS( const PPS* pcPPS )
   WRITE_UVLC( pcPPS->getPicHeightInLumaSamples(), "pps_pic_height_in_luma_samples" );
 
   Window conf = pcPPS->getConformanceWindow();
-#if JVET_R0068_ASPECT6_ENC_RESTRICTION
   WRITE_FLAG(pcPPS->getConformanceWindowFlag(), "pps_conformance_window_flag");
   if (pcPPS->getConformanceWindowFlag())
-#else
-  WRITE_FLAG(conf.getWindowEnabledFlag(), "pps_conformance_window_flag");
-  if (conf.getWindowEnabledFlag())
-#endif
   {
     WRITE_UVLC(conf.getWindowLeftOffset(), "pps_conf_win_left_offset");
     WRITE_UVLC(conf.getWindowRightOffset(), "pps_conf_win_right_offset");