diff --git a/src/main.c b/src/main.c
index d23961f..93e9ee3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -85,7 +85,7 @@
 	printf("Terminating.\n");
 	handled = 1;
 	if (bsc && bsc->setup) {
-		llist_for_each_entry(set, &bsc->links, entry)
+		llist_for_each_entry(set, &bsc->linksets, entry)
 			link_shutdown_all(set);
 	}
 
@@ -175,7 +175,6 @@
 	struct mtp_link_set *set;
 
 
-	mtp_link_set_init();
 	thread_init();
 
 	log_init(&log_info);
@@ -222,7 +221,6 @@
 	if (!set)
 		return -1;
 
-	llist_add(&set->entry, &bsc->links);
 	set->fw = &bsc->msc_forward;
 	bsc->msc_forward.bsc = set;