diff --git a/Sources/OpenVPNAdapter/OpenVPNClient.h b/Sources/OpenVPNAdapter/OpenVPNClient.h
index 7f539ab..30be5a6 100644
--- a/Sources/OpenVPNAdapter/OpenVPNClient.h
+++ b/Sources/OpenVPNAdapter/OpenVPNClient.h
@@ -93,9 +93,6 @@ public:
     void external_pki_cert_request(ClientAPI::ExternalPKICertRequest& certreq) override;
     void external_pki_sign_request(ClientAPI::ExternalPKISignRequest& signreq) override;
     
-    bool remote_override_enabled() override;
-    void remote_override(ClientAPI::RemoteOverride& remote) override;
-    
     void event(const ClientAPI::Event& event) override;
     void log(const ClientAPI::LogInfo& log) override;
     
diff --git a/Sources/OpenVPNAdapter/OpenVPNClient.mm b/Sources/OpenVPNAdapter/OpenVPNClient.mm
index 11b35c3..b2adbae 100644
--- a/Sources/OpenVPNAdapter/OpenVPNClient.mm
+++ b/Sources/OpenVPNAdapter/OpenVPNClient.mm
@@ -153,10 +153,7 @@ bool OpenVPNClient::tun_builder_persist() {
 
 void OpenVPNClient::tun_builder_teardown(bool disconnect) {
     [this->delegate resetSettings];
-    
-    if (disconnect || !this->tun_builder_persist()) {
-        [this->delegate resetTun];
-    }
+    [this->delegate resetTun];
 }
 
 bool OpenVPNClient::socket_protect(int socket, std::string remote, bool ipv6) {
@@ -170,14 +167,6 @@ bool OpenVPNClient::pause_on_connection_timeout() {
 void OpenVPNClient::external_pki_cert_request(ClientAPI::ExternalPKICertRequest& certreq) { }
 void OpenVPNClient::external_pki_sign_request(ClientAPI::ExternalPKISignRequest& signreq) { }
 
-bool OpenVPNClient::remote_override_enabled() {
-    return false;
-}
-
-void OpenVPNClient::remote_override(ClientAPI::RemoteOverride& remote) {
-    // TODO: Override remote server
-}
-
 void OpenVPNClient::event(const ClientAPI::Event& ev) {
     NSString *name = [NSString stringWithUTF8String:ev.name.c_str()];
     NSString *message = [NSString stringWithUTF8String:ev.info.c_str()];