diff --git a/run_calibre.sh b/run_calibre.sh
index 3e368da..78aba7f 100755
--- a/run_calibre.sh
+++ b/run_calibre.sh
@@ -200,13 +200,13 @@
     ##################################################################################################################
 
 
-    run_lvs=1
+    run_lvs=0
       # all 1 for stdcell-based verilog source, all 0 for full-custom CDL source
       run_lvs_rcx=0    # <-- meaningful/used IFF $run_lvs==1
       run_lvs_box=0    # <-- meaningful/used IFF $run_lvs==1
       run_lvs_catclibs=0 # <-- meaningful/used IFF $run_lvs==1
-    run_antenna_check=0
-    run_mr_drc=0
+    run_antenna_check=1
+    run_mr_drc=1
     run_full_drc=0
         run_oas=0
     run_lures=0
diff --git a/torture_tests.backup/ska_4resplypwl/cdl/ska_4resplypwl.cdl b/torture_tests.backup/ska_4resplypwl/cdl/ska_4resplypwl.cdl
index c79dfd9..79bb609 100644
--- a/torture_tests.backup/ska_4resplypwl/cdl/ska_4resplypwl.cdl
+++ b/torture_tests.backup/ska_4resplypwl/cdl/ska_4resplypwl.cdl
@@ -9,15 +9,22 @@
 * R sky130_fd_pr__res_generic_po   mrp1
 *
 
-.subckt  xhrpoly_0p35 p n sub
+* ISSUE:
+*   Only xpwres matched; other 3 not recognized as same device type.
+*     Need "LVS MAP" of primiive: R(sky130_fd_pr__res_generic_po)  to R(mrp1).
+*     For 3 subckts, like xpwres, need stub subckts to use CONSISTENT PIN NAMES: pos neg sub (as how calibre's subckt-stubs name them)
+*   Layout to ignore (open-circuit) parasitic-diode: Dpar(dnwdiode_psub)
+* 
+
+.subckt  xhrpoly_0p35 pos neg sub
 .ends
-.subckt xuhrpoly_0p35 p n sub
+.subckt xuhrpoly_0p35 pos neg sub
 .ends
 .subckt  xpwres       pos neg sub
 .ends
 
 .subckt  sky130_fd_pr__res_high_po t1 t2 b w=1 l=1 m=1 mult=1
-x0 t1 t2 b  xhrpoly_0p35                   w=w l=l m=m model="xhrpoly_0p35"
+x0 t1 t2 b  xhrpoly_0p35                   w=w l=l m=m
 .ends
 .subckt  sky130_fd_pr__res_xhigh_po t1 t2 b w=1 l=1 m=1 mult=1
 x0 t1 t2 b  xuhrpoly_0p35                   w=w l=l m=m
@@ -50,3 +57,12 @@
 Xsky130_fd_pr__res_iso_pw_729TKM_0 w_5303_12407# w_5303_6949# sky130_fd_pr__res_iso_pw_729TKM
 .ends
 
+* Calibre outputs:
+* ** N=335 EP=0 IP=0 FDC=5
+* X0 1 4 Dpar a=141.959 p=69.7 m=1 $[dnwdiode_psub] $X=25485 $Y=33715 $D=193
+* R1 5 5 L=1.65 W=0.33 m=1 mult=1 model="mrp1" $[mrp1] $X=565 $Y=2715 $D=257
+* X2 6 6 1 xhrpoly_0p35 w=0.35 l=0.62 m=1 model="xhrpoly_0p35" mult=1 $X=8705 $Y=13375 $D=271
+* X3 7 7 1 xuhrpoly_0p35 w=0.35 l=0.62 m=1 model="xuhrpoly_0p35" mult=1 $X=16525 $Y=24285 $D=272
+* X4 2 3 4 xpwres w=2.65 l=26.5 m=1 $X=26515 $Y=35535 $D=283
+* ** WARNING: BAD DEVICE on layer pw_dnw_par at location (26.515,34.745) in cell ska_4resplypwl (see extraction report).
+* *.CALIBRE WARNING BADDEV BAD DEVICE(s) detected by extraction in this cell. See extraction report for details.
diff --git a/torture_tests/caravel/gds/caravel.gds b/torture_tests/caravel/gds/caravel.gds
index 6c080b7..a057845 100644
--- a/torture_tests/caravel/gds/caravel.gds
+++ b/torture_tests/caravel/gds/caravel.gds
Binary files differ
diff --git a/torture_tests/ska_4resplypwl/cdl/ska_4resplypwl.cdl b/torture_tests/ska_4resplypwl/cdl/ska_4resplypwl.cdl
deleted file mode 100644
index 79bb609..0000000
--- a/torture_tests/ska_4resplypwl/cdl/ska_4resplypwl.cdl
+++ /dev/null
@@ -1,68 +0,0 @@
-* NGSPICE file created from ska_4resplypwl.ext - technology: sky130A
-
-* mappings needed (subckt 3-term, w/l):
-* sky130_fd_pr__res_high_po        xhrpoly_0p35
-* sky130_fd_pr__res_xhigh_po       xuhrpoly_0p35
-* sky130_fd_pr__res_iso_pw         xpwres
-*
-* device (primitive) name mappings needed:
-* R sky130_fd_pr__res_generic_po   mrp1
-*
-
-* ISSUE:
-*   Only xpwres matched; other 3 not recognized as same device type.
-*     Need "LVS MAP" of primiive: R(sky130_fd_pr__res_generic_po)  to R(mrp1).
-*     For 3 subckts, like xpwres, need stub subckts to use CONSISTENT PIN NAMES: pos neg sub (as how calibre's subckt-stubs name them)
-*   Layout to ignore (open-circuit) parasitic-diode: Dpar(dnwdiode_psub)
-* 
-
-.subckt  xhrpoly_0p35 pos neg sub
-.ends
-.subckt xuhrpoly_0p35 pos neg sub
-.ends
-.subckt  xpwres       pos neg sub
-.ends
-
-.subckt  sky130_fd_pr__res_high_po t1 t2 b w=1 l=1 m=1 mult=1
-x0 t1 t2 b  xhrpoly_0p35                   w=w l=l m=m
-.ends
-.subckt  sky130_fd_pr__res_xhigh_po t1 t2 b w=1 l=1 m=1 mult=1
-x0 t1 t2 b  xuhrpoly_0p35                   w=w l=l m=m
-.ends
-.subckt  sky130_fd_pr__res_iso_pw t1 t2 b w=1 l=1 m=1 mult=1
-x0 t1 t2 b  xpwres                        w=w l=l m=m
-.ends
-
-***
-.subckt sky130_fd_pr__res_high_po_0p35_TBE9VX a_n165_n612#
-X0 a_n35_n482# a_n35_50# a_n165_n612# sky130_fd_pr__res_high_po w=0.35 l=0.5
-.ends
-
-.subckt sky130_fd_pr__res_generic_po_V3RDUA
-R0 a_n33_n595# a_n33_165# sky130_fd_pr__res_generic_po w=0.33 l=1.65
-.ends
-
-.subckt sky130_fd_pr__res_xhigh_po_0p35_KMREH5 a_n165_n612#
-X0 a_n35_n482# a_n35_50# a_n165_n612# sky130_fd_pr__res_xhigh_po w=0.35 l=0.5
-.ends
-
-.subckt sky130_fd_pr__res_iso_pw_729TKM w_n265_2650# w_n265_n2808#
-X0 w_n265_n2808# w_n265_2650# dw_n471_n3014# sky130_fd_pr__res_iso_pw w=2.65 l=26.5
-.ends
-
-.subckt ska_4resplypwl
-Xsky130_fd_pr__res_high_po_0p35_TBE9VX_0 VSUBS sky130_fd_pr__res_high_po_0p35_TBE9VX
-Xsky130_fd_pr__res_generic_po_V3RDUA_0 sky130_fd_pr__res_generic_po_V3RDUA
-Xsky130_fd_pr__res_xhigh_po_0p35_KMREH5_0 VSUBS sky130_fd_pr__res_xhigh_po_0p35_KMREH5
-Xsky130_fd_pr__res_iso_pw_729TKM_0 w_5303_12407# w_5303_6949# sky130_fd_pr__res_iso_pw_729TKM
-.ends
-
-* Calibre outputs:
-* ** N=335 EP=0 IP=0 FDC=5
-* X0 1 4 Dpar a=141.959 p=69.7 m=1 $[dnwdiode_psub] $X=25485 $Y=33715 $D=193
-* R1 5 5 L=1.65 W=0.33 m=1 mult=1 model="mrp1" $[mrp1] $X=565 $Y=2715 $D=257
-* X2 6 6 1 xhrpoly_0p35 w=0.35 l=0.62 m=1 model="xhrpoly_0p35" mult=1 $X=8705 $Y=13375 $D=271
-* X3 7 7 1 xuhrpoly_0p35 w=0.35 l=0.62 m=1 model="xuhrpoly_0p35" mult=1 $X=16525 $Y=24285 $D=272
-* X4 2 3 4 xpwres w=2.65 l=26.5 m=1 $X=26515 $Y=35535 $D=283
-* ** WARNING: BAD DEVICE on layer pw_dnw_par at location (26.515,34.745) in cell ska_4resplypwl (see extraction report).
-* *.CALIBRE WARNING BADDEV BAD DEVICE(s) detected by extraction in this cell. See extraction report for details.
diff --git a/torture_tests/ska_4resplypwl/gds/ska_4resplypwl.gds b/torture_tests/ska_4resplypwl/gds/ska_4resplypwl.gds
deleted file mode 100644
index 94fe1ba..0000000
--- a/torture_tests/ska_4resplypwl/gds/ska_4resplypwl.gds
+++ /dev/null
Binary files differ