Index: trunk/src/brave.c
===================================================================
--- trunk/src/brave.c	(revision 31098)
+++ trunk/src/brave.c	(revision 31099)
@@ -55,7 +55,6 @@
 	{PCB_BRAVE_NOCLIPBATCH, "noclipbatch", "do not batch poly clipping", "skip optimization of batching polygon clipping in some expensive user operations", 0},
 	{PCB_BRAVE_LESSTIF_TREETABLE, "lesstifttbl", "lesstif tree table", "enable experimental lesstif tree table support", 0},
 	{PCB_BRAVE_OLDINSERT, "oldinsert", "old insert tool", "revert back to the old insert tool", 0},
-	{PCB_BRAVE_LIHATA_V7, "lihatav7", "lihata v7 model", "lihata v7 data model upgrades", 0},
 	{0, NULL, NULL, NULL}
 };
 
Index: trunk/src/brave.h
===================================================================
--- trunk/src/brave.h	(revision 31098)
+++ trunk/src/brave.h	(revision 31099)
@@ -6,7 +6,6 @@
 	PCB_BRAVE_NOCLIPBATCH = 2,
 	PCB_BRAVE_LESSTIF_TREETABLE = 4,
 	PCB_BRAVE_OLDINSERT = 8,
-	PCB_BRAVE_LIHATA_V7 = 16,
 	PCB_BRAVE_max
 } pcb_brave_t;
 
Index: trunk/src_plugins/io_lihata/write.c
===================================================================
--- trunk/src_plugins/io_lihata/write.c	(revision 31098)
+++ trunk/src_plugins/io_lihata/write.c	(revision 31099)
@@ -55,8 +55,6 @@
 #include "netlist.h"
 #include <librnd/core/hid_dad.h>
 
-#include "brave.h"
-
 #include "src_plugins/lib_compat_help/pstk_compat.h"
 
 /*#define CFMT "%[9]"*/
@@ -1633,10 +1631,6 @@
 
 int io_lihata_write_pcb_v7(pcb_plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, rnd_bool emergency)
 {
-	if (!(pcb_brave & PCB_BRAVE_LIHATA_V7)) {
-		rnd_message(RND_MSG_ERROR, "Saving lihata v7 is disabled yet.\nPlease use the brave() action to manually enable it.\nSaving in v6 instead");
-		return io_lihata_write_pcb(ctx, FP, old_filename, new_filename, emergency, 6);
-	}
 	return io_lihata_write_pcb(ctx, FP, old_filename, new_filename, emergency, 7);
 }
 
Index: trunk/src_plugins/propedit/propsel.c
===================================================================
--- trunk/src_plugins/propedit/propsel.c	(revision 31098)
+++ trunk/src_plugins/propedit/propsel.c	(revision 31099)
@@ -48,8 +48,6 @@
 #include "obj_pstk_op.h"
 #include "obj_subc_op.h"
 
-#include "brave.h"
-
 /*********** map ***********/
 #define type2field_String string
 #define type2field_rnd_coord_t coord
@@ -235,8 +233,7 @@
 	map_attr(ctx, &poly->Attributes);
 	map_common(ctx, (pcb_any_obj_t *)poly);
 	map_add_prop(ctx, "p/trace/clearance", rnd_coord_t, poly->Clearance/2);
-	if (pcb_brave & PCB_BRAVE_LIHATA_V7)
-		map_add_prop(ctx, "p/trace/enforce_clearance", rnd_coord_t, poly->enforce_clearance);
+	map_add_prop(ctx, "p/trace/enforce_clearance", rnd_coord_t, poly->enforce_clearance);
 }
 
 static void map_pstk(pcb_propedit_t *ctx, pcb_pstk_t *ps)