diff --git a/common/src/com/android/services/telephony/common/Call.java b/common/src/com/android/services/telephony/common/Call.java
index bb1806c..e6a1c64 100644
--- a/common/src/com/android/services/telephony/common/Call.java
+++ b/common/src/com/android/services/telephony/common/Call.java
@@ -89,11 +89,9 @@
         public static final int RESPOND_VIA_TEXT   = 0x00000020; /* has respond via text option */
         public static final int MUTE               = 0x00000040; /* can mute the call */
         public static final int GENERIC_CONFERENCE = 0x00000080; /* generic conference mode */
-        public static final int VIDEO_HANDOFF      = 0x00000100; /* handoff to video */
-        public static final int CONNECTION_HANDOFF = 0x00000200; /* handoff between wifi and cell */
 
         public static final int ALL = HOLD | SUPPORT_HOLD | MERGE_CALLS | SWAP_CALLS | ADD_CALL
-                | RESPOND_VIA_TEXT | MUTE | GENERIC_CONFERENCE | VIDEO_HANDOFF | CONNECTION_HANDOFF;
+                | RESPOND_VIA_TEXT | MUTE | GENERIC_CONFERENCE;
     }
 
     private static final Map<Integer, String> STATE_MAP = ImmutableMap.<Integer, String>builder()
diff --git a/common/src/com/android/services/telephony/common/ICallCommandService.aidl b/common/src/com/android/services/telephony/common/ICallCommandService.aidl
index 89a27d9..cb3b674 100644
--- a/common/src/com/android/services/telephony/common/ICallCommandService.aidl
+++ b/common/src/com/android/services/telephony/common/ICallCommandService.aidl
@@ -106,14 +106,4 @@
      * device has soft navigation buttons.
      */
     void setSystemBarNavigationEnabled(boolean enable);
-
-    /**
-     * Switch to video mode.
-     */
-    void videoHandoff(int callId);
-
-    /**
-     * Switch between wifi and cell.
-     */
-    void connectionHandoff(int callId);
 }
diff --git a/src/com/android/phone/CallCommandService.java b/src/com/android/phone/CallCommandService.java
index 36981ee..7b239ec 100644
--- a/src/com/android/phone/CallCommandService.java
+++ b/src/com/android/phone/CallCommandService.java
@@ -247,14 +247,4 @@
             Log.e(TAG, "Error enabling or disabling system bar navigation", e);
         }
     }
-
-    @Override
-    public void videoHandoff(int callId) {
-        // TODO(sail): Implement this.
-    }
-
-    @Override
-    public void connectionHandoff(int callId) {
-        // TODO(sail): Implement this.
-    }
 }