diff --git a/sip/src/com/android/services/telephony/sip/SipConnection.java b/sip/src/com/android/services/telephony/sip/SipConnection.java
index 699090f..efc9676 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnection.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnection.java
@@ -278,7 +278,7 @@
             getPhone().unregisterForPreciseCallStateChanged(mHandler);
         }
         mOriginalConnection = null;
-        setDestroyed();
+        destroy();
     }
 
     private static void log(String msg) {
diff --git a/src/com/android/services/telephony/ConferenceConnection.java b/src/com/android/services/telephony/ConferenceConnection.java
index dbcdbfe..1afc8e0 100644
--- a/src/com/android/services/telephony/ConferenceConnection.java
+++ b/src/com/android/services/telephony/ConferenceConnection.java
@@ -31,7 +31,7 @@
     protected void onChildrenChanged(List<Connection> children) {
         if (children.isEmpty()) {
             setDisconnected(DisconnectCause.LOCAL, "conference call disconnected.");
-            setDestroyed();
+            destroy();
         }
     }
 
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 5176b27..13f0b0c 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -18,14 +18,10 @@
 
 import android.net.Uri;
 import android.os.AsyncResult;
-import android.content.ComponentName;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.telecomm.CallAudioState;
 import android.telecomm.CallCapabilities;
-import android.telecomm.ConnectionService;
-import android.telecomm.StatusHints;
 import android.telephony.DisconnectCause;
 
 import com.android.internal.telephony.Call;
@@ -35,8 +31,6 @@
 import com.android.phone.R;
 
 import android.telecomm.Connection;
-import android.telephony.PhoneNumberUtils;
-import android.telephony.TelephonyManager;
 
 import java.util.List;
 import java.util.Objects;
@@ -446,7 +440,7 @@
             getPhone().unregisterForRingbackTone(mHandler);
         }
         mOriginalConnection = null;
-        setDestroyed();
+        destroy();
     }
 
     /**
