diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index af323d49eed203017461d0098bf200fd6aa0e600..5c90b06763b08f4e3d7c7436908e2894c39b1893 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2306,14 +2306,6 @@ static void temp_pvt_cleanup(void *);
 /*! \brief A per-thread temporary pvt structure */
 AST_THREADSTORAGE_CUSTOM(ts_temp_pvt, temp_pvt_init, temp_pvt_cleanup);
 
-#ifdef LOW_MEMORY
-static void ts_ast_rtp_destroy(void *);
-
-AST_THREADSTORAGE_CUSTOM(ts_audio_rtp, NULL, ts_ast_rtp_destroy);
-AST_THREADSTORAGE_CUSTOM(ts_video_rtp, NULL, ts_ast_rtp_destroy);
-AST_THREADSTORAGE_CUSTOM(ts_text_rtp, NULL, ts_ast_rtp_destroy);
-#endif
-
 /*! \brief Authentication list for realm authentication
  * \todo Move the sip_auth list to AST_LIST */
 static struct sip_auth *authl = NULL;
@@ -9309,15 +9301,6 @@ static int process_sdp_a_image(const char *a, struct sip_pvt *p)
 	return found;
 }
 
-
-#ifdef LOW_MEMORY
-static void ts_ast_rtp_destroy(void *data)
-{
-    struct ast_rtp *tmp = data;
-    ast_rtp_destroy(tmp);
-}
-#endif
-
 /*! \brief Add header to SIP message */
 static int add_header(struct sip_request *req, const char *var, const char *value)
 {
diff --git a/main/cli.c b/main/cli.c
index abfc8f0a9e5560ff2d4afcf65489fd446e991d3d..6d227fb1eb3a5c99d07d66305f458f65d8bdb30c 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -377,10 +377,18 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
 	case CLI_INIT:
 		e->command = "core set {debug|verbose}";
 		e->usage =
+#if !defined(LOW_MEMORY)
 			"Usage: core set {debug|verbose} [atleast] <level> [filename]\n"
+#else
+			"Usage: core set {debug|verbose} [atleast] <level>\n"
+#endif
 			"       core set {debug|verbose} off\n"
+#if !defined(LOW_MEMORY)
 			"       Sets level of debug or verbose messages to be displayed or \n"
 			"       sets a filename to display debug messages from.\n"
+#else
+			"       Sets level of debug or verbose messages to be displayed.\n"
+#endif
 			"	0 or off means no messages should be displayed.\n"
 			"	Equivalent to -d[d[...]] or -v[v[v...]] on startup\n";
 		return NULL;
@@ -406,8 +414,10 @@ static char *handle_verbose(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
 			} else if (a->n == (22 - numbermatch) && a->pos == 3 && ast_strlen_zero(argv3)) {
 				return ast_strdup("atleast");
 			}
+#if !defined(LOW_MEMORY)
 		} else if (a->pos == 4 || (a->pos == 5 && !strcasecmp(argv3, "atleast"))) {
 			return ast_complete_source_filename(a->pos == 4 ? S_OR(a->argv[4], "") : S_OR(a->argv[5], ""), a->n);
+#endif
 		}
 		return NULL;
 	}