diff --git a/epoll_server/platform/api/epoll_bug.h b/epoll_server/platform/api/epoll_bug.h
index 21ac1ed..33a3478 100644
--- a/epoll_server/platform/api/epoll_bug.h
+++ b/epoll_server/platform/api/epoll_bug.h
@@ -8,8 +8,5 @@
 #include "net/tools/epoll_server/platform/impl/epoll_bug_impl.h"
 
 #define EPOLL_BUG EPOLL_BUG_IMPL
-// V2 macro is the same as the EPOLL_BUG above, but it takes a
-// bug_id parameter.
-#define EPOLL_BUG_V2 EPOLL_BUG_V2_IMPL
 
 #endif  // QUICHE_EPOLL_SERVER_PLATFORM_API_EPOLL_BUG_H_
diff --git a/http2/adapter/window_manager.cc b/http2/adapter/window_manager.cc
index 148931f..a1b92d5 100644
--- a/http2/adapter/window_manager.cc
+++ b/http2/adapter/window_manager.cc
@@ -20,7 +20,7 @@
   if (new_limit > limit_) {
     window_ += (new_limit - limit_);
   } else {
-    SPDY_BUG_V2(H2 window decrease)
+    SPDY_BUG(H2 window decrease)
         << "Window size limit decrease not currently supported.";
   }
   limit_ = new_limit;
@@ -56,9 +56,8 @@
   QUICHE_VLOG(2) << "WindowManager@" << this << " buffered: " << buffered_
                  << " bytes: " << bytes;
   if (buffered_ < bytes) {
-    SPDY_BUG_V2(bug_2816_1)
-        << "WindowManager@" << this << " buffered underflow "
-        << "buffered_: " << buffered_ << " bytes: " << bytes;
+    SPDY_BUG(bug_2816_1) << "WindowManager@" << this << " buffered underflow "
+                         << "buffered_: " << buffered_ << " bytes: " << bytes;
     buffered_ = 0;
   } else {
     buffered_ -= bytes;
diff --git a/http2/platform/api/http2_bug_tracker.h b/http2/platform/api/http2_bug_tracker.h
index e3c5f20..53d8688 100644
--- a/http2/platform/api/http2_bug_tracker.h
+++ b/http2/platform/api/http2_bug_tracker.h
@@ -10,11 +10,6 @@
 #define HTTP2_BUG HTTP2_BUG_IMPL
 #define HTTP2_BUG_IF HTTP2_BUG_IF_IMPL
 
-// V2 macros are the same as all the HTTP2_BUG flavor above, but they take a
-// bug_id parameter.
-#define HTTP2_BUG_V2 HTTP2_BUG_V2_IMPL
-#define HTTP2_BUG_IF_V2 HTTP2_BUG_IF_V2_IMPL
-
 #define FLAGS_http2_always_log_bugs_for_tests \
   FLAGS_http2_always_log_bugs_for_tests_IMPL
 
diff --git a/quic/platform/api/quic_bug_tracker.h b/quic/platform/api/quic_bug_tracker.h
index 85d3e97..23bcb7b 100644
--- a/quic/platform/api/quic_bug_tracker.h
+++ b/quic/platform/api/quic_bug_tracker.h
@@ -12,11 +12,4 @@
 #define QUIC_PEER_BUG QUIC_PEER_BUG_IMPL
 #define QUIC_PEER_BUG_IF QUIC_PEER_BUG_IF_IMPL
 
-// V2 macros are the same as all the QUIC_BUG flavor above, but they take a
-// bug_id parameter.
-#define QUIC_BUG_V2 QUIC_BUG_V2_IMPL
-#define QUIC_BUG_IF_V2 QUIC_BUG_IF_V2_IMPL
-#define QUIC_PEER_BUG_V2 QUIC_PEER_BUG_V2_IMPL
-#define QUIC_PEER_BUG_IF_V2 QUIC_PEER_BUG_IF_V2_IMPL
-
 #endif  // QUICHE_QUIC_PLATFORM_API_QUIC_BUG_TRACKER_H_
diff --git a/spdy/platform/api/spdy_bug_tracker.h b/spdy/platform/api/spdy_bug_tracker.h
index bec4776..f00bbc8 100644
--- a/spdy/platform/api/spdy_bug_tracker.h
+++ b/spdy/platform/api/spdy_bug_tracker.h
@@ -10,11 +10,6 @@
 #define SPDY_BUG SPDY_BUG_IMPL
 #define SPDY_BUG_IF(bug_id, condition) SPDY_BUG_IF_IMPL(bug_id, condition)
 
-// V2 macros are the same as all the SPDY_BUG flavor above, but they take a
-// bug_id parameter.
-#define SPDY_BUG_V2 SPDY_BUG_V2_IMPL
-#define SPDY_BUG_IF_V2 SPDY_BUG_IF_V2_IMPL
-
 #define FLAGS_spdy_always_log_bugs_for_tests \
   FLAGS_spdy_always_log_bugs_for_tests_impl