diff --git a/benchmark/grpc_testing/test.pb.go b/benchmark/grpc_testing/test.pb.go
index 5561c2318..d8511b853 100644
--- a/benchmark/grpc_testing/test.pb.go
+++ b/benchmark/grpc_testing/test.pb.go
@@ -421,7 +421,6 @@ func RegisterTestServiceServer(s *grpc.Server, srv TestServiceServer) {
 
 func _TestService_UnaryCall_Handler(srv interface{}, ctx context.Context, decodeFunc func([]byte, interface{}) error, buf []byte) (interface{}, error) {
 	in := new(SimpleRequest)
-	//if err := codec.Unmarshal(buf, in); err != nil {
 	if err := decodeFunc(buf, in); err != nil {
 		return nil, err
 	}
diff --git a/server.go b/server.go
index c0728dce3..0be82b7e0 100644
--- a/server.go
+++ b/server.go
@@ -320,11 +320,6 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
 			}
 			return err
 		}
-		//if traceInfo.tr != nil {
-			// TODO: set payload.msg to something that
-			// prints usefully with %s; req is a []byte.
-			//traceInfo.tr.LazyLog(&payload{sent: false}, true)
-		//}
 		switch pf {
 		case compressionNone:
 			statusCode := codes.OK