diff --git a/Makefile b/Makefile
index a01d6f9d9a02f4982710473cee4dc485e40a966b..50249ec9feb6287e9ca5298d76cc78dd59f52817 100644
--- a/Makefile
+++ b/Makefile
@@ -666,7 +666,6 @@ LIBGRPC_SRC = \
     src/core/surface/server.c \
     src/core/surface/server_chttp2.c \
     src/core/surface/server_create.c \
-    src/core/surface/surface_em.c \
     src/core/transport/chttp2/alpn.c \
     src/core/transport/chttp2/bin_encoder.c \
     src/core/transport/chttp2/frame_data.c \
@@ -1581,7 +1580,6 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/surface/server.c \
     src/core/surface/server_chttp2.c \
     src/core/surface/server_create.c \
-    src/core/surface/surface_em.c \
     src/core/transport/chttp2/alpn.c \
     src/core/transport/chttp2/bin_encoder.c \
     src/core/transport/chttp2/frame_data.c \
diff --git a/build.json b/build.json
index b66c5ea96118a617d90d4b696c85fbc431672370..ec238e9340807c84f538eba5b2f181c215e958a7 100644
--- a/build.json
+++ b/build.json
@@ -153,7 +153,6 @@
         "src/core/surface/server.c",
         "src/core/surface/server_chttp2.c",
         "src/core/surface/server_create.c",
-        "src/core/surface/surface_em.c",
         "src/core/transport/chttp2/alpn.c",
         "src/core/transport/chttp2/bin_encoder.c",
         "src/core/transport/chttp2/frame_data.c",
@@ -236,7 +235,6 @@
         "src/core/surface/event_string.h",
         "src/core/surface/lame_client.h",
         "src/core/surface/server.h",
-        "src/core/surface/surface_em.h",
         "src/core/surface/surface_trace.h",
         "src/core/transport/chttp2/bin_encoder.h",
         "src/core/transport/chttp2/frame_data.h",
diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj
index 0ecb82384abfa228a6d48f9b4aaa8259fdef146f..c3e421bc2da0c8d61857dfbd8d4d226695db411a 100644
--- a/vsprojects/vs2013/grpc.vcxproj
+++ b/vsprojects/vs2013/grpc.vcxproj
@@ -131,7 +131,6 @@
     <ClInclude Include="..\..\src\core\surface\event_string.h" />
     <ClInclude Include="..\..\src\core\surface\lame_client.h" />
     <ClInclude Include="..\..\src\core\surface\server.h" />
-    <ClInclude Include="..\..\src\core\surface\surface_em.h" />
     <ClInclude Include="..\..\src\core\surface\surface_trace.h" />
     <ClInclude Include="..\..\src\core\transport\chttp2\bin_encoder.h" />
     <ClInclude Include="..\..\src\core\transport\chttp2\frame_data.h" />
@@ -278,8 +277,6 @@
     </ClCompile>
     <ClCompile Include="..\..\src\core\surface\server_create.c">
     </ClCompile>
-    <ClCompile Include="..\..\src\core\surface\surface_em.c">
-    </ClCompile>
     <ClCompile Include="..\..\src\core\transport\chttp2\alpn.c">
     </ClCompile>
     <ClCompile Include="..\..\src\core\transport\chttp2\bin_encoder.c">