Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 15692)
+++ trunk/src/data.c	(revision 15693)
@@ -137,9 +137,8 @@
 
 void pcb_loop_all(pcb_board_t *pcb, void *ctx,
 	pcb_layer_cb_t lacb, pcb_line_cb_t lcb, pcb_arc_cb_t acb, pcb_text_cb_t tcb, pcb_poly_cb_t pocb,
-	pcb_element_cb_t ecb, pcb_eline_cb_t elcb, pcb_earc_cb_t eacb, pcb_etext_cb_t etcb, pcb_epin_cb_t epicb, pcb_epad_cb_t epacb,
 	pcb_subc_cb_t scb,
-	pcb_via_cb_t vcb, pcb_pstk_cb_t pscb
+	pcb_pstk_cb_t pscb
 	)
 {
 	pcb_loop_layers(pcb, ctx, lacb, lcb, acb, tcb, pocb);
Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 15692)
+++ trunk/src/data.h	(revision 15693)
@@ -97,19 +97,10 @@
 typedef void (*pcb_text_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_text_t *text);
 typedef void (*pcb_poly_cb_t)(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_poly_t *poly);
 
-/* element callbacks */
-typedef int (*pcb_element_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, int enter);
-typedef void (*pcb_eline_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_line_t *line);
-typedef void (*pcb_earc_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_arc_t *arc);
-typedef void (*pcb_etext_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_text_t *text);
-typedef void (*pcb_epin_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_pin_t *pin);
-typedef void (*pcb_epad_cb_t)(void *ctx, pcb_board_t *pcb, pcb_element_t *element, pcb_pad_t *pad);
-
 /* subc callbacks */
 typedef int (*pcb_subc_cb_t)(void *ctx, pcb_board_t *pcb, pcb_subc_t *subc, int enter);
 
 /* via and padstack callbacks */
-typedef void (*pcb_via_cb_t)(void *ctx, pcb_board_t *pcb, pcb_pin_t *via);
 typedef void (*pcb_pstk_cb_t)(void *ctx, pcb_board_t *pcb, pcb_pstk_t *ps);
 
 /* Loop over all layer objects on each layer. Layer is the outer loop. */
@@ -121,9 +112,8 @@
 /* Loop over all design objects. (So all the above three in one call.) */
 void pcb_loop_all(pcb_board_t *pcb, void *ctx,
 	pcb_layer_cb_t lacb, pcb_line_cb_t lcb, pcb_arc_cb_t acb, pcb_text_cb_t tcb, pcb_poly_cb_t pocb,
-	pcb_element_cb_t ecb, pcb_eline_cb_t elcb, pcb_earc_cb_t eacb, pcb_etext_cb_t etcb, pcb_epin_cb_t epicb, pcb_epad_cb_t epacb,
 	pcb_subc_cb_t scb,
-	pcb_via_cb_t vcb, pcb_pstk_cb_t pscb
+	pcb_pstk_cb_t pscb
 );
 
 pcb_data_t *pcb_data_new(pcb_board_t *parent);
Index: trunk/src_plugins/lib_netmap/netmap.c
===================================================================
--- trunk/src_plugins/lib_netmap/netmap.c	(revision 15692)
+++ trunk/src_plugins/lib_netmap/netmap.c	(revision 15693)
@@ -93,11 +93,6 @@
 	list_obj(ctx, pcb, layer, (pcb_any_obj_t *)poly);
 }
 
-static void list_via_cb(void *ctx, pcb_board_t *pcb, pcb_pin_t *via)
-{
-	list_obj(ctx, pcb, NULL, (pcb_any_obj_t *)via);
-}
-
 static void list_pstk_cb(void *ctx, pcb_board_t *pcb, pcb_pstk_t *ps)
 {
 	list_obj(ctx, pcb, NULL, (pcb_any_obj_t *)ps);
@@ -128,14 +123,7 @@
 		NULL, /* arc */
 		NULL, /* text */
 		NULL, /* poly */
-		NULL, /* element */
-		NULL, /* eline */
-		NULL, /* earc */
-		NULL, /* etext */
-		NULL, /* epin */
-		NULL, /* epad */
 		list_subc_cb, /* subc */
-		NULL, /* via */
 		NULL /* pstk */
 	);
 
@@ -146,14 +134,7 @@
 		list_arc_cb,
 		NULL, /* text */
 		list_poly_cb,
-		NULL, /* element */
-		NULL, /* eline */
-		NULL, /* earc */
-		NULL, /* etext */
-		NULL, /* pin */
-		NULL, /* pad */
 		NULL, /* subc */
-		list_via_cb,
 		list_pstk_cb
 	);
 	return 0;
Index: trunk/src_plugins/propedit/propsel.c
===================================================================
--- trunk/src_plugins/propedit/propsel.c	(revision 15692)
+++ trunk/src_plugins/propedit/propsel.c	(revision 15693)
@@ -181,9 +181,8 @@
 	
 	pcb_loop_all(PCB, &ctx,
 		NULL, map_line_cb, map_arc_cb, map_text_cb, map_poly_cb,
-		NULL, NULL, NULL, NULL, NULL, NULL,
 		map_subc_cb,
-		NULL, map_pstk_cb
+		map_pstk_cb
 	);
 }
 
@@ -452,9 +451,7 @@
 		MAYBE_PROP(ctx.is_trace, "p/arc/", set_arc_cb),
 		MAYBE_PROP(0, "p/text/", set_text_cb),
 		MAYBE_PROP(ctx.is_trace, "p/poly/", set_poly_cb),
-		NULL, NULL, NULL, NULL, NULL, NULL,
 		MAYBE_PROP(0, "p/subc/", set_subc_cb),
-		NULL,
 		MAYBE_PROP(0, "p/padstack/", set_pstk_cb)
 	);
 	pcb_undo_inc_serial();
@@ -532,9 +529,8 @@
 
 	pcb_loop_all(PCB, &st,
 		NULL, del_line_cb, del_arc_cb, del_text_cb, del_poly_cb,
-		NULL, NULL, NULL, NULL, NULL, NULL,
 		del_subc_cb,
-		NULL, del_pstk_cb
+		del_pstk_cb
 	);
 	return st.del_cnt;
 }
Index: trunk/src_plugins/query/query_access.c
===================================================================
--- trunk/src_plugins/query/query_access.c	(revision 15692)
+++ trunk/src_plugins/query/query_access.c	(revision 15693)
@@ -95,14 +95,7 @@
 		(mask & PCB_OBJ_ARC) ? list_arc_cb : NULL,
 		(mask & PCB_OBJ_TEXT) ? list_text_cb : NULL,
 		(mask & PCB_OBJ_POLY) ? list_poly_cb : NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
 		(mask & PCB_OBJ_SUBC) ? list_subc_cb : NULL,
-		NULL,
 		(mask & PCB_OBJ_PSTK) ? list_pstk_cb : NULL
 	);
 }