Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 15680)
+++ trunk/src/data.h	(revision 15681)
@@ -50,7 +50,6 @@
 	pcb_vtpadstack_proto_t ps_protos;
 
 	padstacklist_t padstack;
-	pinlist_t Via;
 	pcb_subclist_t subc;
 /**/
 	pcb_rtree_t *via_tree, *padstack_tree, *subc_tree, *rat_tree;
Index: trunk/src/obj_all_list.h
===================================================================
--- trunk/src/obj_all_list.h	(revision 15680)
+++ trunk/src/obj_all_list.h	(revision 15681)
@@ -1,7 +1,6 @@
 #include "obj_arc_list.h"
 #include "obj_line_list.h"
 #include "obj_pstk_list.h"
-#include "obj_pinvia_list.h"
 #include "obj_poly_list.h"
 #include "obj_text_list.h"
 #include "obj_rat_list.h"
Index: trunk/src/obj_elem.h
===================================================================
--- trunk/src/obj_elem.h	(revision 15680)
+++ trunk/src/obj_elem.h	(revision 15681)
@@ -34,7 +34,6 @@
 #include "obj_common.h"
 #include "obj_arc_list.h"
 #include "obj_line_list.h"
-#include "obj_pinvia_list.h"
 #include "obj_text.h"
 #include "font.h"
 
@@ -43,7 +42,6 @@
 	PCB_ANYOBJECTFIELDS;
 	pcb_text_t Name[PCB_MAX_ELEMENTNAMES]; /* the elements names: description text, name on PCB second, value third - see PCB_ELEMNAME_IDX_VISIBLE() below */
 	pcb_coord_t MarkX, MarkY;               /* position mark */
-	pinlist_t Pin;
 	linelist_t Line;
 	arclist_t Arc;
 	pcb_box_t VBox;
Index: trunk/src/obj_pinvia.h
===================================================================
--- trunk/src/obj_pinvia.h	(revision 15680)
+++ trunk/src/obj_pinvia.h	(revision 15681)
@@ -96,18 +96,4 @@
 } while(0)
 
 
-#define PCB_VIA_LOOP(top) do {                                          \
-  pcb_pin_t *via;                                                     \
-  gdl_iterator_t __it__;                                            \
-  pinlist_foreach(&(top)->Via, &__it__, via) {
-
-#define PCB_PIN_LOOP(element) do {                                      \
-  pcb_pin_t *pin;                                                     \
-  gdl_iterator_t __it__;                                            \
-  pinlist_foreach(&(element)->Pin, &__it__, pin) {
-
-#define PCB_PIN_ALL_LOOP(top)   \
-        PCB_ELEMENT_LOOP(top); \
-        PCB_PIN_LOOP(element)  \
-
 #endif
Index: trunk/src/obj_pinvia_therm.c
===================================================================
--- trunk/src/obj_pinvia_therm.c	(revision 15680)
+++ trunk/src/obj_pinvia_therm.c	(revision 15681)
@@ -38,6 +38,7 @@
 
 #include "board.h"
 #include "polygon.h"
+#include "obj_pinvia.h"
 #include "obj_pinvia_therm.h"
 
 #warning cleanup TODO: remove this, pass on pcb as arg instead
Index: trunk/src/tool_thermal.c
===================================================================
--- trunk/src/tool_thermal.c	(revision 15680)
+++ trunk/src/tool_thermal.c	(revision 15681)
@@ -95,7 +95,7 @@
 	int type;
 
 	if (((type = pcb_search_screen(pcb_tool_note.X, pcb_tool_note.Y, PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE)
-			&& !PCB_FLAG_TEST(PCB_FLAG_HOLE, (pcb_pin_t *) ptr3)) {
+			&& !PCB_FLAG_TEST(PCB_FLAG_HOLE, (pcb_any_obj_t *) ptr3)) {
 		if (type == PCB_TYPE_PSTK)
 			pcb_tool_thermal_on_pstk((pcb_pstk_t *)ptr2, INDEXOFCURRENT);
 	}
Index: trunk/src/tool_via.c
===================================================================
--- trunk/src/tool_via.c	(revision 15680)
+++ trunk/src/tool_via.c	(revision 15681)
@@ -81,6 +81,8 @@
 void pcb_tool_via_draw_attached(void)
 {
 	/* Make a dummy via structure to draw from */
+#warning padstack TODO: replace this with padstack outline draw:
+#if 0
 	pcb_pin_t via;
 	via.X = pcb_crosshair.X;
 	via.Y = pcb_crosshair.Y;
@@ -99,6 +101,7 @@
 /*		XORDrawPinViaDRCOutline(&via,PCB->Bloat);*/
 		pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
 	}
+#endif
 }
 
 pcb_tool_t pcb_tool_via = {