GRPC metadata review cleanup