diff --git a/BUILD b/BUILD
index 172a90e151e..87d3b978358 100644
--- a/BUILD
+++ b/BUILD
@@ -265,7 +265,6 @@ GRPCXX_PUBLIC_HDRS = [
     "include/grpcpp/server_builder.h",
     "include/grpcpp/server_builder_impl.h",
     "include/grpcpp/server_context.h",
-    "include/grpcpp/server_context_impl.h",
     "include/grpcpp/server_posix.h",
     "include/grpcpp/server_posix_impl.h",
     "include/grpcpp/support/async_stream.h",
diff --git a/BUILD.gn b/BUILD.gn
index 534c88bd67f..fc9fa8dc3d0 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1119,7 +1119,6 @@ config("grpc_config") {
         "include/grpcpp/server_builder.h",
         "include/grpcpp/server_builder_impl.h",
         "include/grpcpp/server_context.h",
-        "include/grpcpp/server_context_impl.h",
         "include/grpcpp/server_impl.h",
         "include/grpcpp/server_posix.h",
         "include/grpcpp/server_posix_impl.h",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46bd48cccdb..ce16506ab62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3200,7 +3200,6 @@ foreach(_hdr
   include/grpcpp/server_builder.h
   include/grpcpp/server_builder_impl.h
   include/grpcpp/server_context.h
-  include/grpcpp/server_context_impl.h
   include/grpcpp/server_impl.h
   include/grpcpp/server_posix.h
   include/grpcpp/server_posix_impl.h
@@ -3823,7 +3822,6 @@ foreach(_hdr
   include/grpcpp/server_builder.h
   include/grpcpp/server_builder_impl.h
   include/grpcpp/server_context.h
-  include/grpcpp/server_context_impl.h
   include/grpcpp/server_impl.h
   include/grpcpp/server_posix.h
   include/grpcpp/server_posix_impl.h
@@ -4824,7 +4822,6 @@ foreach(_hdr
   include/grpcpp/server_builder.h
   include/grpcpp/server_builder_impl.h
   include/grpcpp/server_context.h
-  include/grpcpp/server_context_impl.h
   include/grpcpp/server_impl.h
   include/grpcpp/server_posix.h
   include/grpcpp/server_posix_impl.h
diff --git a/Makefile b/Makefile
index 702c571f585..e2e8aa60488 100644
--- a/Makefile
+++ b/Makefile
@@ -5574,7 +5574,6 @@ PUBLIC_HEADERS_CXX += \
     include/grpcpp/server_builder.h \
     include/grpcpp/server_builder_impl.h \
     include/grpcpp/server_context.h \
-    include/grpcpp/server_context_impl.h \
     include/grpcpp/server_impl.h \
     include/grpcpp/server_posix.h \
     include/grpcpp/server_posix_impl.h \
@@ -6205,7 +6204,6 @@ PUBLIC_HEADERS_CXX += \
     include/grpcpp/server_builder.h \
     include/grpcpp/server_builder_impl.h \
     include/grpcpp/server_context.h \
-    include/grpcpp/server_context_impl.h \
     include/grpcpp/server_impl.h \
     include/grpcpp/server_posix.h \
     include/grpcpp/server_posix_impl.h \
@@ -7155,7 +7153,6 @@ PUBLIC_HEADERS_CXX += \
     include/grpcpp/server_builder.h \
     include/grpcpp/server_builder_impl.h \
     include/grpcpp/server_context.h \
-    include/grpcpp/server_context_impl.h \
     include/grpcpp/server_impl.h \
     include/grpcpp/server_posix.h \
     include/grpcpp/server_posix_impl.h \
diff --git a/build.yaml b/build.yaml
index d63284e1267..5b9a8c1594e 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1406,7 +1406,6 @@ filegroups:
   - include/grpcpp/server_builder.h
   - include/grpcpp/server_builder_impl.h
   - include/grpcpp/server_context.h
-  - include/grpcpp/server_context_impl.h
   - include/grpcpp/server_impl.h
   - include/grpcpp/server_posix.h
   - include/grpcpp/server_posix_impl.h
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 981fb345eee..6fc97c6135e 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -125,7 +125,6 @@ Pod::Spec.new do |s|
                       'include/grpcpp/server_builder.h',
                       'include/grpcpp/server_builder_impl.h',
                       'include/grpcpp/server_context.h',
-                      'include/grpcpp/server_context_impl.h',
                       'include/grpcpp/server_impl.h',
                       'include/grpcpp/server_posix.h',
                       'include/grpcpp/server_posix_impl.h',
diff --git a/include/grpcpp/server_context_impl.h b/include/grpcpp/server_context_impl.h
deleted file mode 100644
index 3a944f3da8f..00000000000
--- a/include/grpcpp/server_context_impl.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *
- * Copyright 2019 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef GRPCPP_SERVER_CONTEXT_IMPL_H
-#define GRPCPP_SERVER_CONTEXT_IMPL_H
-
-#include <grpcpp/impl/codegen/server_context_impl.h>
-
-#endif  // GRPCPP_SERVER_CONTEXT_IMPL_H
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index fe242437921..501be844410 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -1020,7 +1020,6 @@ include/grpcpp/server.h \
 include/grpcpp/server_builder.h \
 include/grpcpp/server_builder_impl.h \
 include/grpcpp/server_context.h \
-include/grpcpp/server_context_impl.h \
 include/grpcpp/server_impl.h \
 include/grpcpp/server_posix.h \
 include/grpcpp/server_posix_impl.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index e500b317af8..f1dd2e54e1d 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1022,7 +1022,6 @@ include/grpcpp/server.h \
 include/grpcpp/server_builder.h \
 include/grpcpp/server_builder_impl.h \
 include/grpcpp/server_context.h \
-include/grpcpp/server_context_impl.h \
 include/grpcpp/server_impl.h \
 include/grpcpp/server_posix.h \
 include/grpcpp/server_posix_impl.h \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 98b9bdc4261..b157439a3f4 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -10421,7 +10421,6 @@
       "include/grpcpp/server_builder.h", 
       "include/grpcpp/server_builder_impl.h", 
       "include/grpcpp/server_context.h", 
-      "include/grpcpp/server_context_impl.h", 
       "include/grpcpp/server_impl.h", 
       "include/grpcpp/server_posix.h", 
       "include/grpcpp/server_posix_impl.h", 
@@ -10550,7 +10549,6 @@
       "include/grpcpp/server_builder.h", 
       "include/grpcpp/server_builder_impl.h", 
       "include/grpcpp/server_context.h", 
-      "include/grpcpp/server_context_impl.h", 
       "include/grpcpp/server_impl.h", 
       "include/grpcpp/server_posix.h", 
       "include/grpcpp/server_posix_impl.h",