Index: trunk/src_plugins/export_openscad/scad_draw.c
===================================================================
--- trunk/src_plugins/export_openscad/scad_draw.c	(revision 15505)
+++ trunk/src_plugins/export_openscad/scad_draw.c	(revision 15506)
@@ -138,19 +138,10 @@
 
 	fprintf(f, "module pcb_drill() {\n");
 
-	for(obj = pcb_r_first(PCB->Data->via_tree, &it); obj != NULL; obj = pcb_r_next(&it))
-		scad_draw_drill((pcb_pin_t *)obj);
-	pcb_r_end(&it);
-
 	for(obj = pcb_r_first(PCB->Data->padstack_tree, &it); obj != NULL; obj = pcb_r_next(&it))
 		scad_draw_pstk((pcb_pstk_t *)obj);
 	pcb_r_end(&it);
 
-	PCB_PIN_ALL_LOOP(PCB->Data); {
-		scad_draw_drill(pin);
-	} PCB_ENDALL_LOOP;
-
-
 	fprintf(f, "}\n");
 }
 
Index: trunk/src_plugins/export_openscad/scad_models.c
===================================================================
--- trunk/src_plugins/export_openscad/scad_models.c	(revision 15505)
+++ trunk/src_plugins/export_openscad/scad_models.c	(revision 15506)
@@ -108,15 +108,6 @@
 
 	htsp_init(&models, strhash, strkeyeq);
 
-	PCB_ELEMENT_LOOP(PCB->Data); {
-		mod = pcb_attribute_get(&element->Attributes, "openscad");
-		if (mod != NULL) {
-			transf = pcb_attribute_get(&element->Attributes, "openscad-transformation");
-			param = pcb_attribute_get(&element->Attributes, "openscad-param");
-			scad_insert_model(&models, mod, TRX_(element->MarkX), TRY_(element->MarkY), 0, 0, transf, param);
-		}
-	} PCB_END_LOOP;
-
 	PCB_SUBC_LOOP(PCB->Data); {
 		mod = pcb_attribute_get(&subc->Attributes, "openscad");
 		if (mod != NULL) {