--- manager.c	2006-07-02 14:05:26.000000000 -0700
+++ manager.c.org	2006-07-02 13:59:02.000000000 -0700
@@ -955,13 +955,8 @@
 			"Context: %s\r\n"
 			"Exten: %s\r\n"
 			"Reason: %d\r\n"
-			"Uniqueid: %s\r\n"
-			"CallerID: %s\r\n"
-			"CallerIDName: %s\r\n",
-			in->idtext, in->tech, in->data, in->context, in->exten, reason, chan ? chan->uniqueid : "<null>",
-                        in->cid_num ? in->cid_num : "<unknown>",
-                        in->cid_name ? in->cid_name : "<unknown>"			
-			);
+			"Uniqueid: %s\r\n",
+			in->idtext, in->tech, in->data, in->context, in->exten, reason, chan ? chan->uniqueid : "<null>");
 	else
 		manager_event(EVENT_FLAG_CALL,
 			"OriginateFailure",
@@ -970,13 +965,8 @@
 			"Context: %s\r\n"
 			"Exten: %s\r\n"
 			"Reason: %d\r\n"
-			"Uniqueid: %s\r\n"
-                        "CallerID: %s\r\n"
-                        "CallerIDName: %s\r\n",                         
-			in->idtext, in->tech, in->data, in->context, in->exten, reason, chan ? chan->uniqueid : "<null>",
-                        in->cid_num ? in->cid_num : "<unknown>",
-                        in->cid_name ? in->cid_name : "<unknown>"			
-			);
+			"Uniqueid: %s\r\n",
+			in->idtext, in->tech, in->data, in->context, in->exten, reason, chan ? chan->uniqueid : "<null>");
 
 	/* Locked by ast_pbx_outgoing_exten or ast_pbx_outgoing_app */
 	if (chan)
@@ -1488,22 +1478,6 @@
 	return NULL;
 }
 
-static char mandescr_sendevent[] =
-"Description: Send an event to manager sessions.\n"
-"Variables: (Names marked with * are required)\n"
-"       *Event: EventStringToSend\n"
-"       Body: Optional string to send.\n";
-
-static int action_sendevent(struct mansession *s, struct message *m)
-{
-        char *event = astman_get_header(m, "Event");
-        char *body = astman_get_header(m, "Body");
-
-        manager_event(EVENT_FLAG_USER, "ManagerUserEvent", "Event: %s\r\nBody: %s\r\n", event, body ? body : "<none>");
-
-        return 0;
-}
-
 static int append_event(struct mansession *s, const char *str)
 {
 	struct eventqent *tmp, *prev=NULL;
@@ -1682,7 +1656,6 @@
 		ast_manager_register("Status", EVENT_FLAG_CALL, action_status, "Lists channel status" );
 		ast_manager_register2("Setvar", EVENT_FLAG_CALL, action_setvar, "Set Channel Variable", mandescr_setvar );
 		ast_manager_register2("Getvar", EVENT_FLAG_CALL, action_getvar, "Gets a Channel Variable", mandescr_getvar );
-		ast_manager_register2("SendEvent", EVENT_FLAG_USER, action_sendevent, "Send Manager Event", mandescr_sendevent );
 		ast_manager_register2("Redirect", EVENT_FLAG_CALL, action_redirect, "Redirect (transfer) a call", mandescr_redirect );
 		ast_manager_register2("Originate", EVENT_FLAG_CALL, action_originate, "Originate Call", mandescr_originate);
 		ast_manager_register2("Command", EVENT_FLAG_COMMAND, action_command, "Execute Asterisk CLI Command", mandescr_command );