Removing unused wires
diff --git a/mag/BGR_lvs.mag b/mag/BGR_lvs.mag
index e4455d7..2f58774 100644
--- a/mag/BGR_lvs.mag
+++ b/mag/BGR_lvs.mag
@@ -1,12 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1664651080
-<< error_s >>
-rect -2243 -2874 -2230 -2626
-rect -1995 -3088 -1982 -2874
-rect -4470 -3810 7062 -3806
-rect -4470 -5140 7062 -5048
+timestamp 1665771957
 << nwell >>
 rect -8726 10225 -8100 11452
 << locali >>
@@ -761,15 +756,15 @@
 rect 62100 -10360 62400 -10240
 rect -14220 -10400 62400 -10360
 use XM_Rref  XM_Rref_0
-timestamp 1662826901
+timestamp 1665771957
 transform 0 1 -13057 -1 0 -5305
 box -1417 -1173 5029 21223
 use XM_bjt  XM_bjt_0
-timestamp 1664651080
+timestamp 1665771707
 transform 1 0 -1950 0 1 -2620
 box 0 0 6492 9068
 use XM_bjt_out  XM_bjt_out_0
-timestamp 1664651080
+timestamp 1665771707
 transform 1 0 -2070 0 1 6780
 box 0 0 6492 3916
 use XM_current_gate_with_dummy  XM_current_gate_with_dummy_0
diff --git a/mag/XM_Rref.mag b/mag/XM_Rref.mag
index 1b31528..b643c45 100644
--- a/mag/XM_Rref.mag
+++ b/mag/XM_Rref.mag
@@ -1,14 +1,14 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1662826901
+timestamp 1665771957
 << metal1 >>
 rect 1132 20636 1238 21045
 rect 3616 20636 3722 21045
 rect -110 -995 -4 -586
 rect 2374 -995 2480 -586
 use sky130_fd_pr__res_xhigh_po_5p73_UZMRKM  sky130_fd_pr__res_xhigh_po_5p73_UZMRKM_0
-timestamp 1662826682
+timestamp 1665771957
 transform 1 0 1806 0 1 10025
 box -3223 -11198 3223 11198
 << end >>
diff --git a/mag/XM_bjt.mag b/mag/XM_bjt.mag
index 8c4ef48..ebd658a 100644
--- a/mag/XM_bjt.mag
+++ b/mag/XM_bjt.mag
@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1664651080
+timestamp 1665771707
 << locali >>
 rect 20 4410 3200 4440
 rect 20 3960 3200 3990
@@ -54,9 +54,9 @@
 << metal2 >>
 rect 1550 2350 1700 2355
 rect 1550 2195 1700 2200
-use sky130_fd_pr__rf_pnp_05v5_W3p40L3p40  sky130_fd_pr__rf_pnp_05v5_W3p40L3p40_0 pdk/sky130A/libs.ref/sky130_fd_pr/mag
+use sky130_fd_pr__rf_pnp_05v5_W3p40L3p40  sky130_fd_pr__rf_pnp_05v5_W3p40L3p40_0 $PDKPATH/libs.ref/sky130_fd_pr/mag
 array 0 4 644 0 6 644
-timestamp 1650294714
+timestamp 1657128861
 transform 1 0 0 0 1 0
 box 0 0 670 670
 << end >>
diff --git a/mag/XM_bjt_out.mag b/mag/XM_bjt_out.mag
index f2b215b..6b879f9 100644
--- a/mag/XM_bjt_out.mag
+++ b/mag/XM_bjt_out.mag
@@ -1,6 +1,6 @@
 magic
 tech sky130A
-timestamp 1664651080
+timestamp 1665771707
 << locali >>
 rect 300 1600 3000 1650
 rect 300 950 1410 1000
@@ -14,9 +14,9 @@
 << metal2 >>
 rect 1550 1050 1700 1055
 rect 1550 895 1700 900
-use sky130_fd_pr__rf_pnp_05v5_W3p40L3p40  sky130_fd_pr__rf_pnp_05v5_W3p40L3p40_0 pdk/sky130A/libs.ref/sky130_fd_pr/mag
+use sky130_fd_pr__rf_pnp_05v5_W3p40L3p40  sky130_fd_pr__rf_pnp_05v5_W3p40L3p40_0 $PDKPATH/libs.ref/sky130_fd_pr/mag
 array 0 4 644 0 2 644
-timestamp 1650294714
+timestamp 1657128861
 transform 1 0 0 0 1 0
 box 0 0 670 670
 << end >>
diff --git a/mag/sky130_fd_pr__res_xhigh_po_5p73_UZMRKM.mag b/mag/sky130_fd_pr__res_xhigh_po_5p73_UZMRKM.mag
index d50ed19..9e97d1d 100644
--- a/mag/sky130_fd_pr__res_xhigh_po_5p73_UZMRKM.mag
+++ b/mag/sky130_fd_pr__res_xhigh_po_5p73_UZMRKM.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1662826682
+timestamp 1665771957
 << pwell >>
 rect -3223 -11198 3223 11198
 << psubdiff >>
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index c5e34f7..3523264 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,15 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1664654199
-<< error_s >>
-rect 251987 565529 252000 565777
-rect 252235 565315 252248 565529
-rect 240166 564593 261830 564597
-rect 240166 563203 262230 563355
-rect 240166 561961 262230 562113
-rect 240166 560719 262230 560871
-rect 240166 559477 262230 559629
+timestamp 1665771957
 << metal1 >>
 rect 14920 682870 15420 682910
 rect 14920 682040 14960 682870
@@ -1098,6 +1090,10 @@
 rect 315000 637000 316500 645000
 rect 238000 580000 260000 584000
 rect 305500 580300 316500 637000
+rect 570000 643000 582000 645000
+rect 570000 631000 572000 643000
+rect 580000 631000 582000 643000
+rect 570000 630000 582000 631000
 rect 238200 570900 240100 574000
 rect 258800 571400 260000 580000
 rect 238200 568100 239300 570900
@@ -1109,15 +1105,7 @@
 rect 130800 550400 131200 563600
 rect 238200 563700 240200 568100
 rect 239700 558000 240200 563700
-rect 510000 563000 526000 660000
-rect 570000 643000 582000 645000
-rect 570000 631000 572000 643000
-rect 580000 631000 582000 643000
-rect 570000 630000 582000 631000
 rect 263600 557900 316600 558100
-rect 510000 555000 511000 563000
-rect 525000 555000 526000 563000
-rect 510000 554000 526000 555000
 rect 30150 409800 30600 418600
 rect 39000 409800 39650 418600
 rect 30150 219860 39650 409800
@@ -1151,12 +1139,11 @@
 rect 25800 550600 27600 564000
 rect 238000 636000 248000 644000
 rect 307000 637000 315000 645000
+rect 572000 631000 580000 643000
 rect 61000 550400 65000 564000
 rect 126800 550400 130800 563600
 rect 238200 558000 239700 563700
-rect 572000 631000 580000 643000
 rect 263600 556400 316600 557900
-rect 511000 555000 525000 563000
 rect 30600 409800 39000 418600
 rect 198200 466200 199800 467800
 rect 198200 360200 199800 361800
@@ -1177,16 +1164,16 @@
 rect 39200 656800 46400 658600
 rect 32000 656400 46400 656800
 rect 72976 647000 79024 647024
-rect 1800 646600 553600 647000
+rect 1800 646600 320000 647000
 rect 1800 635400 2200 646600
-rect 4600 645000 553600 646600
+rect 4600 645000 320000 646600
 rect 4600 644000 307000 645000
 rect 4600 636000 238000 644000
 rect 248000 637000 307000 644000
-rect 315000 637000 553600 645000
-rect 248000 636000 553600 637000
-rect 4600 635400 553600 636000
-rect 1800 635000 553600 635400
+rect 315000 637000 320000 645000
+rect 248000 636000 320000 637000
+rect 4600 635400 320000 636000
+rect 1800 635000 320000 635400
 rect 560200 643000 582000 647000
 rect 72976 634976 79024 635000
 rect 560200 631000 572000 643000
@@ -1206,19 +1193,16 @@
 rect 4000 550600 25800 555000
 rect 27600 550600 61000 564000
 rect 4000 550400 61000 550600
-rect 65000 563700 526000 564000
+rect 65000 563700 320000 564000
 rect 65000 563600 238200 563700
 rect 65000 550400 126800 563600
 rect 130800 558000 238200 563600
-rect 239700 563000 526000 563700
-rect 239700 558000 511000 563000
-rect 130800 557900 511000 558000
+rect 239700 558000 320000 563700
+rect 130800 557900 320000 558000
 rect 130800 556400 263600 557900
-rect 316600 556400 511000 557900
-rect 130800 555000 511000 556400
-rect 525000 555000 526000 563000
-rect 130800 550400 526000 555000
-rect 4000 550000 526000 550400
+rect 316600 556400 320000 557900
+rect 130800 550400 320000 556400
+rect 4000 550000 320000 550400
 rect 976 549976 4024 550000
 rect 198000 467800 200000 468000
 rect 198000 466200 198200 467800
@@ -1245,7 +1229,7 @@
 rect 584000 0 584100 704000
 rect -100 -100 584100 0
 use BGR_lvs  BGR_lvs_0
-timestamp 1664651080
+timestamp 1665771957
 transform 1 0 254230 0 1 568403
 box -14230 -10403 62405 12600
 use TX_line  TX_line_0