Index: trunk/src/netlist.c
===================================================================
--- trunk/src/netlist.c	(revision 15552)
+++ trunk/src/netlist.c	(revision 15553)
@@ -215,27 +215,6 @@
 	return pcb_netlist_find_net4pinname(pcb, pinname);
 }
 
-pcb_lib_menu_t *pcb_netlist_find_net4pin(pcb_board_t *pcb, const pcb_pin_t *pin)
-{
-	const pcb_element_t *e = pin->Element;
-
-	if (e == NULL)
-		return NULL;
-
-	return pcb_netlist_find_net4pin_any(pcb, e->Name[PCB_ELEMNAME_IDX_REFDES].TextString, pin->Number);
-}
-
-
-pcb_lib_menu_t *pcb_netlist_find_net4pad(pcb_board_t *pcb, const pcb_pad_t *pad)
-{
-	const pcb_element_t *e = pad->Element;
-
-	if (e == NULL)
-		return NULL;
-
-	return pcb_netlist_find_net4pin_any(pcb, e->Name[PCB_ELEMNAME_IDX_REFDES].TextString, pad->Number);
-}
-
 pcb_lib_menu_t *pcb_netlist_find_net4term(pcb_board_t *pcb, const pcb_any_obj_t *term)
 {
 	pcb_data_t *data;
Index: trunk/src/netlist.h
===================================================================
--- trunk/src/netlist.h	(revision 15552)
+++ trunk/src/netlist.h	(revision 15553)
@@ -70,9 +70,7 @@
    like "U101-5", so element's refdes, dash, pin number */
 pcb_lib_menu_t *pcb_netlist_find_net4pinname(pcb_board_t *pcb, const char *pinname);
 
-/* Same as pcb_netlist_find_net4pinname but with pin pointer */
-pcb_lib_menu_t *pcb_netlist_find_net4pin(pcb_board_t *pcb, const pcb_pin_t *pin);
-pcb_lib_menu_t *pcb_netlist_find_net4pad(pcb_board_t *pcb, const pcb_pad_t *pad);
+/* Same as pcb_netlist_find_net4pinname but with generic terminal pointer */
 pcb_lib_menu_t *pcb_netlist_find_net4term(pcb_board_t *pcb, const pcb_any_obj_t *term);
 
 
Index: trunk/src_plugins/lib_netmap/netmap.c
===================================================================
--- trunk/src_plugins/lib_netmap/netmap.c	(revision 15552)
+++ trunk/src_plugins/lib_netmap/netmap.c	(revision 15553)
@@ -103,34 +103,6 @@
 	list_obj(ctx, pcb, NULL, (pcb_any_obj_t *)ps);
 }
 
-static void list_epin_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_pin_t *pin)
-{
-	pcb_netmap_t *map = ctx;
-
-	if (htpp_get(&map->o2n, pin) != NULL)
-		return;
-
-	map->curr_net = pcb_netlist_find_net4pin(map->pcb, pin);
-	if (map->curr_net == NULL)
-		map->curr_net = alloc_net(map);
-
-	pcb_lookup_conn_by_obj(map, (pcb_any_obj_t *)pin, 0, found);
-}
-
-static void list_epad_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_pad_t *pad)
-{
-	pcb_netmap_t *map = ctx;
-
-	if (htpp_get(&map->o2n, pad) != NULL)
-		return;
-
-	map->curr_net = pcb_netlist_find_net4pad(map->pcb, pad);
-	if (map->curr_net == NULL)
-		map->curr_net = alloc_net(map);
-
-	pcb_lookup_conn_by_obj(map, (pcb_any_obj_t *)pad, 0, found);
-}
-
 int list_subc_cb(void *ctx, pcb_board_t *pcb, pcb_subc_t *subc, int enter)
 {
 	PCB_PADSTACK_LOOP(subc->data) {
@@ -149,7 +121,7 @@
 	map->dyn_nets = 0;
 	map->pcb = pcb;
 
-/* step 1: find known nets (from pins and pads) */
+/* step 1: find known nets (from terminals) */
 	pcb_loop_all(PCB, map,
 		NULL, /* layer */
 		NULL, /* line */
@@ -160,8 +132,8 @@
 		NULL, /* eline */
 		NULL, /* earc */
 		NULL, /* etext */
-		list_epin_cb,
-		list_epad_cb,
+		NULL, /* epin */
+		NULL, /* epad */
 		list_subc_cb, /* subc */
 		NULL, /* via */
 		NULL /* pstk */