diff --git a/daemon/aux.c b/daemon/aux.c
index b744adfb5..499d1a80f 100644
--- a/daemon/aux.c
+++ b/daemon/aux.c
@@ -262,11 +262,6 @@ int g_tree_find_all_cmp(void *k, void *v, void *d) {
 	return FALSE;
 }
 
-void free_buf(char **p) {
-	if (*p)
-		free(*p);
-}
-
 void free_gbuf(char **p) {
 	g_free(*p);
 }
diff --git a/daemon/call.c b/daemon/call.c
index c2fc6a9d4..df7cfe956 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -1038,7 +1038,7 @@ static int __init_stream(struct packet_stream *ps) {
 	struct call_media *media = ps->media;
 	struct call *call = ps->call;
 	int dtls_active = -1;
-	AUTO_CLEANUP_BUF(paramsbuf);
+	AUTO_CLEANUP_GBUF(paramsbuf);
 	struct dtls_connection *dtls_conn = NULL;
 
 	if (MEDIA_ISSET(media, DTLS)) {
diff --git a/daemon/crypto.c b/daemon/crypto.c
index 5d9ec2c6a..e4b699b37 100644
--- a/daemon/crypto.c
+++ b/daemon/crypto.c
@@ -731,7 +731,7 @@ void crypto_dump_keys(struct crypto_context *in, struct crypto_context *out) {
 
 char *crypto_params_sdes_dump(const struct crypto_params_sdes *cps, char **buf) {
 	if (*buf)
-		free(*buf);
+		g_free(*buf);
 
 	GString *s = g_string_new("");
 	if (!cps || !cps->params.crypto_suite) {
@@ -742,10 +742,10 @@ char *crypto_params_sdes_dump(const struct crypto_params_sdes *cps, char **buf)
 	g_string_append_printf(s, "suite %s, tag %u, key ", cps->params.crypto_suite->name, cps->tag);
 	char *b = g_base64_encode(cps->params.master_key, cps->params.crypto_suite->master_key_len);
 	g_string_append_printf(s, "%s salt ", b);
-	free(b);
+	g_free(b);
 	b = g_base64_encode(cps->params.master_salt, cps->params.crypto_suite->master_salt_len);
 	g_string_append_printf(s, "%s", b);
-	free(b);
+	g_free(b);
 
 out:
 	*buf = g_string_free(s, FALSE);
diff --git a/daemon/media_player.c b/daemon/media_player.c
index a3fb29d41..ef69f222d 100644
--- a/daemon/media_player.c
+++ b/daemon/media_player.c
@@ -665,16 +665,14 @@ err:
 // call->master_lock held in W
 int media_player_play_db(struct media_player *mp, long long id) {
 	const char *err;
-	AUTO_CLEANUP_BUF(query);
+	AUTO_CLEANUP_GBUF(query);
 
 	err = "missing configuration";
 	if (!rtpe_config.mysql_host || !rtpe_config.mysql_query)
 		goto err;
 
-	int len = asprintf(&query, rtpe_config.mysql_query, (unsigned long long) id);
-	err = "query print error";
-	if (len <= 0)
-		goto err;
+	query = g_strdup_printf(rtpe_config.mysql_query, (unsigned long long) id);
+	size_t len = strlen(query);
 
 	for (int retries = 0; retries < 5; retries++) {
 		if (!mysql_conn || retries != 0) {
diff --git a/include/aux.h b/include/aux.h
index 21fc3da13..dc9ba7e0f 100644
--- a/include/aux.h
+++ b/include/aux.h
@@ -231,7 +231,6 @@ INLINE int rlim(int res, rlim_t val) {
 	return setrlimit(res, &rlim);
 }
 
-void free_buf(char **);
 void free_gbuf(char **);
 void free_gvbuf(char ***);
 
diff --git a/lib/auxlib.h b/lib/auxlib.h
index 379425e90..27ef7f525 100644
--- a/lib/auxlib.h
+++ b/lib/auxlib.h
@@ -64,7 +64,6 @@ int uint32_eq(const void *a, const void *b);
 #define AUTO_CLEANUP(decl, func)		decl __attribute__ ((__cleanup__(func)))
 #define AUTO_CLEANUP_INIT(decl, func, val)	AUTO_CLEANUP(decl, func) = val
 #define AUTO_CLEANUP_NULL(decl, func)		AUTO_CLEANUP_INIT(decl, func, 0)
-#define AUTO_CLEANUP_BUF(var)			AUTO_CLEANUP_NULL(char *var, free_buf)
 #define AUTO_CLEANUP_GBUF(var)			AUTO_CLEANUP_NULL(char *var, free_gbuf)
 #define AUTO_CLEANUP_GVBUF(var)			AUTO_CLEANUP_NULL(char **var, free_gvbuf)