diff --git a/client/emv/dump.c b/client/emv/dump.c
index 8b3fb708..2368680a 100644
--- a/client/emv/dump.c
+++ b/client/emv/dump.c
@@ -19,6 +19,7 @@
 
 #include "dump.h"
 #include <stdio.h>
+#include <string.h>
 
 #define PRINT_INDENT(level) 	{for (int i = 0; i < (level); i++) fprintf(f, "\t");}
 
@@ -36,8 +37,6 @@ void dump_buffer_simple(const unsigned char *ptr, size_t len, FILE *f)
 void dump_buffer(const unsigned char *ptr, size_t len, FILE *f, int level)
 {
 	int i, j;
-	char buf[64] = {0};
-	memset(buf, ' ', tabs > 64 ? 64 : tabs);
 
 	if (!f)
 		f = stdout;
@@ -59,7 +58,3 @@ void dump_buffer(const unsigned char *ptr, size_t len, FILE *f, int level)
 	}
 }
 
-void dump_buffer(const unsigned char *ptr, size_t len, FILE *f) {
-	dump_buffer_tab(ptr, len, f, 4);
-}
-
diff --git a/client/emv/emvcore.c b/client/emv/emvcore.c
index 21be93ef..5765b4d1 100644
--- a/client/emv/emvcore.c
+++ b/client/emv/emvcore.c
@@ -107,7 +107,7 @@ void TLVPrintFromTLV(struct tlvdb *tlv) {
 	if (!tlv) 
 		return;
 	
-	tlvdb_visit(tlv, print_cb, NULL);
+	tlvdb_visit(tlv, print_cb, NULL, 0);
 }
 
 void TLVPrintAIDlistFromSelectTLV(struct tlvdb *tlv) {
diff --git a/client/emv/tlv.c b/client/emv/tlv.c
index f6d435dd..1be91777 100644
--- a/client/emv/tlv.c
+++ b/client/emv/tlv.c
@@ -345,7 +345,6 @@ void tlvdb_add(struct tlvdb *tlvdb, struct tlvdb *other)
 void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data, int level)
 {
 	struct tlvdb *next = NULL;
-	lvl++;
 
 	if (!tlvdb)
 		return;
@@ -353,14 +352,10 @@ void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data, int level)
 	for (; tlvdb; tlvdb = next) {
 		next = tlvdb->next;
 		cb(data, &tlvdb->tag, level, (tlvdb->children == NULL));
-		tlvdb_visit(tlvdb->children, cb, data, level+1);
+		tlvdb_visit(tlvdb->children, cb, data, level + 1);
 	}
 }
 
-void tlvdb_visit(const struct tlvdb *tlvdb, tlv_cb cb, void *data) {
-	tlvdb_visit_ex(tlvdb, cb, data, 0);
-}
-
 static const struct tlvdb *tlvdb_next(const struct tlvdb *tlvdb)
 {
 	if (tlvdb->children)