Lots more removal of deprecated things

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43452 65c4cc65-6c06-0410-ace0-fbb531ad65f3

10 files changed, 54 insertions, 965 deletions

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 92027fb5e..42d795a06 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -77,11 +77,9 @@ static const char tdesc[] = "Call Agent Proxy Channel";
 static const char config[] = "agents.conf";
 
 static const char app[] = "AgentLogin";
-static const char app2[] = "AgentCallbackLogin";
 static const char app3[] = "AgentMonitorOutgoing";
 
 static const char synopsis[] = "Call agent login";
-static const char synopsis2[] = "Call agent callback login";
 static const char synopsis3[] = "Record agent's outgoing call";
 
 static const char descrip[] =
@@ -93,14 +91,6 @@ static const char descrip[] =
 "The option string may contain zero or more of the following characters:\n"
 "      's' -- silent login - do not announce the login ok segment after agent logged in/off\n";
 
-static const char descrip2[] =
-"  AgentCallbackLogin([AgentNo][|[options][|[exten]@context]]):\n"
-"Asks the agent to login to the system with callback.\n"
-"The agent's callback extension is called (optionally with the specified\n"
-"context).\n"
-"The option string may contain zero or more of the following characters:\n"
-"      's' -- silent login - do not announce the login ok segment agent logged in/off\n";
-
 static const char descrip3[] =
 "  AgentMonitorOutgoing([options]):\n"
 "Tries to figure out the id of the agent who is placing outgoing call based on\n"
@@ -1733,24 +1723,14 @@ static char agent_logoff_usage[] =
 "       Sets an agent as no longer logged in.\n"
 "       If 'soft' is specified, do not hangup existing calls.\n";
 
-static struct ast_cli_entry cli_show_agents_deprecated = {
-	{ "show", "agents", NULL },
-	agents_show, NULL,
-	NULL, NULL };
-
-static struct ast_cli_entry cli_show_agents_online_deprecated = {
-	{ "show", "agents", "online" },
-	agents_show_online, NULL,
-	NULL, NULL };
-
 static struct ast_cli_entry cli_agents[] = {
 	{ { "agent", "list", NULL },
 	agents_show, "Show status of agents",
-	show_agents_usage, NULL, &cli_show_agents_deprecated },
+	show_agents_usage },
 
 	{ { "agent", "list", "online" },
 	agents_show_online, "Show all online agents",
-	show_agents_online_usage, NULL, &cli_show_agents_online_deprecated },
+	show_agents_online_usage },
 
 	{ { "agent", "logoff", NULL },
 	agent_logoff_cmd, "Sets an agent offline",
@@ -2200,117 +2180,6 @@ static int login_exec(struct ast_channel *chan, void *data)
 	return __login_exec(chan, data, 0);
 }
 
-static void callback_deprecated(void)
-{
-	static int depwarning = 0;
-
-	if (!depwarning) {
-		depwarning = 1;
-
-		ast_log(LOG_WARNING, "AgentCallbackLogin is deprecated and will be removed in a future release.\n");
-		ast_log(LOG_WARNING, "See doc/queues-with-callback-members.txt for an example of how to achieve\n");
-		ast_log(LOG_WARNING, "the same functionality using only dialplan logic.\n");
-	}
-}
-
-/*!
- *  Called by the AgentCallbackLogin application (from the dial plan).
- * 
- * \param chan
- * \param data
- * \returns
- * \sa login_exec(), agentmonitoroutgoing_exec(), load_module().
- */
-static int callback_exec(struct ast_channel *chan, void *data)
-{
-	callback_deprecated();
-
-	return __login_exec(chan, data, 1);
-}
-
-/*!
- * Sets an agent as logged in by callback in the Manager API.
- * It is registered on load_module() and it gets called by the manager backend.
- * \param s
- * \param m
- * \returns 
- * \sa action_agents(), action_agent_logoff(), load_module().
- */
-static int action_agent_callback_login(struct mansession *s, struct message *m)
-{
-	char *agent = astman_get_header(m, "Agent");
-	char *exten = astman_get_header(m, "Exten");
-	char *context = astman_get_header(m, "Context");
-	char *wrapuptime_s = astman_get_header(m, "WrapupTime");
-	char *ackcall_s = astman_get_header(m, "AckCall");
-	struct agent_pvt *p;
-	int login_state = 0;
-
-	callback_deprecated();
-
-	if (ast_strlen_zero(agent)) {
-		astman_send_error(s, m, "No agent specified");
-		return 0;
-	}
-
-	if (ast_strlen_zero(exten)) {
-		astman_send_error(s, m, "No extension specified");
-		return 0;
-	}
-
-	AST_LIST_LOCK(&agents);
-	AST_LIST_TRAVERSE(&agents, p, list) {
-		if (strcmp(p->agent, agent) || p->pending) 
-			continue;
-		if (p->chan) {
-			login_state = 2; /* already logged in (and on the phone)*/
-			break;
-		}
-		ast_mutex_lock(&p->lock);
-		login_state = 1; /* Successful Login */
-		
-		if (ast_strlen_zero(context))
-			ast_copy_string(p->loginchan, exten, sizeof(p->loginchan));
-		else
-			snprintf(p->loginchan, sizeof(p->loginchan), "%s@%s", exten, context);
-
-		if (!ast_strlen_zero(wrapuptime_s)) {
-			p->wrapuptime = atoi(wrapuptime_s);
-			if (p->wrapuptime < 0)
-				p->wrapuptime = 0;
-		}
-
-		if (ast_true(ackcall_s))
-			p->ackcall = 1;
-		else
-			p->ackcall = 0;
-
-		if (p->loginstart == 0)
-			time(&p->loginstart);
-		manager_event(EVENT_FLAG_AGENT, "Agentcallbacklogin",
-			      "Agent: %s\r\n"
-			      "Loginchan: %s\r\n",
-			      p->agent, p->loginchan);
-		ast_queue_log("NONE", "NONE", agent, "AGENTCALLBACKLOGIN", "%s", p->loginchan);
-		if (option_verbose > 1)
-			ast_verbose(VERBOSE_PREFIX_2 "Callback Agent '%s' logged in on %s\n", p->agent, p->loginchan);
-		ast_device_state_changed("Agent/%s", p->agent);
-		ast_mutex_unlock(&p->lock);
-		if (persistent_agents)
-			dump_agents();
-	}
-	AST_LIST_UNLOCK(&agents);
-
-	if (login_state == 1)
-		astman_send_ack(s, m, "Agent logged in");
-	else if (login_state == 0)
-		astman_send_error(s, m, "No such agent");
-	else if (login_state == 2)
-		astman_send_error(s, m, "Agent already logged in");
-
-	return 0;
-}
-
 /*!
  *  \brief Called by the AgentMonitorOutgoing application (from the dial plan).
  *
@@ -2602,13 +2471,11 @@ static int load_module(void)
 		reload_agents();
 	/* Dialplan applications */
 	ast_register_application(app, login_exec, synopsis, descrip);
-	ast_register_application(app2, callback_exec, synopsis2, descrip2);
 	ast_register_application(app3, agentmonitoroutgoing_exec, synopsis3, descrip3);
 
 	/* Manager commands */
 	ast_manager_register2("Agents", EVENT_FLAG_AGENT, action_agents, "Lists agents and their status", mandescr_agents);
 	ast_manager_register2("AgentLogoff", EVENT_FLAG_AGENT, action_agent_logoff, "Sets an agent as no longer logged in", mandescr_agent_logoff);
-	ast_manager_register2("AgentCallbackLogin", EVENT_FLAG_AGENT, action_agent_callback_login, "Sets an agent as logged in by callback", mandescr_agent_callback_login);
 
 	/* CLI Commands */
 	ast_cli_register_multiple(cli_agents, sizeof(cli_agents) / sizeof(struct ast_cli_entry));
@@ -2638,12 +2505,10 @@ static int unload_module(void)
 	ast_cli_unregister_multiple(cli_agents, sizeof(cli_agents) / sizeof(struct ast_cli_entry));
 	/* Unregister dialplan applications */
 	ast_unregister_application(app);
-	ast_unregister_application(app2);
 	ast_unregister_application(app3);
 	/* Unregister manager command */
 	ast_manager_unregister("Agents");
 	ast_manager_unregister("AgentLogoff");
-	ast_manager_unregister("AgentCallbackLogin");
 	/* Unregister channel */
 	AST_LIST_LOCK(&agents);
 	/* Hangup all interfaces if they have an owner */
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index c3a4315e7..a5fdb57fd 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -841,31 +841,6 @@ static struct ast_channel *alsa_request(const char *type, int format, void *data
 	return tmp;
 }
 
-static int console_autoanswer_deprecated(int fd, int argc, char *argv[])
-{
-	int res = RESULT_SUCCESS;
-
-	if ((argc != 1) && (argc != 2))
-		return RESULT_SHOWUSAGE;
-
-	ast_mutex_lock(&alsalock);
-
-	if (argc == 1) {
-		ast_cli(fd, "Auto answer is %s.\n", autoanswer ? "on" : "off");
-	} else {
-		if (!strcasecmp(argv[1], "on"))
-			autoanswer = -1;
-		else if (!strcasecmp(argv[1], "off"))
-			autoanswer = 0;
-		else
-			res = RESULT_SHOWUSAGE;
-	}
-
-	ast_mutex_unlock(&alsalock);
-
-	return res;
-}
-
 static int console_autoanswer(int fd, int argc, char *argv[])
 {
 	int res = RESULT_SUCCESS;;
@@ -910,38 +885,6 @@ static const char autoanswer_usage[] =
 	"       argument, displays the current on/off status of autoanswer.\n"
 	"       The default value of autoanswer is in 'alsa.conf'.\n";
 
-static int console_answer_deprecated(int fd, int argc, char *argv[])
-{
-	int res = RESULT_SUCCESS;
-
-	if (argc != 1)
-		return RESULT_SHOWUSAGE;
-
-	ast_mutex_lock(&alsalock);
-
-	if (!alsa.owner) {
-		ast_cli(fd, "No one is calling us\n");
-		res = RESULT_FAILURE;
-	} else {
-		hookstate = 1;
-		cursound = -1;
-		grab_owner();
-		if (alsa.owner) {
-			struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_ANSWER };
-			ast_queue_frame(alsa.owner, &f);
-			ast_mutex_unlock(&alsa.owner->lock);
-		}
-		answer_sound();
-	}
-
-	snd_pcm_prepare(alsa.icard);
-	snd_pcm_start(alsa.icard);
-
-	ast_mutex_unlock(&alsalock);
-
-	return RESULT_SUCCESS;
-}
-
 static int console_answer(int fd, int argc, char *argv[])
 {
 	int res = RESULT_SUCCESS;
@@ -978,47 +921,6 @@ static char sendtext_usage[] =
 	"Usage: console send text <message>\n"
 	"       Sends a text message for display on the remote terminal.\n";
 
-static int console_sendtext_deprecated(int fd, int argc, char *argv[])
-{
-	int tmparg = 2;
-	int res = RESULT_SUCCESS;
-
-	if (argc < 2)
-		return RESULT_SHOWUSAGE;
-
-	ast_mutex_lock(&alsalock);
-
-	if (!alsa.owner) {
-		ast_cli(fd, "No one is calling us\n");
-		res = RESULT_FAILURE;
-	} else {
-		struct ast_frame f = { AST_FRAME_TEXT, 0 };
-		char text2send[256] = "";
-		text2send[0] = '\0';
-		while (tmparg < argc) {
-			strncat(text2send, argv[tmparg++], sizeof(text2send) - strlen(text2send) - 1);
-			strncat(text2send, " ", sizeof(text2send) - strlen(text2send) - 1);
-		}
-		text2send[strlen(text2send) - 1] = '\n';
-		f.data = text2send;
-		f.datalen = strlen(text2send) + 1;
-		grab_owner();
-		if (alsa.owner) {
-			ast_queue_frame(alsa.owner, &f);
-			f.frametype = AST_FRAME_CONTROL;
-			f.subclass = AST_CONTROL_ANSWER;
-			f.data = NULL;
-			f.datalen = 0;
-			ast_queue_frame(alsa.owner, &f);
-			ast_mutex_unlock(&alsa.owner->lock);
-		}
-	}
-
-	ast_mutex_unlock(&alsalock);
-
-	return res;
-}
-
 static int console_sendtext(int fd, int argc, char *argv[])
 {
 	int tmparg = 3;
@@ -1064,34 +966,6 @@ static char answer_usage[] =
 	"Usage: console answer\n"
 	"       Answers an incoming call on the console (ALSA) channel.\n";
 
-static int console_hangup_deprecated(int fd, int argc, char *argv[])
-{
-	int res = RESULT_SUCCESS;
-
-	if (argc != 1)
-		return RESULT_SHOWUSAGE;
-
-	cursound = -1;
-
-	ast_mutex_lock(&alsalock);
-
-	if (!alsa.owner && !hookstate) {
-		ast_cli(fd, "No call to hangup up\n");
-		res = RESULT_FAILURE;
-	} else {
-		hookstate = 0;
-		grab_owner();
-		if (alsa.owner) {
-			ast_queue_hangup(alsa.owner);
-			ast_mutex_unlock(&alsa.owner->lock);
-		}
-	}
-
-	ast_mutex_unlock(&alsalock);
-
-	return res;
-}
-
 static int console_hangup(int fd, int argc, char *argv[])
 {
 	int res = RESULT_SUCCESS;
@@ -1124,63 +998,6 @@ static char hangup_usage[] =
 	"Usage: console hangup\n"
 	"       Hangs up any call currently placed on the console.\n";
 
-static int console_dial_deprecated(int fd, int argc, char *argv[])
-{
-	char tmp[256], *tmp2;
-	char *mye, *myc;
-	char *d;
-	int res = RESULT_SUCCESS;
-
-	if ((argc != 1) && (argc != 2))
-		return RESULT_SHOWUSAGE;
-
-	ast_mutex_lock(&alsalock);
-
-	if (alsa.owner) {
-		if (argc == 2) {
-			d = argv[1];
-			grab_owner();
-			if (alsa.owner) {
-				struct ast_frame f = { AST_FRAME_DTMF };
-				while (*d) {
-					f.subclass = *d;
-					ast_queue_frame(alsa.owner, &f);
-					d++;
-				}
-				ast_mutex_unlock(&alsa.owner->lock);
-			}
-		} else {
-			ast_cli(fd, "You're already in a call.  You can use this only to dial digits until you hangup\n");
-			res = RESULT_FAILURE;
-		}
-	} else {
-		mye = exten;
-		myc = context;
-		if (argc == 2) {
-			char *stringp = NULL;
-			strncpy(tmp, argv[1], sizeof(tmp) - 1);
-			stringp = tmp;
-			strsep(&stringp, "@");
-			tmp2 = strsep(&stringp, "@");
-			if (!ast_strlen_zero(tmp))
-				mye = tmp;
-			if (!ast_strlen_zero(tmp2))
-				myc = tmp2;
-		}
-		if (ast_exists_extension(NULL, myc, mye, 1, NULL)) {
-			strncpy(alsa.exten, mye, sizeof(alsa.exten) - 1);
-			strncpy(alsa.context, myc, sizeof(alsa.context) - 1);
-			hookstate = 1;
-			alsa_new(&alsa, AST_STATE_RINGING);
-		} else
-			ast_cli(fd, "No such extension '%s' in context '%s'\n", mye, myc);
-	}
-
-	ast_mutex_unlock(&alsalock);
-
-	return res;
-}
-
 static int console_dial(int fd, int argc, char *argv[])
 {
 	char tmp[256], *tmp2;
@@ -1242,51 +1059,26 @@ static char dial_usage[] =
 	"Usage: console dial [extension[@context]]\n"
 	"       Dials a given extension (and context if specified)\n";
 
-static struct ast_cli_entry cli_alsa_answer_deprecated = {
-	{ "answer", NULL },
-	console_answer_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_alsa_hangup_deprecated = {
-	{ "hangup", NULL },
-	console_hangup_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_alsa_dial_deprecated = {
-	{ "dial", NULL },
-	console_dial_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_alsa_send_text_deprecated = {
-	{ "send", "text", NULL },
-	console_sendtext_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_alsa_autoanswer_deprecated = {
-	{ "autoanswer", NULL },
-	console_autoanswer_deprecated, NULL,
-	NULL, autoanswer_complete };
-
 static struct ast_cli_entry cli_alsa[] = {
 	{ { "console", "answer", NULL },
 	console_answer, "Answer an incoming console call",
-	answer_usage, NULL, &cli_alsa_answer_deprecated },
+	answer_usage },
 
 	{ { "console", "hangup", NULL },
 	console_hangup, "Hangup a call on the console",
-	hangup_usage, NULL, &cli_alsa_hangup_deprecated },
+	hangup_usage },
 
 	{ { "console", "dial", NULL },
 	console_dial, "Dial an extension on the console",
-	dial_usage, NULL, &cli_alsa_dial_deprecated },
+	dial_usage },
 
 	{ { "console", "send", "text", NULL },
 	console_sendtext, "Send text to the remote device",
-	sendtext_usage, NULL, &cli_alsa_send_text_deprecated },
+	sendtext_usage },
 
 	{ { "console", "autoanswer", NULL },
 	console_autoanswer, "Sets/displays autoanswer",
-	autoanswer_usage, autoanswer_complete, &cli_alsa_autoanswer_deprecated },
+	autoanswer_usage, autoanswer_complete },
 };
 
 static int load_module(void)
diff --git a/channels/chan_features.c b/channels/chan_features.c
index 5f01738d2..273f349d6 100644
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -533,15 +533,10 @@ static char show_features_usage[] =
 "Usage: feature list channels\n"
 "       Provides summary information on feature channels.\n";
 
-static struct ast_cli_entry cli_features_show_channels_deprecated = {
-	{ "feature", "show", "channels", NULL },
-	features_show, NULL,
-	NULL };
-
 static struct ast_cli_entry cli_features[] = {
 	{ { "feature", "list", "channels", NULL },
 	features_show, "List status of feature channels",
-	show_features_usage, NULL, &cli_features_show_channels_deprecated },
+	show_features_usage },
 };
 
 static int load_module(void)
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index cbd017360..b3b58ad2e 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -1244,9 +1244,6 @@ static struct oh323_alias *realtime_alias(const char *alias)
 	return a;
 }
 
-#define DEPRECATED(_v, _new_opt) \
-	ast_log(LOG_WARNING, "Option %s found at line %d has beed deprecated. Use %s instead.\n", (_v)->name, (_v)->lineno, (_new_opt))
-
 static int update_common_options(struct ast_variable *v, struct call_options *options)
 {
 	int tmp;
@@ -1274,19 +1271,10 @@ static int update_common_options(struct ast_variable *v, struct call_options *op
 		options->bridge = ast_true(v->value);
 	} else if (!strcasecmp(v->name, "nat")) {
 		options->nat = ast_true(v->value);
-	} else if (!strcasecmp(v->name, "noFastStart")) {
-		DEPRECATED(v, "fastStart");
-		options->fastStart = !ast_true(v->value);
 	} else if (!strcasecmp(v->name, "fastStart")) {
 		options->fastStart = ast_true(v->value);
-	} else if (!strcasecmp(v->name, "noH245Tunneling")) {
-		DEPRECATED(v, "h245Tunneling");
-		options->h245Tunneling = !ast_true(v->value);
 	} else if (!strcasecmp(v->name, "h245Tunneling")) {
 		options->h245Tunneling = ast_true(v->value);
-	} else if (!strcasecmp(v->name, "noSilenceSuppression")) {
-		DEPRECATED(v, "silenceSuppression");
-		options->silenceSuppression = !ast_true(v->value);
 	} else if (!strcasecmp(v->name, "silenceSuppression")) {
 		options->silenceSuppression = ast_true(v->value);
 	} else if (!strcasecmp(v->name, "progress_setup")) {
@@ -1325,7 +1313,6 @@ static int update_common_options(struct ast_variable *v, struct call_options *op
 
 	return 0;
 }
-#undef DEPRECATED
 
 static struct oh323_user *build_user(char *name, struct ast_variable *v, struct ast_variable *alt, int realtime)
 {
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 65722a83d..c4d48b096 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -4441,15 +4441,6 @@ static int iax2_do_jb_debug(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int iax2_no_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 3)
-		return RESULT_SHOWUSAGE;
-	iaxdebug = 0;
-	ast_cli(fd, "IAX2 Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int iax2_no_debug(int fd, int argc, char *argv[])
 {
 	if (argc != 2)
@@ -4459,15 +4450,6 @@ static int iax2_no_debug(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int iax2_no_trunk_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 4)
-		return RESULT_SHOWUSAGE;
-	iaxtrunkdebug = 0;
-	ast_cli(fd, "IAX2 Trunk Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int iax2_no_trunk_debug(int fd, int argc, char *argv[])
 {
 	if (argc != 3)
@@ -4477,16 +4459,6 @@ static int iax2_no_trunk_debug(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int iax2_no_jb_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 4)
-		return RESULT_SHOWUSAGE;
-	jb_setoutput(jb_error_output, jb_warning_output, NULL);
-	jb_debug_output("\n");
-	ast_cli(fd, "IAX2 Jitterbuffer Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int iax2_no_jb_debug(int fd, int argc, char *argv[])
 {
 	if (argc != 3)
@@ -8328,10 +8300,6 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st
 				peer->authmethods = get_auth_methods(v->value);
 			} else if (!strcasecmp(v->name, "encryption")) {
 				peer->encmethods = get_encrypt_methods(v->value);
-			} else if (!strcasecmp(v->name, "notransfer")) {
-				ast_log(LOG_NOTICE, "The option 'notransfer' is deprecated in favor of 'transfer' which has options 'yes', 'no', and 'mediaonly'\n");
-				ast_clear_flag(peer, IAX_TRANSFERMEDIA);	
-				ast_set2_flag(peer, ast_true(v->value), IAX_NOTRANSFER);	
 			} else if (!strcasecmp(v->name, "transfer")) {
 				if (!strcasecmp(v->value, "mediaonly")) {
 					ast_set_flags_to(peer, IAX_NOTRANSFER|IAX_TRANSFERMEDIA, IAX_TRANSFERMEDIA);	
@@ -8568,10 +8536,6 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, st
 				user->authmethods = get_auth_methods(v->value);
 			} else if (!strcasecmp(v->name, "encryption")) {
 				user->encmethods = get_encrypt_methods(v->value);
-			} else if (!strcasecmp(v->name, "notransfer")) {
-				ast_log(LOG_NOTICE, "The option 'notransfer' is deprecated in favor of 'transfer' which has options 'yes', 'no', and 'mediaonly'\n");
-				ast_clear_flag(user, IAX_TRANSFERMEDIA);	
-				ast_set2_flag(user, ast_true(v->value), IAX_NOTRANSFER);	
 			} else if (!strcasecmp(v->name, "transfer")) {
 				if (!strcasecmp(v->value, "mediaonly")) {
 					ast_set_flags_to(user, IAX_NOTRANSFER|IAX_TRANSFERMEDIA, IAX_TRANSFERMEDIA);	
@@ -8921,11 +8885,7 @@ static int set_config(char *config_file, int reload)
 			authdebug = ast_true(v->value);
 		else if (!strcasecmp(v->name, "encryption"))
 			iax2_encryption = get_encrypt_methods(v->value);
-		else if (!strcasecmp(v->name, "notransfer")) {
-			ast_log(LOG_NOTICE, "The option 'notransfer' is deprecated in favor of 'transfer' which has options 'yes', 'no', and 'mediaonly'\n");
-			ast_clear_flag((&globalflags), IAX_TRANSFERMEDIA);	
-			ast_set2_flag((&globalflags), ast_true(v->value), IAX_NOTRANSFER);	
-		} else if (!strcasecmp(v->name, "transfer")) {
+		else if (!strcasecmp(v->name, "transfer")) {
 			if (!strcasecmp(v->value, "mediaonly")) {
 				ast_set_flags_to((&globalflags), IAX_NOTRANSFER|IAX_TRANSFERMEDIA, IAX_TRANSFERMEDIA);	
 			} else if (ast_true(v->value)) {
@@ -9752,111 +9712,42 @@ static char iax2_test_jitter_usage[] =
 "       For testing, simulate maximum jitter of +/- <ms> on <pct> percentage of packets. If <pct> is not specified, adds jitter to all packets.\n";
 #endif /* IAXTESTS */
 
-static struct ast_cli_entry cli_iax2_trunk_debug_deprecated = {
-	{ "iax2", "trunk", "debug", NULL },
-	iax2_do_trunk_debug, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_jb_debug_deprecated = {
-	{ "iax2", "jb", "debug", NULL },
-	iax2_do_jb_debug, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_no_debug_deprecated = {
-	{ "iax2", "no", "debug", NULL },
-	iax2_no_debug_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_no_trunk_debug_deprecated = {
-	{ "iax2", "no", "trunk", "debug", NULL },
-	iax2_no_trunk_debug_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_no_jb_debug_deprecated = {
-	{ "iax2", "no", "jb", "debug", NULL },
-	iax2_no_jb_debug_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_show_cache_deprecated = {
-	{ "iax2", "show", "cache", NULL },
-	iax2_show_cache, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_show_peers_deprecated = {
-	{ "iax2", "show", "peers", NULL },
-	iax2_show_peers, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_show_stats_deprecated = {
-	{ "iax2", "show", "stats", NULL },
-	iax2_show_stats, NULL };
-
-static struct ast_cli_entry cli_iax2_show_firmware_deprecated = {
-	{ "iax2", "show", "firmware", NULL },
-	iax2_show_firmware, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_show_channels_deprecated = {
-	{ "iax2", "show", "channels", NULL },
-	iax2_show_channels, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_show_netstats_deprecated = {
-	{ "iax2", "show", "netstats", NULL },
-	iax2_show_netstats, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_show_users_deprecated = {
-	{ "iax2", "show", "users", NULL },
-	iax2_show_users, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_show_threads_deprecated = {
-	{ "iax2", "show", "threads", NULL },
-	iax2_show_threads, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_iax2_show_registry_deprecated = {
-	{ "iax2", "show", "registry", NULL },
-	iax2_show_registry, "Show IAX registration status",
-	show_reg_usage };
-
 static struct ast_cli_entry cli_iax2[] = {
 	{ { "iax2", "list", "cache", NULL },
 	iax2_show_cache, "Display IAX cached dialplan",
-	show_cache_usage, NULL, &cli_iax2_show_cache_deprecated  },
+	show_cache_usage },
 
 	{ { "iax2", "list", "channels", NULL },
 	iax2_show_channels, "List active IAX channels",
-	show_channels_usage, NULL, &cli_iax2_show_channels_deprecated  },
+	show_channels_usage },
 
 	{ { "iax2", "list", "firmware", NULL },
 	iax2_show_firmware, "List available IAX firmwares",
-	show_firmware_usage, NULL, &cli_iax2_show_firmware_deprecated  },
+	show_firmware_usage },
 
 	{ { "iax2", "list", "netstats", NULL },
 	iax2_show_netstats, "List active IAX channel netstats",
-	show_netstats_usage, NULL, &cli_iax2_show_netstats_deprecated  },
+	show_netstats_usage },
 
 	{ { "iax2", "list", "peers", NULL },
 	iax2_show_peers, "List defined IAX peers",
-	show_peers_usage, NULL, &cli_iax2_show_peers_deprecated  },
+	show_peers_usage },
 
 	{ { "iax2", "list", "registry", NULL },
 	iax2_show_registry, "Display IAX registration status",
-	show_reg_usage, NULL, &cli_iax2_show_registry_deprecated  },
+	show_reg_usage },
 
 	{ { "iax2", "list", "stats", NULL },
 	iax2_show_stats, "Display IAX statistics",
-	show_stats_usage, NULL, &cli_iax2_show_stats_deprecated },
+	show_stats_usage },
 
 	{ { "iax2", "list", "threads", NULL },
 	iax2_show_threads, "Display IAX helper thread info",
-	show_threads_usage, NULL, &cli_iax2_show_threads_deprecated  },
+	show_threads_usage },
 
 	{ { "iax2", "list", "users", NULL },
 	iax2_show_users, "List defined IAX users",
-	show_users_usage, NULL, &cli_iax2_show_users_deprecated  },
+	show_users_usage },
 
 	{ { "iax2", "prune", "realtime", NULL },
 	iax2_prune_realtime, "Prune a cached realtime lookup",
@@ -9876,23 +9767,23 @@ static struct ast_cli_entry cli_iax2[] = {
 
 	{ { "iax2", "debug", "trunk", NULL },
 	iax2_do_trunk_debug, "Enable IAX trunk debugging",
-	debug_trunk_usage, NULL, &cli_iax2_trunk_debug_deprecated },
+	debug_trunk_usage },
 
 	{ { "iax2", "debug", "jb", NULL },
 	iax2_do_jb_debug, "Enable IAX jitterbuffer debugging",
-	debug_jb_usage, NULL, &cli_iax2_jb_debug_deprecated },
+	debug_jb_usage },
 
 	{ { "iax2", "nodebug", NULL },
 	iax2_no_debug, "Disable IAX debugging",
-	no_debug_usage, NULL, &cli_iax2_no_debug_deprecated },
+	no_debug_usage },
 
 	{ { "iax2", "nodebug", "trunk", NULL },
 	iax2_no_trunk_debug, "Disable IAX trunk debugging",
-	no_debug_trunk_usage, NULL, &cli_iax2_no_trunk_debug_deprecated },
+	no_debug_trunk_usage },
 
 	{ { "iax2", "nodebug", "jb", NULL },
 	iax2_no_jb_debug, "Disable IAX jitterbuffer debugging",
-	no_debug_jb_usage, NULL, &cli_iax2_no_jb_debug_deprecated },
+	no_debug_jb_usage },
 
 	{ { "iax2", "test", "losspct", NULL },
 	iax2_test_losspct, "Set IAX2 incoming frame loss percentage",
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 99b3177b2..63e230e34 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -625,15 +625,10 @@ static char show_locals_usage[] =
 "Usage: local list channels\n"
 "       Provides summary information on active local proxy channels.\n";
 
-static struct ast_cli_entry cli_local_show_channels_deprecated = {
-	{ "local", "show", "channels", NULL },
-	locals_show, NULL,
-	NULL };
-
 static struct ast_cli_entry cli_local[] = {
 	{ { "local", "list", "channels", NULL },
 	locals_show, "List status of local channels",
-	show_locals_usage, NULL, &cli_local_show_channels_deprecated },
+	show_locals_usage },
 };
 
 /*! \brief Load module into PBX, register channel */
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 9ae00b837..8e7d108f6 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1122,15 +1122,6 @@ static int mgcp_do_debug(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int mgcp_no_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 3)
-		return RESULT_SHOWUSAGE;
-	mgcpdebug = 0;
-	ast_cli(fd, "MGCP Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int mgcp_no_debug(int fd, int argc, char *argv[])
 {
 	if (argc != 2)
@@ -1140,29 +1131,14 @@ static int mgcp_no_debug(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static struct ast_cli_entry cli_mgcp_no_debug_deprecated = {
-	{ "mgcp", "no", "debug", NULL },
-	mgcp_no_debug_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_mgcp_audit_endpoint_deprecated = {
-	{ "mgcp", "audit", "endpoint", NULL },
-	mgcp_audit_endpoint, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_mgcp_show_endpoints_deprecated = {
-	{ "mgcp", "show", "endpoints", NULL },
-	mgcp_show_endpoints, NULL,
-	NULL };
-
 static struct ast_cli_entry cli_mgcp[] = {
 	{ { "mgcp", "endpoint", "audit", NULL },
 	mgcp_audit_endpoint, "Audit specified MGCP endpoint",
-	audit_endpoint_usage, NULL, &cli_mgcp_audit_endpoint_deprecated },
+	audit_endpoint_usage },
 
 	{ { "mgcp", "endpoint", "list", NULL },
 	mgcp_show_endpoints, "List defined MGCP endpoints",
-	show_endpoints_usage, NULL, &cli_mgcp_show_endpoints_deprecated },
+	show_endpoints_usage },
 
 	{ { "mgcp", "debug", NULL },
 	mgcp_do_debug, "Enable MGCP debugging",
@@ -1170,7 +1146,7 @@ static struct ast_cli_entry cli_mgcp[] = {
 
 	{ { "mgcp", "nodebug", NULL },
 	mgcp_no_debug, "Disable MGCP debugging",
-	no_debug_usage, NULL, &cli_mgcp_no_debug_deprecated },
+	no_debug_usage },
 
 	{ { "mgcp", "reload", NULL },
 	mgcp_reload, "Reload MGCP configuration",
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 876e247dc..76b0d3d8a 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -1068,29 +1068,6 @@ static struct ast_channel *oss_request(const char *type, int format, void *data,
 	return c;
 }
 
-static int console_autoanswer_deprecated(int fd, int argc, char *argv[])
-{
-	struct chan_oss_pvt *o = find_desc(oss_active);
-
-	if (argc == 1) {
-		ast_cli(fd, "Auto answer is %s.\n", o->autoanswer ? "on" : "off");
-		return RESULT_SUCCESS;
-	}
-	if (argc != 2)
-		return RESULT_SHOWUSAGE;
-	if (o == NULL) {
-		ast_log(LOG_WARNING, "Cannot find device %s (should not happen!)\n", oss_active);
-		return RESULT_FAILURE;
-	}
-	if (!strcasecmp(argv[1], "on"))
-		o->autoanswer = -1;
-	else if (!strcasecmp(argv[1], "off"))
-		o->autoanswer = 0;
-	else
-		return RESULT_SHOWUSAGE;
-	return RESULT_SUCCESS;
-}
-
 static int console_autoanswer(int fd, int argc, char *argv[])
 {
 	struct chan_oss_pvt *o = find_desc(oss_active);
@@ -1115,13 +1092,6 @@ static int console_autoanswer(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static char *autoanswer_complete_deprecated(const char *line, const char *word, int pos, int state)
-{
-	static char *choices[] = { "on", "off", NULL };
-
-	return (pos != 2) ? NULL : ast_cli_complete(word, choices, state);
-}
-
 static char *autoanswer_complete(const char *line, const char *word, int pos, int state)
 {
 	static char *choices[] = { "on", "off", NULL };
@@ -1138,28 +1108,6 @@ static char autoanswer_usage[] =
 /*
  * answer command from the console
  */
-static int console_answer_deprecated(int fd, int argc, char *argv[])
-{
-	struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_ANSWER };
-	struct chan_oss_pvt *o = find_desc(oss_active);
-
-	if (argc != 1)
-		return RESULT_SHOWUSAGE;
-	if (!o->owner) {
-		ast_cli(fd, "No one is calling us\n");
-		return RESULT_FAILURE;
-	}
-	o->hookstate = 1;
-	o->cursound = -1;
-	o->nosound = 0;
-	ast_queue_frame(o->owner, &f);
-#if 0
-	/* XXX do we really need it ? considering we shut down immediately... */
-	ring(o, AST_CONTROL_ANSWER);
-#endif
-	return RESULT_SUCCESS;
-}
-
 static int console_answer(int fd, int argc, char *argv[])
 {
 	struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_ANSWER };
@@ -1190,31 +1138,6 @@ static char answer_usage[] =
  * concatenate all arguments into a single string. argv is NULL-terminated
  * so we can use it right away
  */
-static int console_sendtext_deprecated(int fd, int argc, char *argv[])
-{
-	struct chan_oss_pvt *o = find_desc(oss_active);
-	char buf[TEXT_SIZE];
-
-	if (argc < 2)
-		return RESULT_SHOWUSAGE;
-	if (!o->owner) {
-		ast_cli(fd, "Not in a call\n");
-		return RESULT_FAILURE;
-	}
-	ast_join(buf, sizeof(buf) - 1, argv + 2);
-	if (!ast_strlen_zero(buf)) {
-		struct ast_frame f = { 0, };
-		int i = strlen(buf);
-		buf[i] = '\n';
-		f.frametype = AST_FRAME_TEXT;
-		f.subclass = 0;
-		f.data = buf;
-		f.datalen = i + 1;
-		ast_queue_frame(o->owner, &f);
-	}
-	return RESULT_SUCCESS;
-}
-
 static int console_sendtext(int fd, int argc, char *argv[])
 {
 	struct chan_oss_pvt *o = find_desc(oss_active);
@@ -1244,25 +1167,6 @@ static char sendtext_usage[] =
 	"Usage: console send text <message>\n"
 	"       Sends a text message for display on the remote terminal.\n";
 
-static int console_hangup_deprecated(int fd, int argc, char *argv[])
-{
-	struct chan_oss_pvt *o = find_desc(oss_active);
-
-	if (argc != 1)
-		return RESULT_SHOWUSAGE;
-	o->cursound = -1;
-	o->nosound = 0;
-	if (!o->owner && !o->hookstate) { /* XXX maybe only one ? */
-		ast_cli(fd, "No call to hang up\n");
-		return RESULT_FAILURE;
-	}
-	o->hookstate = 0;
-	if (o->owner)
-		ast_queue_hangup(o->owner);
-	setformat(o, O_CLOSE);
-	return RESULT_SUCCESS;
-}
-
 static int console_hangup(int fd, int argc, char *argv[])
 {
 	struct chan_oss_pvt *o = find_desc(oss_active);
@@ -1286,25 +1190,6 @@ static char hangup_usage[] =
 	"Usage: console hangup\n"
 	"       Hangs up any call currently placed on the console.\n";
 
-static int console_flash_deprecated(int fd, int argc, char *argv[])
-{
-	struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_FLASH };
-	struct chan_oss_pvt *o = find_desc(oss_active);
-
-	if (argc != 1)
-		return RESULT_SHOWUSAGE;
-	o->cursound = -1;
-	o->nosound = 0; /* when cursound is -1 nosound must be 0 */
-	if (!o->owner) { /* XXX maybe !o->hookstate too ? */
-		ast_cli(fd, "No call to flash\n");
-		return RESULT_FAILURE;
-	}
-	o->hookstate = 0;
-	if (o->owner) /* XXX must be true, right ? */
-		ast_queue_frame(o->owner, &f);
-	return RESULT_SUCCESS;
-}
-
 static int console_flash(int fd, int argc, char *argv[])
 {
 	struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_FLASH };
@@ -1328,47 +1213,6 @@ static char flash_usage[] =
 	"Usage: console flash\n"
 	"       Flashes the call currently placed on the console.\n";
 
-static int console_dial_deprecated(int fd, int argc, char *argv[])
-{
-	char *s = NULL, *mye = NULL, *myc = NULL;
-	struct chan_oss_pvt *o = find_desc(oss_active);
-
-	if (argc != 1 && argc != 2)
-		return RESULT_SHOWUSAGE;
-	if (o->owner) { /* already in a call */
-		int i;
-		struct ast_frame f = { AST_FRAME_DTMF, 0 };
-
-		if (argc == 1) { /* argument is mandatory here */
-			ast_cli(fd, "Already in a call. You can only dial digits until you hangup.\n");
-			return RESULT_FAILURE;
-		}
-		s = argv[1];
-		/* send the string one char at a time */
-		for (i = 0; i < strlen(s); i++) {
-			f.subclass = s[i];
-			ast_queue_frame(o->owner, &f);
-		}
-		return RESULT_SUCCESS;
-	}
-	/* if we have an argument split it into extension and context */
-	if (argc == 2)
-		s = ast_ext_ctx(argv[1], &mye, &myc);
-	/* supply default values if needed */
-	if (mye == NULL)
-		mye = o->ext;
-	if (myc == NULL)
-		myc = o->ctx;
-	if (ast_exists_extension(NULL, myc, mye, 1, NULL)) {
-		o->hookstate = 1;
-		oss_new(o, mye, myc, AST_STATE_RINGING);
-	} else
-		ast_cli(fd, "No such extension '%s' in context '%s'\n", mye, myc);
-	if (s)
-		free(s);
-	return RESULT_SUCCESS;
-}
-
 static int console_dial(int fd, int argc, char *argv[])
 {
 	char *s = NULL, *mye = NULL, *myc = NULL;
@@ -1422,14 +1266,6 @@ static int __console_mute_unmute(int mute)
 	return RESULT_SUCCESS;
 }
 
-static int console_mute_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 1)
-		return RESULT_SHOWUSAGE;
-
-	return __console_mute_unmute(1);
-}
-
 static int console_mute(int fd, int argc, char *argv[])
 {
 	if (argc != 2)
@@ -1441,14 +1277,6 @@ static int console_mute(int fd, int argc, char *argv[])
 static char mute_usage[] =
 	"Usage: console mute\nMutes the microphone\n";
 
-static int console_unmute_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 1)
-		return RESULT_SHOWUSAGE;
-
-	return __console_mute_unmute(0);
-}
-
 static int console_unmute(int fd, int argc, char *argv[])
 {
 	if (argc != 2)
@@ -1460,37 +1288,6 @@ static int console_unmute(int fd, int argc, char *argv[])
 static char unmute_usage[] =
 	"Usage: console unmute\nUnmutes the microphone\n";
 
-static int console_transfer_deprecated(int fd, int argc, char *argv[])
-{
-	struct chan_oss_pvt *o = find_desc(oss_active);
-	struct ast_channel *b = NULL;
-	char *tmp, *ext, *ctx;
-
-	if (argc != 2)
-		return RESULT_SHOWUSAGE;
-	if (o == NULL)
-		return RESULT_FAILURE;
-	if (o->owner ==NULL || (b = ast_bridged_channel(o->owner)) == NULL) {
-		ast_cli(fd, "There is no call to transfer\n");
-		return RESULT_SUCCESS;
-	}
-
-	tmp = ast_ext_ctx(argv[1], &ext, &ctx);
-	if (ctx == NULL)		/* supply default context if needed */
-		ctx = o->owner->context;
-	if (!ast_exists_extension(b, ctx, ext, 1, b->cid.cid_num))
-		ast_cli(fd, "No such extension exists\n");
-	else {
-		ast_cli(fd, "Whee, transferring %s to %s@%s.\n",
-			b->name, ext, ctx);
-		if (ast_async_goto(b, ctx, ext, 1))
-			ast_cli(fd, "Failed to transfer :(\n");
-	}
-	if (tmp)
-		free(tmp);
-	return RESULT_SUCCESS;
-}
-
 static int console_transfer(int fd, int argc, char *argv[])
 {
 	struct chan_oss_pvt *o = find_desc(oss_active);
@@ -1526,28 +1323,6 @@ static char transfer_usage[] =
 	"       Transfers the currently connected call to the given extension (and\n"
 	"context if specified)\n";
 
-static int console_active_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc == 1)
-		ast_cli(fd, "active console is [%s]\n", oss_active);
-	else if (argc != 2)
-		return RESULT_SHOWUSAGE;
-	else {
-		struct chan_oss_pvt *o;
-		if (strcmp(argv[1], "show") == 0) {
-			for (o = oss_default.next; o; o = o->next)
-				ast_cli(fd, "device [%s] exists\n", o->name);
-			return RESULT_SUCCESS;
-		}
-		o = find_desc(argv[1]);
-		if (o == NULL)
-			ast_cli(fd, "No device [%s] exists\n", argv[1]);
-		else
-			oss_active = o->name;
-	}
-	return RESULT_SUCCESS;
-}
-
 static int console_active(int fd, int argc, char *argv[])
 {
 	if (argc == 2)
@@ -1609,105 +1384,50 @@ static int do_boost(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static struct ast_cli_entry cli_oss_answer_deprecated = {
-	{ "answer", NULL },
-	console_answer_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_oss_hangup_deprecated = {
-	{ "hangup", NULL },
-	console_hangup_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_oss_flash_deprecated = {
-	{ "flash", NULL },
-	console_flash_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_oss_dial_deprecated = {
-	{ "dial", NULL },
-	console_dial_deprecated, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_oss_mute_deprecated = {
-	{ "mute", NULL },
-	console_mute_deprecated, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_oss_unmute_deprecated = {
-	{ "unmute", NULL },
-	console_unmute_deprecated, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_oss_transfer_deprecated = {
-	{ "transfer", NULL },
-	console_transfer_deprecated, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_oss_send_text_deprecated = {
-	{ "send", "text", NULL },
-	console_sendtext_deprecated, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_oss_autoanswer_deprecated = {
-	{ "autoanswer", NULL },
-	console_autoanswer_deprecated, NULL,
-        NULL, autoanswer_complete_deprecated };
-
-static struct ast_cli_entry cli_oss_boost_deprecated = {
-	{ "oss", "boost", NULL },
-	do_boost, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_oss_active_deprecated = {
-	{ "console", NULL },
-	console_active_deprecated, NULL,
-        NULL };
-
 static struct ast_cli_entry cli_oss[] = {
 	{ { "console", "answer", NULL },
 	console_answer, "Answer an incoming console call",
-	answer_usage, NULL, &cli_oss_answer_deprecated },
+	answer_usage },
 
 	{ { "console", "hangup", NULL },
 	console_hangup, "Hangup a call on the console",
-	hangup_usage, NULL, &cli_oss_hangup_deprecated },
+	hangup_usage },
 
 	{ { "console", "flash", NULL },
 	console_flash, "Flash a call on the console",
-	flash_usage, NULL, &cli_oss_flash_deprecated },
+	flash_usage },
 
 	{ { "console", "dial", NULL },
 	console_dial, "Dial an extension on the console",
-	dial_usage, NULL, &cli_oss_dial_deprecated },
+	dial_usage },
 
 	{ { "console", "mute", NULL },
 	console_mute, "Disable mic input",
-	mute_usage, NULL, &cli_oss_mute_deprecated },
+	mute_usage },
 
 	{ { "console", "unmute", NULL },
 	console_unmute, "Enable mic input",
-	unmute_usage, NULL, &cli_oss_unmute_deprecated },
+	unmute_usage },
 
 	{ { "console", "transfer", NULL },
 	console_transfer, "Transfer a call to a different extension",
-	transfer_usage, NULL, &cli_oss_transfer_deprecated },
+	transfer_usage },
 
 	{ { "console", "send", "text", NULL },
 	console_sendtext, "Send text to the remote device",
-	sendtext_usage, NULL, &cli_oss_send_text_deprecated },
+	sendtext_usage },
 
 	{ { "console", "autoanswer", NULL },
 	console_autoanswer, "Sets/displays autoanswer",
-	autoanswer_usage, autoanswer_complete, &cli_oss_autoanswer_deprecated },
+	autoanswer_usage, autoanswer_complete },
 
 	{ { "console", "boost", NULL },
 	do_boost, "Sets/displays mic boost in dB",
-	NULL, NULL, &cli_oss_boost_deprecated },
+	NULL },
 
 	{ { "console", "active", NULL },
 	console_active, "Sets/displays active console",
-	active_usage, NULL, &cli_oss_active_deprecated },
+	active_usage },
 };
 
 /*
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index ed9650fd5..5ba7e7b8f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -80,11 +80,6 @@
  * \par Hanging up
  * The PBX issues a hangup on both incoming and outgoing calls through
  * the sip_hangup() function
- *
- * \par Deprecated stuff
- * This is deprecated and will be removed after the 1.4 release
- * - the SIPUSERAGENT dialplan variable
- * - the ALERT_INFO dialplan variable
  */
 
 
@@ -10644,15 +10639,6 @@ static int sip_notify(int fd, int argc, char *argv[])
 }
 
 /*! \brief Disable SIP Debugging in CLI */
-static int sip_no_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 3)
-		return RESULT_SHOWUSAGE;
-	ast_clear_flag(&global_flags[1], SIP_PAGE2_DEBUG_CONSOLE);
-	ast_cli(fd, "SIP Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int sip_no_debug(int fd, int argc, char *argv[])
 {
 	if (argc != 2)
@@ -10674,16 +10660,6 @@ static int sip_do_history(int fd, int argc, char *argv[])
 }
 
 /*! \brief Disable SIP History logging (CLI) */
-static int sip_no_history_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 3) {
-		return RESULT_SHOWUSAGE;
-	}
-	recordhistory = FALSE;
-	ast_cli(fd, "SIP History Recording Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int sip_no_history(int fd, int argc, char *argv[])
 {
 	if (argc != 2) {
@@ -14863,8 +14839,6 @@ static struct ast_channel *sip_request_call(const char *type, int format, void *
 static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask, struct ast_variable *v)
 {
 	int res = 0;
-	static int dep_insecure_very = 0;
-	static int dep_insecure_yes = 0;
 
 	if (!strcasecmp(v->name, "trustrpid")) {
 		ast_set_flag(&mask[0], SIP_TRUSTRPID);
@@ -14932,21 +14906,7 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask
 	} else if (!strcasecmp(v->name, "insecure")) {
 		ast_set_flag(&mask[0], SIP_INSECURE_PORT | SIP_INSECURE_INVITE);
 		ast_clear_flag(&flags[0], SIP_INSECURE_PORT | SIP_INSECURE_INVITE);
-		if (!strcasecmp(v->value, "very")) {
-			ast_set_flag(&flags[0], SIP_INSECURE_PORT | SIP_INSECURE_INVITE);
-			if (!dep_insecure_very) {
-				ast_log(LOG_WARNING, "insecure=very at line %d is deprecated; use insecure=port,invite instead\n", v->lineno);
-				dep_insecure_very = 1;
-			}
-		}
-		else if (ast_true(v->value)) {
-			ast_set_flag(&flags[0], SIP_INSECURE_PORT);
-			if (!dep_insecure_yes) {
-				ast_log(LOG_WARNING, "insecure=%s at line %d is deprecated; use insecure=port instead\n", v->value, v->lineno);
-				dep_insecure_yes = 1;
-			}
-		}
-		else if (!ast_false(v->value)) {
+		if (!ast_false(v->value)) {
 			char buf[64];
 			char *word, *next;
 
@@ -15621,7 +15581,6 @@ static int reload_config(enum channelreloadreason reason)
 	int auto_sip_domains = FALSE;
 	struct sockaddr_in old_bindaddr = bindaddr;
 	int registry_count = 0, peer_count = 0, user_count = 0;
-	unsigned int temp_tos = 0;
 	struct ast_flags debugflag = {0};
 
 	cfg = ast_config_load(config);
@@ -15907,14 +15866,6 @@ static int reload_config(enum channelreloadreason reason)
 		} else if (!strcasecmp(v->name, "register")) {
 			if (sip_register(v->value, v->lineno) == 0)
 				registry_count++;
-		} else if (!strcasecmp(v->name, "tos")) {
-			if (!ast_str2tos(v->value, &temp_tos)) {
-				global_tos_sip = temp_tos;
-				global_tos_audio = temp_tos;
-				global_tos_video = temp_tos;
-				ast_log(LOG_WARNING, "tos value at line %d is deprecated.  See doc/ip-tos.txt for more information.", v->lineno);
-			} else
-				ast_log(LOG_WARNING, "Invalid tos value at line %d, See doc/ip-tos.txt for more information.\n", v->lineno);
 		} else if (!strcasecmp(v->name, "tos_sip")) {
 			if (ast_str2tos(v->value, &global_tos_sip))
 				ast_log(LOG_WARNING, "Invalid tos_sip value at line %d, recommended value is 'cs3'. See doc/ip-tos.txt.\n", v->lineno);
@@ -16666,97 +16617,42 @@ static int reload(void)
 	return sip_reload(0, 0, NULL);
 }
 
-static struct ast_cli_entry cli_sip_no_history_deprecated = {
-	{ "sip", "no", "history", NULL },
-	sip_no_history_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_sip_no_debug_deprecated = {
-	{ "sip", "no", "debug", NULL },
-	sip_no_debug_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_sip_show_objects_deprecated = {
-	{ "sip", "show", "objects", NULL },
-	sip_show_objects, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_users_deprecated = {
-	{ "sip", "show", "users", NULL },
-	sip_show_users, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_subscriptions_deprecated = {
-	{ "sip", "show", "subscriptions", NULL },
-	sip_show_subscriptions, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_channels_deprecated = {
-	{ "sip", "show", "channels", NULL },
-	sip_show_channels, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_sip_show_domains_deprecated = {
-	{ "sip", "show", "domains", NULL },
-	sip_show_domains, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_settings_deprecated = {
-	{ "sip", "show", "settings", NULL },
-	sip_show_settings, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_peers_deprecated = {
-	{ "sip", "show", "peers", NULL },
-	sip_show_peers, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_inuse_deprecated = {
-	{ "sip", "show", "inuse", NULL },
-	sip_show_inuse, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_registry_deprecated = {
-	{ "sip", "show", "registry", NULL },
-	sip_show_registry, NULL,
-        NULL };
-
 static struct ast_cli_entry cli_sip[] = {
 	{ { "sip", "list", "channels", NULL },
 	sip_show_channels, "List active SIP channels",
-	show_channels_usage, NULL, &cli_sip_show_channels_deprecated },
+	show_channels_usage },
 
 	{ { "sip", "list", "domains", NULL },
 	sip_show_domains, "List our local SIP domains.",
-	show_domains_usage, NULL, &cli_sip_show_domains_deprecated },
+	show_domains_usage },
 
 	{ { "sip", "list", "inuse", NULL },
 	sip_show_inuse, "List all inuse/limits",
-	show_inuse_usage, NULL, &cli_sip_show_inuse_deprecated },
+	show_inuse_usage },
 
 	{ { "sip", "list", "objects", NULL },
 	sip_show_objects, "List all SIP object allocations",
-	show_objects_usage, NULL, &cli_sip_show_objects_deprecated },
+	show_objects_usage },
 
 	{ { "sip", "list", "peers", NULL },
 	sip_show_peers, "List defined SIP peers",
-	show_peers_usage, NULL, &cli_sip_show_peers_deprecated },
+	show_peers_usage },
 
 	{ { "sip", "list", "registry", NULL },
 	sip_show_registry, "List SIP registration status",
-	show_reg_usage, NULL, &cli_sip_show_registry_deprecated },
+	show_reg_usage },
 
 	{ { "sip", "list", "settings", NULL },
 	sip_show_settings, "List SIP global settings",
-	show_settings_usage, NULL, &cli_sip_show_settings_deprecated },
+	show_settings_usage },
 
 	{ { "sip", "list", "subscriptions", NULL },
 	sip_show_subscriptions, "List active SIP subscriptions",
-	show_subscriptions_usage, NULL, &cli_sip_show_subscriptions_deprecated },
+	show_subscriptions_usage },
 
 	{ { "sip", "list", "users", NULL },
 	sip_show_users, "List defined SIP users",
-	show_users_usage, NULL, &cli_sip_show_users_deprecated },
+	show_users_usage },
 
 	{ { "sip", "notify", NULL },
 	sip_notify, "Send a notify packet to a SIP peer",
@@ -16804,7 +16700,7 @@ static struct ast_cli_entry cli_sip[] = {
 
 	{ { "sip", "nodebug", NULL },
 	sip_no_debug, "Disable SIP debugging",
-	no_debug_usage, NULL, &cli_sip_no_debug_deprecated },
+	no_debug_usage },
 
 	{ { "sip", "history", NULL },
 	sip_do_history, "Enable SIP history",
@@ -16812,7 +16708,7 @@ static struct ast_cli_entry cli_sip[] = {
 
 	{ { "sip", "nohistory", NULL },
 	sip_no_history, "Disable SIP history",
-	no_history_usage, NULL, &cli_sip_no_history_deprecated },
+	no_history_usage },
 
 	{ { "sip", "reload", NULL },
 	sip_reload, "Reload SIP configuration",
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index e42a29a2e..984164449 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -1652,16 +1652,6 @@ static int skinny_do_debug(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int skinny_no_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 3) {
-		return RESULT_SHOWUSAGE;
-	}
-	skinnydebug = 0;
-	ast_cli(fd, "Skinny Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int skinny_no_debug(int fd, int argc, char *argv[])
 {
 	if (argc != 2) {
@@ -1872,29 +1862,14 @@ static char reset_usage[] =
 "Usage: skinny reset <DeviceId|all> [restart]\n"
 "       Causes a Skinny device to reset itself, optionally with a full restart\n";
 
-static struct ast_cli_entry cli_skinny_show_devices_deprecated = {
-	{ "skinny", "show", "devices", NULL },
-	skinny_show_devices, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_skinny_show_lines_deprecated = {
-	{ "skinny", "show", "lines", NULL },
-	skinny_show_lines, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_skinny_no_debug_deprecated = {
-	{ "skinny", "no", "debug", NULL },
-	skinny_no_debug_deprecated, NULL,
-	NULL };
-
 static struct ast_cli_entry cli_skinny[] = {
 	{ { "skinny", "list", "devices", NULL },
 	skinny_show_devices, "List defined Skinny devices",
-	show_devices_usage, NULL, &cli_skinny_show_devices_deprecated },
+	show_devices_usage },
 
 	{ { "skinny", "list", "lines", NULL },
 	skinny_show_lines, "List defined Skinny lines per device",
-	show_lines_usage, NULL, &cli_skinny_show_lines_deprecated },
+	show_lines_usage },
 
 	{ { "skinny", "debug", NULL },
 	skinny_do_debug, "Enable Skinny debugging",
@@ -1902,7 +1877,7 @@ static struct ast_cli_entry cli_skinny[] = {
 
 	{ { "skinny", "nodebug", NULL },
 	skinny_no_debug, "Disable Skinny debugging",
-	no_debug_usage, NULL, &cli_skinny_no_debug_deprecated },
+	no_debug_usage },
 
 	{ { "skinny", "reset", NULL },
 	skinny_reset_device, "Reset Skinny device(s)",
@@ -4367,15 +4342,12 @@ static int reload_config(void)
 			ast_parse_allow_disallow(&default_prefs, &default_capability, v->value, 1);
 		} else if (!strcasecmp(v->name, "disallow")) {
 			ast_parse_allow_disallow(&default_prefs, &default_capability, v->value, 0);
-		} else if (!strcasecmp(v->name, "bindport") || !strcasecmp(v->name, "port")) {
+		} else if (!strcasecmp(v->name, "bindport")) {
 			if (sscanf(v->value, "%d", &ourport) == 1) {
 				bindaddr.sin_port = htons(ourport);
 			} else {
 				ast_log(LOG_WARNING, "Invalid bindport '%s' at line %d of %s\n", v->value, v->lineno, config);
 			}
-			if (!strcasecmp(v->name, "port")) { /*! \todo Remove 'port' option after 1.4 */
-				ast_log(LOG_WARNING, "Option 'port' at line %d of %s has been deprecated.  Please use 'bindport' instead.\n", v->lineno, config);
-			}
 		}
 		v = v->next;
 	}