diff --git a/codegen/template_bundle/template_files.go b/codegen/template_bundle/template_files.go
index 9ba3faa79..5f56697fd 100644
--- a/codegen/template_bundle/template_files.go
+++ b/codegen/template_bundle/template_files.go
@@ -1206,16 +1206,6 @@ type {{$handler}} struct {
 	{{$privateName}} {{$func}}
 }
 
-// Service returns the service name.
-func (h *{{$handler}}) Service() string {
-	return "{{$svc.Name}}"
-}
-
-// Method returns the method name.
-func (h *{{$handler}}) Method() string {
-	return "{{.Name}}"
-}
-
 // Handle parses request from wire value and calls corresponding handler function.
 func (h *{{$handler}}) Handle(
 	ctx context.Context,
@@ -1282,7 +1272,7 @@ func tchannel_client_test_serverTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "tchannel_client_test_server.tmpl", size: 2982, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
+	info := bindataFileInfo{name: "tchannel_client_test_server.tmpl", size: 2777, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/codegen/templates/tchannel_client_test_server.tmpl b/codegen/templates/tchannel_client_test_server.tmpl
index 10919a4fa..1393237e0 100644
--- a/codegen/templates/tchannel_client_test_server.tmpl
+++ b/codegen/templates/tchannel_client_test_server.tmpl
@@ -41,16 +41,6 @@ type {{$handler}} struct {
 	{{$privateName}} {{$func}}
 }
 
-// Service returns the service name.
-func (h *{{$handler}}) Service() string {
-	return "{{$svc.Name}}"
-}
-
-// Method returns the method name.
-func (h *{{$handler}}) Method() string {
-	return "{{.Name}}"
-}
-
 // Handle parses request from wire value and calls corresponding handler function.
 func (h *{{$handler}}) Handle(
 	ctx context.Context,
diff --git a/examples/example-gateway/build/clients/baz/baz_test_server.go b/examples/example-gateway/build/clients/baz/baz_test_server.go
index ed75ab609..81cf1af4f 100644
--- a/examples/example-gateway/build/clients/baz/baz_test_server.go
+++ b/examples/example-gateway/build/clients/baz/baz_test_server.go
@@ -51,16 +51,6 @@ type SimpleServiceCallHandler struct {
 	call SimpleServiceCallFunc
 }
 
-// Service returns the service name.
-func (h *SimpleServiceCallHandler) Service() string {
-	return "SimpleService"
-}
-
-// Method returns the method name.
-func (h *SimpleServiceCallHandler) Method() string {
-	return "Call"
-}
-
 // Handle parses request from wire value and calls corresponding handler function.
 func (h *SimpleServiceCallHandler) Handle(
 	ctx context.Context,
@@ -109,16 +99,6 @@ type SimpleServiceCompareHandler struct {
 	compare SimpleServiceCompareFunc
 }
 
-// Service returns the service name.
-func (h *SimpleServiceCompareHandler) Service() string {
-	return "SimpleService"
-}
-
-// Method returns the method name.
-func (h *SimpleServiceCompareHandler) Method() string {
-	return "Compare"
-}
-
 // Handle parses request from wire value and calls corresponding handler function.
 func (h *SimpleServiceCompareHandler) Handle(
 	ctx context.Context,
@@ -168,16 +148,6 @@ type SimpleServicePingHandler struct {
 	ping SimpleServicePingFunc
 }
 
-// Service returns the service name.
-func (h *SimpleServicePingHandler) Service() string {
-	return "SimpleService"
-}
-
-// Method returns the method name.
-func (h *SimpleServicePingHandler) Method() string {
-	return "Ping"
-}
-
 // Handle parses request from wire value and calls corresponding handler function.
 func (h *SimpleServicePingHandler) Handle(
 	ctx context.Context,
@@ -216,16 +186,6 @@ type SimpleServiceSillyNoopHandler struct {
 	sillynoop SimpleServiceSillyNoopFunc
 }
 
-// Service returns the service name.
-func (h *SimpleServiceSillyNoopHandler) Service() string {
-	return "SimpleService"
-}
-
-// Method returns the method name.
-func (h *SimpleServiceSillyNoopHandler) Method() string {
-	return "SillyNoop"
-}
-
 // Handle parses request from wire value and calls corresponding handler function.
 func (h *SimpleServiceSillyNoopHandler) Handle(
 	ctx context.Context,