Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 34429)
+++ trunk/src/gui_act.c	(revision 34430)
@@ -665,15 +665,7 @@
 		if (textt != -1)     { rnd_conf_set_design("design/text_thickness", "%$mS", textt); }
 		if (texts != -1)     { rnd_conf_set_design("design/text_scale", "%d", texts); }
 		if (fid != -1)       { rnd_conf_set_design("design/text_font_id", "%ld", (long)fid); }
-
-		if (pcb_brave & PCB_BRAVE_LIHATA_V8) {
-			if (via_proto != -1)  { rnd_conf_set_design("design/via_proto", "%ld", (long)via_proto); }
-		}
-		else {
-			TODO("pstk #21: remove this branch");
-			if (Diameter != -1)  { rnd_conf_set_design("design/via_thickness", "%$mS", Diameter); }
-			if (Hole != -1)      { rnd_conf_set_design("design/via_drilling_hole", "%$mS", Hole); }
-		}
+		if (via_proto != -1) { rnd_conf_set_design("design/via_proto", "%ld", (long)via_proto); }
 		PCB->pen_attr = NULL;
 	}
 	else
@@ -717,10 +709,6 @@
 		break;
 
 	case PCB_OBJ_PSTK:
-		if (!(pcb_brave & PCB_BRAVE_LIHATA_V8)) {
-			TODO("pstk #21: remove this branch");
-			break;
-		}
 		rnd_hid_notify_crosshair_change(RND_ACT_HIDLIB, rnd_false);
 		set_same_(-1, -1, -1, -1, -1, -1, -1, ((pcb_pstk_t *)ptr2)->proto, NULL);
 		if (rnd_conf.editor.mode != pcb_crosshair.tool_via)
Index: trunk/src/route_style.c
===================================================================
--- trunk/src/route_style.c	(revision 34429)
+++ trunk/src/route_style.c	(revision 34430)
@@ -53,9 +53,6 @@
 		rnd_conf_set_design("design/text_font_id", "%ld", rst->fid);
 	if (rst->via_proto_set)
 		rnd_conf_set_design("design/via_proto", "%ld", (long)rst->via_proto);
-TODO("pstk #21:");
-	rnd_conf_set_design("design/via_thickness", "%$mS", rst->Diameter);
-	rnd_conf_set_design("design/via_drilling_hole", "%$mS", rst->Hole);
 	rnd_conf_set_design("design/clearance", "%$mS", rst->Clearance);
 	PCB->pen_attr = &rst->attr;
 }
@@ -78,13 +75,7 @@
 	if (cmp(textt, rst->textt)) return 0;
 	if (cmpi0(texts, rst->texts)) return 0;
 	if (cmpi(fid, rst->fid)) return 0;
-	if (!(pcb_brave & PCB_BRAVE_LIHATA_V8)) {
-		TODO("pstk #21: remove this branch");
-		if (cmp(Diameter, rst->Diameter)) return 0;
-		if (cmp(Hole, rst->Hole)) return 0;
-	}
-	else
-		if (cmpi(via_proto, rst->via_proto)) return 0;
+	if (cmpi(via_proto, rst->via_proto)) return 0;
 	if (cmp(Clearance, rst->Clearance)) return 0;
 	if (cmps(Name, rst->name)) return 0;
 	return 1;