diff --git a/CMakeLists.txt b/CMakeLists.txt
index e48798713..7d56c1200 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,7 @@ endforeach()
 
 # SRT_ENABLE_ECN 1                /* Early Congestion Notification (for source bitrate control) */
 # SRT_DEBUG_TSBPD_OUTJITTER 1     /* Packet Delivery histogram */
-# SRT_DEBUG_TSBPD_DRIFT 1         /* Debug Encoder-Decoder Drift) */
+# SRT_DEBUG_TRACE_DRIFT 1         /* Create a trace log for Encoder-Decoder Clock Drift */
 # SRT_DEBUG_TSBPD_WRAP 1          /* Debug packet timestamp wraparound */
 # SRT_DEBUG_TLPKTDROP_DROPSEQ 1
 # SRT_DEBUG_SNDQ_HIGHRATE 1
diff --git a/srtcore/buffer.cpp b/srtcore/buffer.cpp
index e861654eb..c43cc4c59 100644
--- a/srtcore/buffer.cpp
+++ b/srtcore/buffer.cpp
@@ -816,14 +816,6 @@ void CSndBuffer::increase()
  *    m_iMaxPos:     none? (modified on add and ack
  */
 
-// XXX Init values moved to in-class.
-// const uint32_t CRcvBuffer::TSBPD_WRAP_PERIOD = (30*1000000);    //30 seconds (in usec)
-// const int CRcvBuffer::TSBPD_DRIFT_MAX_VALUE   = 5000;  // usec
-// const int CRcvBuffer::TSBPD_DRIFT_MAX_SAMPLES = 1000;  // ACK-ACK packets
-#ifdef SRT_DEBUG_TSBPD_DRIFT
-// const int CRcvBuffer::TSBPD_DRIFT_PRT_SAMPLES = 200;   // ACK-ACK packets
-#endif
-
 CRcvBuffer::CRcvBuffer(CUnitQueue* queue, int bufsize_pkts)
     : m_pUnit(NULL)
     , m_iSize(bufsize_pkts)
@@ -842,11 +834,6 @@ CRcvBuffer::CRcvBuffer(CUnitQueue* queue, int bufsize_pkts)
     for (int i = 0; i < m_iSize; ++i)
         m_pUnit[i] = NULL;
 
-#ifdef SRT_DEBUG_TSBPD_DRIFT
-    memset(m_TsbPdDriftHisto100us, 0, sizeof(m_TsbPdDriftHisto100us));
-    memset(m_TsbPdDriftHisto1ms, 0, sizeof(m_TsbPdDriftHisto1ms));
-#endif
-
     setupMutex(m_BytesCountLock, "BytesCount");
 }