diff --git a/src/control/control_remap.c b/src/control/control_remap.c
index 4d666bb4..7d90d7ad 100644
--- a/src/control/control_remap.c
+++ b/src/control/control_remap.c
@@ -31,7 +31,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdarg.h>
-#include <limits.h>
 #include <unistd.h>
 #include <string.h>
 
@@ -98,11 +97,8 @@ typedef struct {
 
 typedef struct {
 	snd_ctl_t *child;
-	bool list_complete;
-	bool numid_remap_active;
+	int numid_remap_active;
 	unsigned int numid_app_last;
-	unsigned int list_first;
-	unsigned int list_last;
 
 	size_t numid_items;
 	size_t numid_alloc;
@@ -129,8 +125,6 @@ typedef struct {
 } snd_ctl_remap_t;
 #endif
 
-static int remap_load_list(snd_ctl_remap_t *priv);
-
 static snd_ctl_numid_t *remap_numid_temp(snd_ctl_remap_t *priv, unsigned int numid)
 {
 	priv->numid_temp.numid_child = numid;
@@ -143,8 +137,6 @@ static snd_ctl_numid_t *remap_find_numid_app(snd_ctl_remap_t *priv, unsigned int
 	snd_ctl_numid_t *numid;
 	size_t count;
 
-	if (numid_app == 0)
-		return NULL;
 	if (!priv->numid_remap_active)
 		return remap_numid_temp(priv, numid_app);
 	numid = priv->numid;
@@ -159,8 +151,6 @@ static snd_ctl_numid_t *remap_numid_new(snd_ctl_remap_t *priv, unsigned int numi
 {
 	snd_ctl_numid_t *numid;
 
-	if (numid_app == 0)
-		return NULL;
 	if (priv->numid_alloc == priv->numid_items) {
 		numid = realloc(priv->numid, (priv->numid_alloc + 16) * sizeof(*numid));
 		if (numid == NULL)
@@ -197,8 +187,6 @@ static snd_ctl_numid_t *remap_find_numid_child(snd_ctl_remap_t *priv, unsigned i
 	snd_ctl_numid_t *numid;
 	size_t count;
 
-	if (numid_child == 0)
-		return NULL;
 	if (!priv->numid_remap_active)
 		return remap_numid_temp(priv, numid_child);
 	numid = priv->numid;
@@ -294,11 +282,8 @@ static int remap_id_to_child(snd_ctl_remap_t *priv, snd_ctl_elem_id_t *id, snd_c
 {
 	snd_ctl_remap_id_t *rid;
 	snd_ctl_numid_t *numid;
-	bool reloaded = false;
-	int err;
 
 	debug_id(id, "%s enter\n", __func__);
-_retry:
 	rid = remap_find_id_app(priv, id);
 	if (rid) {
 		if (rid->id_app.numid == 0) {
@@ -310,19 +295,13 @@ _retry:
 		}
 		*id = rid->id_child;
 	} else {
+		if (remap_find_id_child(priv, id))
+			return -ENOENT;
 		numid = remap_find_numid_app(priv, id->numid);
-		if (numid) {
+		if (numid)
 			id->numid = numid->numid_child;
-		} else {
-			if (reloaded || priv->list_complete)
-				return -ENOENT;
-			/* build whole numid mapping */
-			err = remap_load_list(priv);
-			if (err < 0)
-				return err;
-			reloaded = true;
-			goto _retry;
-		}
+		else
+			id->numid = 0;
 	}
 	*_rid = rid;
 	debug_id(id, "%s leave\n", __func__);
@@ -350,7 +329,6 @@ static int remap_id_to_app(snd_ctl_remap_t *priv, snd_ctl_elem_id_t *id, snd_ctl
 			id->numid = numid->numid_app;
 		}
 	}
-	debug_id(id, "%s rid %p\n", __func__, rid);
 	return err;
 }
 
@@ -488,8 +466,9 @@ static int snd_ctl_remap_card_info(snd_ctl_t *ctl, snd_ctl_card_info_t *info)
 	return snd_ctl_card_info(priv->child, info);
 }
 
-static int _snd_ctl_remap_elem_list(snd_ctl_remap_t *priv, snd_ctl_elem_list_t *list)
+static int snd_ctl_remap_elem_list(snd_ctl_t *ctl, snd_ctl_elem_list_t *list)
 {
+	snd_ctl_remap_t *priv = ctl->private_data;
 	snd_ctl_elem_id_t *id;
 	snd_ctl_remap_id_t *rid;
 	snd_ctl_numid_t *numid;
@@ -504,17 +483,13 @@ static int _snd_ctl_remap_elem_list(snd_ctl_remap_t *priv, snd_ctl_elem_list_t *
 		id = &list->pids[index];
 		rid = remap_find_id_child(priv, id);
 		if (rid) {
-			assert(id->numid > 0);
-			rid->id_child.numid = id->numid;
+			rid->id_app.numid = id->numid;
+			*id = rid->id_app;
 		}
 		numid = remap_find_numid_child(priv, id->numid);
 		if (numid == NULL)
 			return -EIO;
 		id->numid = numid->numid_app;
-		if (rid) {
-			rid->id_app.numid = id->numid;
-			*id = rid->id_app;
-		}
 	}
 	if (list->offset >= list->count + priv->map_items + priv->sync_switch_items)
 		return 0;
@@ -535,40 +510,9 @@ static int _snd_ctl_remap_elem_list(snd_ctl_remap_t *priv, snd_ctl_elem_list_t *
 		}
 	}
 	list->count += priv->map_items + priv->sync_switch_items;
-	if (list->offset < priv->list_first)
-		priv->list_first = list->offset;
-	if (list->offset == priv->list_last && list->offset + list->used > priv->list_last)
-		priv->list_last = list->offset + list->used;
-	priv->list_complete = priv->list_first == 0 && list->count == priv->list_last;
 	return 0;
 }
 
-static int snd_ctl_remap_elem_list(snd_ctl_t *ctl, snd_ctl_elem_list_t *list)
-{
-	snd_ctl_remap_t *priv = ctl->private_data;
-
-	return _snd_ctl_remap_elem_list(priv, list);
-}
-
-static int remap_load_list(snd_ctl_remap_t *remap)
-{
-	snd_ctl_elem_list_t list;
-	int err = 0;
-
-	memset(&list, 0, sizeof(list));
-	do {
-		err = _snd_ctl_remap_elem_list(remap, &list);
-		if (err < 0)
-			break;
-		err = snd_ctl_elem_list_alloc_space(&list, list.count);
-		if (err < 0)
-			break;
-	} while (list.count != list.used);
-	if (err < 0)
-		free(list.pids);
-	return err;
-}
-
 #ifndef DOC_HIDDEN
 #define ACCESS_BITS(bits) \
 	(bits & (SNDRV_CTL_ELEM_ACCESS_READWRITE|\
@@ -1730,7 +1674,6 @@ int snd_ctl_remap_open(snd_ctl_t **handlep, const char *name, snd_config_t *rema
 
 	priv->numid_remap_active = priv->map_items > 0 || priv->sync_items;
 
-	priv->list_first = UINT_MAX;
 	priv->child = child;
 	err = snd_ctl_new(&ctl, SND_CTL_TYPE_REMAP, name, mode);
 	if (err < 0) {
diff --git a/src/control/ctlparse.c b/src/control/ctlparse.c
index 3bd86435..b23234d7 100644
--- a/src/control/ctlparse.c
+++ b/src/control/ctlparse.c
@@ -156,10 +156,8 @@ char *snd_ctl_ascii_elem_id_get(snd_ctl_elem_id_t *id)
 int __snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str,
 				  const char **ret_ptr)
 {
-	char buf[64];
-	int c, size;
+	int c, size, numid;
 	int err = -EINVAL;
-	long l;
 	char *ptr;
 
 	while (isspace(*str))
@@ -170,23 +168,12 @@ int __snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str,
 	while (*str) {
 		if (!strncasecmp(str, "numid=", 6)) {
 			str += 6;
-			ptr = buf;
-			size = 0;
-			while (*str && *str != ',') {
-				if (size < (int)sizeof(buf)) {
-					*ptr++ = *str;
-					size++;
-				}
-				str++;
-			}
-			*ptr = '\0';
-			if (safe_strtol(buf, &l) < 0)
-				l = -1;
-			if (l <= 0 || l >= INT32_MAX) {
-				snd_error(CONTROL, "Invalid numid %ld (%s)", l, buf);
+			numid = atoi(str);
+			if (numid <= 0) {
+				fprintf(stderr, "amixer: Invalid numid %d\n", numid);
 				goto out;
 			}
-			snd_ctl_elem_id_set_numid(dst, (int)l);
+			snd_ctl_elem_id_set_numid(dst, atoi(str));
 			while (isdigit(*str))
 				str++;
 		} else if (!strncasecmp(str, "iface=", 6)) {
@@ -213,6 +200,7 @@ int __snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str,
 				goto out;
 			}
 		} else if (!strncasecmp(str, "name=", 5)) {
+			char buf[64];
 			str += 5;
 			ptr = buf;
 			size = 0;
diff --git a/src/topology/ctl.c b/src/topology/ctl.c
index 322c461c..a0c24518 100644
--- a/src/topology/ctl.c
+++ b/src/topology/ctl.c
@@ -1250,11 +1250,6 @@ int tplg_decode_control_mixer1(snd_tplg_t *tplg,
 	if (mc->num_channels > 0) {
 		map = tplg_calloc(heap, sizeof(*map));
 		map->num_channels = mc->num_channels;
-		if (map->num_channels > SND_TPLG_MAX_CHAN ||
-		    map->num_channels > SND_SOC_TPLG_MAX_CHAN) {
-			snd_error(TOPOLOGY, "mixer: unexpected channel count %d", map->num_channels);
-			return -EINVAL;
-		}
 		for (i = 0; i < map->num_channels; i++) {
 			map->channel[i].reg = mc->channel[i].reg;
 			map->channel[i].shift = mc->channel[i].shift;
diff --git a/src/ucm/main.c b/src/ucm/main.c
index 26b0ea20..21a39a34 100644
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
@@ -1702,7 +1702,7 @@ const char *parse_open_variables(snd_use_case_mgr_t *uc_mgr, const char *name)
 {
 	const char *end, *id;
 	char *args, *var;
-	snd_config_t *cfg = NULL, *n;
+	snd_config_t *cfg, *n;
 	snd_config_iterator_t i, next;
 	char vname[128];
 	size_t l;
@@ -1739,8 +1739,7 @@ const char *parse_open_variables(snd_use_case_mgr_t *uc_mgr, const char *name)
 	}
 
 skip:
-	if (cfg)
-		snd_config_delete(cfg);
+	snd_config_delete(cfg);
 	return end + 3;
 }
 
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index baa19144..60861213 100644
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -804,7 +804,7 @@ static int parse_libconfig1(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg)
 	if (file) {
 		if (substfile) {
 			snd_config_t *cfg;
-			err = uc_mgr_config_load_file(uc_mgr, file, &cfg);
+			err = uc_mgr_config_load(uc_mgr->conf_format, file, &cfg);
 			if (err < 0)
 				return err;
 			err = uc_mgr_substitute_tree(uc_mgr, cfg);