diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc
index 826ddfba614..7be338417f6 100644
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@@ -37,5 +37,5 @@
 #include <grpc++/grpc++.h>
 
 namespace grpc {
-std::string Version() { return "1.1.0-dev"; }
+grpc::string Version() { return "1.1.0-dev"; }
 }
diff --git a/test/core/end2end/end2end_nosec_tests.c b/test/core/end2end/end2end_nosec_tests.c
index 7e9b6eb233c..caaa97c215b 100644
--- a/test/core/end2end/end2end_nosec_tests.c
+++ b/test/core/end2end/end2end_nosec_tests.c
@@ -416,16 +416,3 @@ void grpc_end2end_tests(int argc, char **argv,
     abort();
   }
 }
-
-const char *get_host_override_string(const char *str,
-                                     grpc_end2end_test_config config) {
-  return (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER ? str
-                                                                       : NULL);
-}
-
-void validate_host_override_string(const char *pattern, const char *str,
-                                   grpc_end2end_test_config config) {
-  if (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER) {
-    GPR_ASSERT(0 == strcmp(str, pattern));
-  }
-}
diff --git a/test/core/end2end/end2end_tests.c b/test/core/end2end/end2end_tests.c
index 0fbad226414..6d17e686e61 100644
--- a/test/core/end2end/end2end_tests.c
+++ b/test/core/end2end/end2end_tests.c
@@ -424,16 +424,3 @@ void grpc_end2end_tests(int argc, char **argv,
     abort();
   }
 }
-
-const char *get_host_override_string(const char *str,
-                                     grpc_end2end_test_config config) {
-  return (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER ? str
-                                                                       : NULL);
-}
-
-void validate_host_override_string(const char *pattern, const char *str,
-                                   grpc_end2end_test_config config) {
-  if (config.feature_mask & FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER) {
-    GPR_ASSERT(0 == strcmp(str, pattern));
-  }
-}