diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp b/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp
index 9784f751f2..31ba8ab18a 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/Android.bp
@@ -40,29 +40,6 @@ filegroup {
     ],
 }
 
-cc_library_static {
-    name: "android.hardware.automotive.vehicle@2.0-grpc",
-    vendor: true,
-    include_dirs: [
-        "external/protobuf/src",
-    ],
-    generated_headers: [
-        "DefaultVehicleHalProtoStub_h",
-    ],
-    export_generated_headers: [
-        "DefaultVehicleHalProtoStub_h",
-    ],
-    generated_sources: [
-        "DefaultVehicleHalProtoStub_cc",
-    ],
-    shared_libs: [
-        "libgrpc++_unsecure",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
-    ],
-}
-
 genrule {
     name: "DefaultVehicleHalProtoStub_h",
     tools: [
@@ -72,13 +49,10 @@ genrule {
     cmd: "$(location aprotoc) -I$$(dirname $(in)) -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
     srcs: [
         "VehicleHalProto.proto",
-        "VehicleServer.proto",
     ],
     out: [
         "VehicleHalProto.pb.h",
         "VehicleHalProto.grpc.pb.h",
-        "VehicleServer.pb.h",
-        "VehicleServer.grpc.pb.h",
     ],
 }
 
@@ -91,12 +65,9 @@ genrule {
     cmd: "$(location aprotoc) -I$$(dirname $(in)) -Iexternal/protobuf/src --plugin=protoc-gen-grpc=$(location protoc-gen-grpc-cpp-plugin) $(in) --grpc_out=$(genDir) --cpp_out=$(genDir)",
     srcs: [
         "VehicleHalProto.proto",
-        "VehicleServer.proto",
     ],
     out: [
         "VehicleHalProto.pb.cc",
         "VehicleHalProto.grpc.pb.cc",
-        "VehicleServer.pb.cc",
-        "VehicleServer.grpc.pb.cc",
     ],
 }
diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/VehicleServer.proto b/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/VehicleServer.proto
deleted file mode 100644
index 6f71d654a7..0000000000
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/proto/VehicleServer.proto
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * 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.
- */
-
-syntax = "proto3";
-
-package vhal_proto;
-
-import "google/protobuf/empty.proto";
-import "VehicleHalProto.proto";
-
-// correspond to StatusCode defined in types.hal
-enum VehicleHalStatusCode {
-    OK                                  = 0;
-    TRY_AGAIN                           = 1;
-    INVALID_ARG                         = 2;
-    NOT_AVAILABLE                       = 3;
-    ACCESS_DENIED                       = 4;
-    INTERNAL_ERROR                      = 5;
-}
-
-message VehicleHalCallStatus {
-    VehicleHalStatusCode status_code    = 1;
-}
-
-message WrappedVehiclePropValue {
-    VehiclePropValue value              = 1;
-    // An indicator on whether we should update the status of the property
-    //   - true: if the value is generated by (emulated/real) car, or;
-    //           if the value is injected to 'fake' a on car event (for debugging purpose)
-    //   - false: if the value is set by VHal (public interface), since Android
-    //            cannot change status of property on a real car
-    bool update_status                  = 2;
-}
-
-service VehicleServer {
-    rpc GetAllPropertyConfig(google.protobuf.Empty) returns (stream VehiclePropConfig) {}
-
-    // Change the property value of the vehicle
-    rpc SetProperty(WrappedVehiclePropValue) returns (VehicleHalCallStatus) {}
-
-    // Start a vehicle property value stream
-    rpc StartPropertyValuesStream(google.protobuf.Empty) returns (stream WrappedVehiclePropValue) {}
-}
-