diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index e881d9ece4e6988413a30e4c46f0b0d6a1243230..d5ecc8f483696b29437161d336524746716542be 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -747,9 +747,7 @@ void EncApp::xInitLibCfg()
   m_cEncLib.setAllowDisFracMMVD                                  ( m_allowDisFracMMVD );
   m_cEncLib.setUseAffineAmvr                                     ( m_AffineAmvr );
   m_cEncLib.setUseAffineAmvrEncOpt                               ( m_AffineAmvrEncOpt );
-#if JVET_Y0060_ADD_AFFINE_AMVP_MODE
   m_cEncLib.setUseAffineAmvp                                     ( m_AffineAmvp );
-#endif
   m_cEncLib.setDMVR                                              ( m_DMVR );
   m_cEncLib.setMMVD                                              ( m_MMVD );
   m_cEncLib.setMmvdDisNum                                        (m_MmvdDisNum);
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index 447379d32ea0b98abbe51f00272cdb8dca1be4c4..16cfb088d94143a49c63607a95d08c81c83711cd 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1002,9 +1002,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
   ("AllowDisFracMMVD",                                m_allowDisFracMMVD,                               false, "Disable fractional MVD in MMVD mode adaptively")
   ("AffineAmvr",                                      m_AffineAmvr,                                     false, "Eanble AMVR for affine inter mode")
   ("AffineAmvrEncOpt",                                m_AffineAmvrEncOpt,                               false, "Enable encoder optimization of affine AMVR")
-#if JVET_Y0060_ADD_AFFINE_AMVP_MODE
   ("AffineAmvp",                                      m_AffineAmvp,                                      true, "Enable AMVP for affine inter mode")
-#endif
   ("DMVR",                                            m_DMVR,                                           false, "Decoder-side Motion Vector Refinement")
   ("MmvdDisNum",                                      m_MmvdDisNum,                                     8,     "Number of MMVD Distance Entries")
   ("ColorTransform",                                  m_useColorTrans,                                  false, "Enable the color transform")
@@ -4690,9 +4688,7 @@ void EncAppCfg::xPrintParameter()
     msg( VERBOSE, "AffineAmvr:%d ", m_AffineAmvr );
     m_AffineAmvrEncOpt = m_AffineAmvr ? m_AffineAmvrEncOpt : false;
     msg( VERBOSE, "AffineAmvrEncOpt:%d ", m_AffineAmvrEncOpt );
-#if JVET_Y0060_ADD_AFFINE_AMVP_MODE
     msg(VERBOSE, "AffineAmvp:%d ", m_AffineAmvp);
-#endif
     msg(VERBOSE, "DMVR:%d ", m_DMVR);
     msg(VERBOSE, "MmvdDisNum:%d ", m_MmvdDisNum);
     msg(VERBOSE, "JointCbCr:%d ", m_JointCbCrMode);
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 3dc138f42be0736fb5ee1478f85d32e165514065..8cfe47fdbb34179b61032320e6f56c59abd380d6 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -378,9 +378,7 @@ protected:
   bool      m_allowDisFracMMVD;
   bool      m_AffineAmvr;
   bool      m_AffineAmvrEncOpt;
-#if JVET_Y0060_ADD_AFFINE_AMVP_MODE
   bool      m_AffineAmvp;
-#endif
   bool      m_DMVR;
   bool      m_MMVD;
   int       m_MmvdDisNum;
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 9155f2feeec1e442b305566b896121b4516d49ac..8e130e310f4d27b7bfeaac97748c99a750b345aa 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -56,7 +56,6 @@
 
 //########### place macros to be removed in next cycle below this line ###############
 #define JVET_X0143_ALF_APS_ID_OFFSET                         0 // A value between 0 to 7 inclusive. This macro should be kept, or to be defined as a configuration parameter if possible.
-#define JVET_Y0060_ADD_AFFINE_AMVP_MODE                      1 // JVET-Y0060: Add AffineAmvp mode to enable/disable separate from AffineMerge mode
 #define JVET_Y0072_UNLIMITED_LEVEL                           1 // JVET-Y0072: Add unlimited level support for all video profiles
 
 //########### place macros to be be kept below this line ###############
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index aa43c66eacd280ce53e94812cde76e61f0c6de10..70f1bfbf50c7284432a7aa98a54587c780a782c3 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -368,9 +368,7 @@ protected:
   bool      m_AffineAmvr;
   bool      m_HashME;
   bool      m_AffineAmvrEncOpt;
-#if JVET_Y0060_ADD_AFFINE_AMVP_MODE
   bool      m_AffineAmvp;
-#endif
   bool      m_DMVR;
   bool      m_MMVD;
   int       m_MmvdDisNum;
@@ -1284,10 +1282,8 @@ public:
   bool      getUseAffineAmvr                ()         const { return m_AffineAmvr; }
   void      setUseAffineAmvrEncOpt          ( bool b )       { m_AffineAmvrEncOpt = b;    }
   bool      getUseAffineAmvrEncOpt          ()         const { return m_AffineAmvrEncOpt; }
-#if JVET_Y0060_ADD_AFFINE_AMVP_MODE
   void      setUseAffineAmvp                ( bool b )       { m_AffineAmvp = b;    }
   bool      getUseAffineAmvp                ()         const { return m_AffineAmvp; }
-#endif
   void      setDMVR                      ( bool b )       { m_DMVR = b; }
   bool      getDMVR                      ()         const { return m_DMVR; }
   void      setMMVD                         (bool b)         { m_MMVD = b;    }
diff --git a/source/Lib/EncoderLib/InterSearch.cpp b/source/Lib/EncoderLib/InterSearch.cpp
index fb638078fc8faa709ac31cea30190cbf234d2927..adecb897cf7a56db3a1f3fe392ec7234a386a394 100644
--- a/source/Lib/EncoderLib/InterSearch.cpp
+++ b/source/Lib/EncoderLib/InterSearch.cpp
@@ -4171,9 +4171,7 @@ void InterSearch::predInterSearch(CodingUnit& cu, Partitioner& partitioner)
 
     if (cu.Y().width > 8 && cu.Y().height > 8 && cu.slice->getSPS()->getUseAffine()
       && checkAffine
-#if JVET_Y0060_ADD_AFFINE_AMVP_MODE
       && m_pcEncCfg->getUseAffineAmvp()
-#endif
       && (bcwIdx == BCW_DEFAULT || m_affineModeSelected || !m_pcEncCfg->getUseBcwFast())
       )
     {