diff --git a/src/java/com/android/internal/telephony/TelephonyEventLog.java b/src/java/com/android/internal/telephony/TelephonyEventLog.java
index cc534f1..3568624 100644
--- a/src/java/com/android/internal/telephony/TelephonyEventLog.java
+++ b/src/java/com/android/internal/telephony/TelephonyEventLog.java
@@ -137,8 +137,6 @@
     public static final String DATA_KEY_SMS_MESSAGE_REF = "messageRef";
     public static final String DATA_KEY_SMS_ACK_PDU = "ackPDU";
     public static final String DATA_KEY_SMS_ERROR_CODE = "errorCode";
-    public static final String DATA_KEY_CALLEE = "callee";
-    public static final String DATA_KEY_PARTICIPANTS = "participants";
     public static final String DATA_KEY_SRC_TECH = "src-tech";
     public static final String DATA_KEY_TARGET_TECH = "target-tech";
 
@@ -508,16 +506,12 @@
         return null;
     }
 
-    public void writeOnImsCallStart(ImsCallSession session, String callee) {
-        Bundle b = new Bundle();
-        b.putString(DATA_KEY_CALLEE, callee);
-        writeEvent(TAG_IMS_CALL_START, getCallId(session), -1, b);
+    public void writeOnImsCallStart(ImsCallSession session) {
+        writeEvent(TAG_IMS_CALL_START, getCallId(session), -1, null);
     }
 
-    public void writeOnImsCallStartConference(ImsCallSession session, String[] participants) {
-        Bundle b = new Bundle();
-        b.putStringArray(DATA_KEY_PARTICIPANTS, participants);
-        writeEvent(TAG_IMS_CALL_START_CONFERENCE, getCallId(session), -1, b);
+    public void writeOnImsCallStartConference(ImsCallSession session) {
+        writeEvent(TAG_IMS_CALL_START_CONFERENCE, getCallId(session), -1, null);
     }
 
     public void writeOnImsCallReceive(ImsCallSession session) {
diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
index e677cf2..9a270c4 100644
--- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
+++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
@@ -572,7 +572,7 @@
                     callees, mImsCallListener);
             conn.setImsCall(imsCall);
 
-            mEventLog.writeOnImsCallStart(imsCall.getSession(), callees[0]);
+            mEventLog.writeOnImsCallStart(imsCall.getSession());
 
             setVideoCallProvider(conn, imsCall);
             conn.setAllowAddCallDuringVideoCall(mAllowAddCallDuringVideoCall);
