Index: trunk/src/obj_common.h
===================================================================
--- trunk/src/obj_common.h	(revision 15851)
+++ trunk/src/obj_common.h	(revision 15852)
@@ -46,29 +46,20 @@
 	PCB_OBJ_POLY      = 0x000008,
 	PCB_OBJ_ARC       = 0x000010,
 	PCB_OBJ_RAT       = 0x000020,
-	PCB_OBJ_PAD       = 0x000040,
-	PCB_OBJ_PIN       = 0x000080,
-	PCB_OBJ_VIA       = 0x000100,
-	PCB_OBJ_ELEMENT   = 0x000200,
-	PCB_OBJ_SUBC      = 0x000400,
-	PCB_OBJ_PSTK      = 0x000800,
+	PCB_OBJ_SUBC      = 0x000040,
+	PCB_OBJ_PSTK      = 0x000080,
 
 	/* more abstract objects */
-	PCB_OBJ_NET       = 0x100001,
-	PCB_OBJ_LAYER     = 0x100002,
-
-	/* temporary, for backward compatibility */
-	PCB_OBJ_ELINE     = 0x200001,
-	PCB_OBJ_EARC      = 0x200002,
-	PCB_OBJ_ETEXT     = 0x200004
+	PCB_OBJ_NET       = 0x001001,
+	PCB_OBJ_LAYER     = 0x001002
 } pcb_objtype_t;
 
 /* combinations, groups, masks of pcb_objtype_t */
 typedef enum pcb_objmask_e {
-	PCB_OBJ_CLASS_MASK = 0xF00000,
+	PCB_OBJ_CLASS_MASK = 0x00F000,
 	PCB_OBJ_CLASS_OBJ  = 0x000000, /* anything with common object fields (pcb_any_obj_t) */
 	PCB_OBJ_CLASS_REAL = 0x000FFF, /* global and on-layer objects (but not abstract things like layers) */
-	PCB_OBJ_ANY        = 0xFFFFFF
+	PCB_OBJ_ANY        = 0x00FFFF
 }  pcb_objmask_t;
 
 
Index: trunk/src/obj_subc_parent.h
===================================================================
--- trunk/src/obj_subc_parent.h	(revision 15851)
+++ trunk/src/obj_subc_parent.h	(revision 15852)
@@ -66,7 +66,6 @@
 PCB_INLINE pcb_subc_t *pcb_obj_parent_subc(pcb_any_obj_t *obj)
 {
 	switch(obj->type) {
-		case PCB_OBJ_VIA:
 		case PCB_OBJ_PSTK:
 		case PCB_OBJ_SUBC:
 			return pcb_gobj_parent_subc(obj->parent_type, &obj->parent);
@@ -81,15 +80,6 @@
 		case PCB_OBJ_RATLINE:
 			/* easy case: can not be in a subc at all */
 			return 0;
-
-		case PCB_OBJ_PIN:
-		case PCB_OBJ_PAD:
-		case PCB_OBJ_ELEMENT_NAME:
-		case PCB_OBJ_ELEMENT:
-		case PCB_OBJ_ELEMENT_LINE:
-		case PCB_OBJ_ELEMENT_ARC:
-			/* easy case: these obsolete constructs can not be in a subc at all */
-			return 0;
 #endif
 
 		default: