diff --git a/doc/software-manual.tex b/doc/software-manual.tex
index 70fef7c8b7e604ba615e73179ee54dc788c64bd3..d7308a5eaab1d50a2816f2a988a2103a7f50aed3 100644
--- a/doc/software-manual.tex
+++ b/doc/software-manual.tex
@@ -876,7 +876,7 @@ Enables harmonization of Gop first field couple.
\Option{AccessUnitDelimiter} &
%\ShortOption{\None} &
-\Default{1} &
+\Default{0} &
Add Access Unit Delimiter NAL units between all Access Units.
\\
@@ -1906,12 +1906,6 @@ $GS$ is the gop size.
Enables or disables the use of early CU determination. When enabled, skipped CUs will not be split further.
\\
-\Option{CFM} &
-%\ShortOption{\None} &
-\Default{false} &
-Enables or disables the use of Cbf-based fast encoder mode. When enabled, once a 2Nx2N CU has been evaluated, if the RootCbf is 0, further PU splits will not be evaluated.
-\\
-
\Option{ESD} &
%\ShortOption{\None} &
\Default{false} &
@@ -2735,47 +2729,6 @@ If enabled use a fast ME for generalised B Low Delay slices
Enables use of B-Lambda for non-key low-delay pictures
\\
-\Option{PCMEnabledFlag} &
-%\ShortOption{\None} &
-\Default{false} &
-Enables or disables the use of PCM. The encoder will use cost measures on a CU-by-CU basis to determine if PCM mode is to be applied.
-\\
-
-\Option{PCMLog2MaxSize} &
-%\ShortOption{\None} &
-\Default{5 \\ ($= \mathrm{log}_2(32)$)} &
-Specifies log2 of the maximum PCM block size. When PCM is enabled, the
-PCM mode is available for 2Nx2N intra PUs smaller than or equal to the
-specified maximum PCM block size
-\\
-
-\Option{PCMLog2MinSize} &
-%\ShortOption{\None} &
-\Default{3} &
-Specifies log2 of the minimum PCM block size. When PCM is enabled, the
-PCM mode is available for 2Nx2N intra PUs larger than or equal to the
-specified minimum PCM block size.
-\par
-When larger than PCMLog2MaxSize, PCM mode is not used.
-\\
-
-\Option{PCMInputBitDepthFlag} &
-%\ShortOption{\None} &
-\Default{true} &
-If enabled specifies that PCM sample bit-depth is set equal to
-InputBitDepth. Otherwise, it specifies that PCM sample bit-depth is set
-equal to InternalBitDepth.
-\\
-
-\Option{PCMFilterDisableFlag} &
-%\ShortOption{\None} &
-\Default{false} &
-If enabled specifies that loop-filtering on reconstructed samples of PCM
-blocks is skipped. Otherwise, it specifies that loop-filtering on
-reconstructed samples of PCM blocks is not skipped.
-% 0 = (loop-filtering is not skipped for PCM samples).
-\\
-
\Option{WeightedPredP (-wpP)} &
%\ShortOption{-wpP} &
\Default{false} &
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index 0203d9b407f9813b22762acc1379f98935128876..174da91760d2b1244dc9eaf1d26c76a30700c2be 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -780,7 +780,6 @@ void EncApp::xInitLibCfg()
m_cEncLib.setFastInterSearchMode ( m_fastInterSearchMode );
m_cEncLib.setUseEarlyCU ( m_bUseEarlyCU );
m_cEncLib.setUseFastDecisionForMerge ( m_useFastDecisionForMerge );
- m_cEncLib.setUseCbfFastMode ( m_bUseCbfFastMode );
m_cEncLib.setUseEarlySkipDetection ( m_useEarlySkipDetection );
m_cEncLib.setUseFastMerge ( m_useFastMrg );
m_cEncLib.setUsePbIntraFast ( m_usePbIntraFast );
diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp
index b7f24437cc26afff9856f618ad59d1a25bf0e2a5..dcda0c402cd1314ca4a1ec45147676af3f8b4d31 100644
--- a/source/App/EncoderApp/EncAppCfg.cpp
+++ b/source/App/EncoderApp/EncAppCfg.cpp
@@ -1237,7 +1237,6 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("FEN", tmpFastInterSearchMode, int(FASTINTERSEARCH_DISABLED), "fast encoder setting")
("ECU", m_bUseEarlyCU, false, "Early CU setting")
("FDM", m_useFastDecisionForMerge, true, "Fast decision for Merge RD Cost")
- ("CFM", m_bUseCbfFastMode, false, "Cbf fast mode setting")
("ESD", m_useEarlySkipDetection, false, "Early SKIP detection setting")
( "RateControl", m_RCEnableRateControl, false, "Rate control: enable rate control" )
( "TargetBitrate", m_RCTargetBitrate, 0, "Rate control: target bit-rate" )
@@ -4021,7 +4020,6 @@ void EncAppCfg::xPrintParameter()
msg( VERBOSE, "FEN:%d ", int(m_fastInterSearchMode) );
msg( VERBOSE, "ECU:%d ", m_bUseEarlyCU );
msg( VERBOSE, "FDM:%d ", m_useFastDecisionForMerge );
- msg( VERBOSE, "CFM:%d ", m_bUseCbfFastMode );
msg( VERBOSE, "ESD:%d ", m_useEarlySkipDetection );
msg( VERBOSE, "TransformSkip:%d ", m_useTransformSkip );
msg( VERBOSE, "TransformSkipFast:%d ", m_useTransformSkipFast );
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index bc87daf5edc3bbe99ae2d683721785287cc199eb..8d81a7e3098b26fb0635221be2a0a5b9c60df14b 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -486,7 +486,6 @@ protected:
FastInterSearchMode m_fastInterSearchMode; ///< Parameter that controls fast encoder settings
bool m_bUseEarlyCU; ///< flag for using Early CU setting
bool m_useFastDecisionForMerge; ///< flag for using Fast Decision Merge RD-Cost
- bool m_bUseCbfFastMode; ///< flag for using Cbf Fast PU Mode Decision
bool m_useEarlySkipDetection; ///< flag for using Early SKIP Detection
bool m_picPartitionFlag; ///< enable picture partitioning (0: single tile, single slice, 1: multiple tiles/slices can be used)
bool m_mixedLossyLossless; ///< enable mixed lossy/lossless coding
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index df5a09305b56d757e315285260acafdeadf28e6d..14cd24ae9a29a186d574e2545f5be37a57dbce7f 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -498,7 +498,6 @@ protected:
FastInterSearchMode m_fastInterSearchMode;
bool m_bUseEarlyCU;
bool m_useFastDecisionForMerge;
- bool m_bUseCbfFastMode;
bool m_useEarlySkipDetection;
bool m_reconBasedCrossCPredictionEstimate;
bool m_useTransformSkip;
@@ -1423,7 +1422,6 @@ public:
void setFastInterSearchMode ( FastInterSearchMode m ) { m_fastInterSearchMode = m; }
void setUseEarlyCU ( bool b ) { m_bUseEarlyCU = b; }
void setUseFastDecisionForMerge ( bool b ) { m_useFastDecisionForMerge = b; }
- void setUseCbfFastMode ( bool b ) { m_bUseCbfFastMode = b; }
void setUseEarlySkipDetection ( bool b ) { m_useEarlySkipDetection = b; }
void setFastUDIUseMPMEnabled ( bool b ) { m_bFastUDIUseMPMEnabled = b; }
void setFastMEForGenBLowDelayEnabled ( bool b ) { m_bFastMEForGenBLowDelayEnabled = b; }
@@ -1445,7 +1443,6 @@ public:
FastInterSearchMode getFastInterSearchMode() const{ return m_fastInterSearchMode; }
bool getUseEarlyCU () const{ return m_bUseEarlyCU; }
bool getUseFastDecisionForMerge () const{ return m_useFastDecisionForMerge; }
- bool getUseCbfFastMode () const{ return m_bUseCbfFastMode; }
bool getUseEarlySkipDetection () const{ return m_useEarlySkipDetection; }
bool getFastUDIUseMPMEnabled () { return m_bFastUDIUseMPMEnabled; }
bool getFastMEForGenBLowDelayEnabled () { return m_bFastMEForGenBLowDelayEnabled; }