diff --git a/README.md b/README.md
index 71eafea..bc6865e 100644
--- a/README.md
+++ b/README.md
@@ -200,10 +200,10 @@ $ meson build -Dipp_path=/opt/intel/ipp
 The options are documented in the library- and platform-specific
 sections below.
 
-Rubber Band Library is written entirely in C++ to the C++98
-standard. It is unlikely to make any difference (performance or
-otherwise) which C++ standard your compiler uses - as long as it's no
-older than C++98!
+Rubber Band Library is written entirely in C++ and requires a C++11
+compiler. It is unlikely to make any difference (performance or
+otherwise) which C++ standard you compile with, as long as it's no
+older than C++11.
 
 If you are building this software using either of the Speex or KissFFT
 library options, please be sure to review the terms for those
diff --git a/main/main.cpp b/main/main.cpp
index 72c47e0..8fbba44 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -648,7 +648,7 @@ int main(int argc, char **argv)
             int thisBlockSize = ibs;
 
             while (freqMapItr != freqMap.end()) {
-                size_t nextFreqFrame = freqMapItr->first; // + ts.getLatency();
+                size_t nextFreqFrame = freqMapItr->first;
                 if (nextFreqFrame <= countIn) {
                     double s = frequencyshift * freqMapItr->second;
                     if (debug > 0) {
diff --git a/src/StretcherImpl.cpp b/src/StretcherImpl.cpp
index 2d428bb..e3953d5 100644
--- a/src/StretcherImpl.cpp
+++ b/src/StretcherImpl.cpp
@@ -874,7 +874,6 @@ RubberBandStretcher::Impl::getLatency() const
 {
     if (!m_realtime) return 0;
     return lrint((m_aWindowSize/2) / m_pitchScale);
-//    return int(m_aWindowSize/2);
 }
 
 void