diff --git a/shared/protos/_generated/tunnelbroker.pb.h b/shared/protos/_generated/tunnelbroker.pb.h
--- a/shared/protos/_generated/tunnelbroker.pb.h
+++ b/shared/protos/_generated/tunnelbroker.pb.h
@@ -1955,7 +1955,6 @@
     kMessagesToDeliver = 1,
     kProcessedMessages = 2,
     kNewNotifyTokenRequired = 3,
-    kPing = 4,
     DATA_NOT_SET = 0,
   };
 
@@ -2037,7 +2036,6 @@
     kMessagesToDeliverFieldNumber = 1,
     kProcessedMessagesFieldNumber = 2,
     kNewNotifyTokenRequiredFieldNumber = 3,
-    kPingFieldNumber = 4,
   };
   // .tunnelbroker.MessagesToDeliver messagesToDeliver = 1;
   bool has_messagestodeliver() const;
@@ -2093,24 +2091,6 @@
       PROTOBUF_NAMESPACE_ID::Empty* newnotifytokenrequired);
   PROTOBUF_NAMESPACE_ID::Empty* unsafe_arena_release_newnotifytokenrequired();
 
-  // .google.protobuf.Empty ping = 4;
-  bool has_ping() const;
-  private:
-  bool _internal_has_ping() const;
-  public:
-  void clear_ping();
-  const PROTOBUF_NAMESPACE_ID::Empty& ping() const;
-  PROTOBUF_NAMESPACE_ID::Empty* release_ping();
-  PROTOBUF_NAMESPACE_ID::Empty* mutable_ping();
-  void set_allocated_ping(PROTOBUF_NAMESPACE_ID::Empty* ping);
-  private:
-  const PROTOBUF_NAMESPACE_ID::Empty& _internal_ping() const;
-  PROTOBUF_NAMESPACE_ID::Empty* _internal_mutable_ping();
-  public:
-  void unsafe_arena_set_allocated_ping(
-      PROTOBUF_NAMESPACE_ID::Empty* ping);
-  PROTOBUF_NAMESPACE_ID::Empty* unsafe_arena_release_ping();
-
   void clear_data();
   DataCase data_case() const;
   // @@protoc_insertion_point(class_scope:tunnelbroker.MessageToClient)
@@ -2119,7 +2099,6 @@
   void set_has_messagestodeliver();
   void set_has_processedmessages();
   void set_has_newnotifytokenrequired();
-  void set_has_ping();
 
   inline bool has_data() const;
   inline void clear_has_data();
@@ -2133,7 +2112,6 @@
     ::tunnelbroker::MessagesToDeliver* messagestodeliver_;
     ::tunnelbroker::ProcessedMessages* processedmessages_;
     PROTOBUF_NAMESPACE_ID::Empty* newnotifytokenrequired_;
-    PROTOBUF_NAMESPACE_ID::Empty* ping_;
   } data_;
   mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
@@ -3914,71 +3892,6 @@
   return _internal_mutable_newnotifytokenrequired();
 }
 
-// .google.protobuf.Empty ping = 4;
-inline bool MessageToClient::_internal_has_ping() const {
-  return data_case() == kPing;
-}
-inline bool MessageToClient::has_ping() const {
-  return _internal_has_ping();
-}
-inline void MessageToClient::set_has_ping() {
-  _oneof_case_[0] = kPing;
-}
-inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::release_ping() {
-  // @@protoc_insertion_point(field_release:tunnelbroker.MessageToClient.ping)
-  if (_internal_has_ping()) {
-    clear_has_data();
-      PROTOBUF_NAMESPACE_ID::Empty* temp = data_.ping_;
-    if (GetArena() != nullptr) {
-      temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-    }
-    data_.ping_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const PROTOBUF_NAMESPACE_ID::Empty& MessageToClient::_internal_ping() const {
-  return _internal_has_ping()
-      ? *data_.ping_
-      : reinterpret_cast< PROTOBUF_NAMESPACE_ID::Empty&>(PROTOBUF_NAMESPACE_ID::_Empty_default_instance_);
-}
-inline const PROTOBUF_NAMESPACE_ID::Empty& MessageToClient::ping() const {
-  // @@protoc_insertion_point(field_get:tunnelbroker.MessageToClient.ping)
-  return _internal_ping();
-}
-inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::unsafe_arena_release_ping() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:tunnelbroker.MessageToClient.ping)
-  if (_internal_has_ping()) {
-    clear_has_data();
-    PROTOBUF_NAMESPACE_ID::Empty* temp = data_.ping_;
-    data_.ping_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void MessageToClient::unsafe_arena_set_allocated_ping(PROTOBUF_NAMESPACE_ID::Empty* ping) {
-  clear_data();
-  if (ping) {
-    set_has_ping();
-    data_.ping_ = ping;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:tunnelbroker.MessageToClient.ping)
-}
-inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::_internal_mutable_ping() {
-  if (!_internal_has_ping()) {
-    clear_data();
-    set_has_ping();
-    data_.ping_ = CreateMaybeMessage< PROTOBUF_NAMESPACE_ID::Empty >(GetArena());
-  }
-  return data_.ping_;
-}
-inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::mutable_ping() {
-  // @@protoc_insertion_point(field_mutable:tunnelbroker.MessageToClient.ping)
-  return _internal_mutable_ping();
-}
-
 inline bool MessageToClient::has_data() const {
   return data_case() != DATA_NOT_SET;
 }
diff --git a/shared/protos/_generated/tunnelbroker.pb.cc b/shared/protos/_generated/tunnelbroker.pb.cc
--- a/shared/protos/_generated/tunnelbroker.pb.cc
+++ b/shared/protos/_generated/tunnelbroker.pb.cc
@@ -258,7 +258,6 @@
   ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
   ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
   ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
-  ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
   PROTOBUF_FIELD_OFFSET(::tunnelbroker::MessageToClient, data_),
 };
 static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
@@ -316,12 +315,11 @@
   "\t\022\024\n\014fromDeviceID\030\002 \001(\t\022\017\n\007payload\030\003 \001(\t"
   "\022\022\n\nblobHashes\030\004 \003(\t\"J\n\021MessagesToDelive"
   "r\0225\n\010messages\030\001 \003(\0132#.tunnelbroker.Messa"
-  "geToClientStruct\"\367\001\n\017MessageToClient\022<\n\021"
+  "geToClientStruct\"\317\001\n\017MessageToClient\022<\n\021"
   "messagesToDeliver\030\001 \001(\0132\037.tunnelbroker.M"
   "essagesToDeliverH\000\022<\n\021processedMessages\030"
   "\002 \001(\0132\037.tunnelbroker.ProcessedMessagesH\000"
   "\0228\n\026newNotifyTokenRequired\030\003 \001(\0132\026.googl"
-  "e.protobuf.EmptyH\000\022&\n\004ping\030\004 \001(\0132\026.googl"
   "e.protobuf.EmptyH\000B\006\n\004data2\251\002\n\023Tunnelbro"
   "kerService\022c\n\020SessionSignature\022%.tunnelb"
   "roker.SessionSignatureRequest\032&.tunnelbr"
@@ -337,7 +335,7 @@
 };
 static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_tunnelbroker_2eproto_once;
 const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_tunnelbroker_2eproto = {
-  false, false, 1614, descriptor_table_protodef_tunnelbroker_2eproto, "tunnelbroker.proto", 
+  false, false, 1574, descriptor_table_protodef_tunnelbroker_2eproto, "tunnelbroker.proto", 
   &descriptor_table_tunnelbroker_2eproto_once, descriptor_table_tunnelbroker_2eproto_deps, 1, 11,
   schemas, file_default_instances, TableStruct_tunnelbroker_2eproto::offsets,
   file_level_metadata_tunnelbroker_2eproto, file_level_enum_descriptors_tunnelbroker_2eproto, file_level_service_descriptors_tunnelbroker_2eproto,
@@ -2972,7 +2970,6 @@
   static const ::tunnelbroker::MessagesToDeliver& messagestodeliver(const MessageToClient* msg);
   static const ::tunnelbroker::ProcessedMessages& processedmessages(const MessageToClient* msg);
   static const PROTOBUF_NAMESPACE_ID::Empty& newnotifytokenrequired(const MessageToClient* msg);
-  static const PROTOBUF_NAMESPACE_ID::Empty& ping(const MessageToClient* msg);
 };
 
 const ::tunnelbroker::MessagesToDeliver&
@@ -2987,10 +2984,6 @@
 MessageToClient::_Internal::newnotifytokenrequired(const MessageToClient* msg) {
   return *msg->data_.newnotifytokenrequired_;
 }
-const PROTOBUF_NAMESPACE_ID::Empty&
-MessageToClient::_Internal::ping(const MessageToClient* msg) {
-  return *msg->data_.ping_;
-}
 void MessageToClient::set_allocated_messagestodeliver(::tunnelbroker::MessagesToDeliver* messagestodeliver) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArena();
   clear_data();
@@ -3044,29 +3037,6 @@
     clear_has_data();
   }
 }
-void MessageToClient::set_allocated_ping(PROTOBUF_NAMESPACE_ID::Empty* ping) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArena();
-  clear_data();
-  if (ping) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-      reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(ping)->GetArena();
-    if (message_arena != submessage_arena) {
-      ping = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, ping, submessage_arena);
-    }
-    set_has_ping();
-    data_.ping_ = ping;
-  }
-  // @@protoc_insertion_point(field_set_allocated:tunnelbroker.MessageToClient.ping)
-}
-void MessageToClient::clear_ping() {
-  if (_internal_has_ping()) {
-    if (GetArena() == nullptr) {
-      delete data_.ping_;
-    }
-    clear_has_data();
-  }
-}
 MessageToClient::MessageToClient(::PROTOBUF_NAMESPACE_ID::Arena* arena)
   : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
   SharedCtor();
@@ -3090,10 +3060,6 @@
       _internal_mutable_newnotifytokenrequired()->PROTOBUF_NAMESPACE_ID::Empty::MergeFrom(from._internal_newnotifytokenrequired());
       break;
     }
-    case kPing: {
-      _internal_mutable_ping()->PROTOBUF_NAMESPACE_ID::Empty::MergeFrom(from._internal_ping());
-      break;
-    }
     case DATA_NOT_SET: {
       break;
     }
@@ -3149,12 +3115,6 @@
       }
       break;
     }
-    case kPing: {
-      if (GetArena() == nullptr) {
-        delete data_.ping_;
-      }
-      break;
-    }
     case DATA_NOT_SET: {
       break;
     }
@@ -3201,13 +3161,6 @@
           CHK_(ptr);
         } else goto handle_unusual;
         continue;
-      // .google.protobuf.Empty ping = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) {
-          ptr = ctx->ParseMessage(_internal_mutable_ping(), ptr);
-          CHK_(ptr);
-        } else goto handle_unusual;
-        continue;
       default: {
       handle_unusual:
         if ((tag & 7) == 4 || tag == 0) {
@@ -3260,14 +3213,6 @@
         3, _Internal::newnotifytokenrequired(this), target, stream);
   }
 
-  // .google.protobuf.Empty ping = 4;
-  if (_internal_has_ping()) {
-    target = stream->EnsureSpace(target);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(
-        4, _Internal::ping(this), target, stream);
-  }
-
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
@@ -3306,13 +3251,6 @@
           *data_.newnotifytokenrequired_);
       break;
     }
-    // .google.protobuf.Empty ping = 4;
-    case kPing: {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *data_.ping_);
-      break;
-    }
     case DATA_NOT_SET: {
       break;
     }
@@ -3361,10 +3299,6 @@
       _internal_mutable_newnotifytokenrequired()->PROTOBUF_NAMESPACE_ID::Empty::MergeFrom(from._internal_newnotifytokenrequired());
       break;
     }
-    case kPing: {
-      _internal_mutable_ping()->PROTOBUF_NAMESPACE_ID::Empty::MergeFrom(from._internal_ping());
-      break;
-    }
     case DATA_NOT_SET: {
       break;
     }
diff --git a/shared/protos/tunnelbroker.proto b/shared/protos/tunnelbroker.proto
--- a/shared/protos/tunnelbroker.proto
+++ b/shared/protos/tunnelbroker.proto
@@ -85,6 +85,5 @@
     MessagesToDeliver messagesToDeliver = 1;
     ProcessedMessages processedMessages = 2;
     google.protobuf.Empty newNotifyTokenRequired = 3;
-    google.protobuf.Empty ping = 4;
   }
 }