Index: read.c
===================================================================
--- read.c	(revision 34424)
+++ read.c	(revision 34425)
@@ -2318,16 +2318,8 @@
 		err |= parse_coord(&s->Thick,     hash_get(stn, "thickness", 0));
 		err |= parse_coord(&s->Clearance, hash_get(stn, "clearance", 0));
 
-		if (!(pcb_brave & PCB_BRAVE_LIHATA_V8)) {
-			TODO("pstk #21: remove this branch");
-			err |= parse_coord(&s->Diameter,  hash_get(stn, "diameter", 1));
-			err |= parse_coord(&s->Hole,      hash_get(stn, "hole", 1));
-		}
-
 		parse_attributes(&s->attr, lht_dom_hash_get(stn, "attributes"));
 
-
-
 		/* read text thickness */
 		{
 			lht_node_t *tt = lht_dom_hash_get(stn, "text_thick");
@@ -2368,7 +2360,6 @@
 			}
 		}
 
-		if (pcb_brave & PCB_BRAVE_LIHATA_V8) { /* TODO("pstk #21: remove the condition, this branch should always run"); */
 		if (!s->via_proto_set) {
 			rnd_coord_t drill_dia, pad_dia, mask = 0;
 			int err = 0;
@@ -2392,7 +2383,6 @@
 					return iolht_error(stn, "Invalid route style prototype via diameters\n");
 			}
 		}
-		}
 
 		if (rctx->rdver >= 8) {
 			lht_node_t *fidn = lht_dom_hash_get(stn, "fid");
@@ -2542,13 +2532,7 @@
 		case 5: loader = &plug_io_lihata_v5; break;
 		case 6: loader = &plug_io_lihata_v6; break;
 		case 7: loader = &plug_io_lihata_v7; break;
-		case 8:
-			if (pcb_brave & PCB_BRAVE_LIHATA_V8) {
-				loader = &plug_io_lihata_v8;
-				break;
-			}
-			rnd_message(RND_MSG_ERROR, "can not load lihata v8: brave mode not enabled\n");
-			/* fall through */
+		case 8: loader = &plug_io_lihata_v8; break;
 		default:
 			return iolht_error(nd, "Lihata board version %d not supported;\n"
 				"must be 1, 2, 3, 4, 5, 6 or 7.\n", rctx->rdver);
Index: write.c
===================================================================
--- write.c	(revision 34424)
+++ write.c	(revision 34425)
@@ -1508,12 +1508,6 @@
 		lht_dom_hash_put(sn, build_textf("thickness", CFMT, s->Thick));
 		lht_dom_hash_put(sn, build_textf("clearance", CFMT, s->Clearance));
 
-		if (!(pcb_brave & PCB_BRAVE_LIHATA_V8)) {
-			TODO("pstk #21: remove this branch");
-			lht_dom_hash_put(sn, build_textf("diameter", CFMT, s->Diameter));
-			lht_dom_hash_put(sn, build_textf("hole", CFMT, s->Hole));
-		}
-		else {
 		if (wrver >= 8) {
 			if (s->via_proto_set)
 				lht_dom_hash_put(sn, build_textf("via_proto", "%ld", (long int)s->via_proto));
@@ -1526,7 +1520,6 @@
 			lht_dom_hash_put(sn, build_textf("diameter", CFMT, pad_dia));
 			lht_dom_hash_put(sn, build_textf("hole", CFMT, drill_dia));
 		}
-		}
 
 		if (wrver >= 6)
 			lht_dom_hash_put(sn, build_textf("text_thick", CFMT, s->textt));
@@ -1921,10 +1914,7 @@
 
 int io_lihata_write_pcb_v8(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, rnd_bool emergency)
 {
-	if (pcb_brave & PCB_BRAVE_LIHATA_V8)
-		return io_lihata_write_pcb(ctx, FP, old_filename, new_filename, emergency, 8);
-	rnd_message(RND_MSG_ERROR, "Can not write lihata v8: brave mode not enabled\n");
-	return -1;
+	return io_lihata_write_pcb(ctx, FP, old_filename, new_filename, emergency, 8);
 }
 
 int io_lihata_write_font(pcb_plug_io_t *ctx, pcb_font_t *font, const char *Filename)