diff --git a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds
index 6091e67..2343998 100644
--- a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds
+++ b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds
Binary files differ
diff --git a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vccd_slice_5um.gds b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vccd_slice_5um.gds
index 17cdfe2..8ca520d 100644
--- a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vccd_slice_5um.gds
+++ b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vccd_slice_5um.gds
Binary files differ
diff --git a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vdda_slice_5um.gds b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vdda_slice_5um.gds
index f24b91e..33cd226 100644
--- a/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vdda_slice_5um.gds
+++ b/sky130/custom/sky130_fd_io/gds/sky130_ef_io__disconnect_vdda_slice_5um.gds
Binary files differ
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.lef
index b3e53c4..4318ee8 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.lef
@@ -106,11 +106,13 @@
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 0.000 92.950 1.000 92.965 ;
-        RECT 19.000 92.950 20.000 92.965 ;
         RECT 0.000 68.000 20.000 92.950 ;
     END
     PORT
+      LAYER met4 ;
+        RECT 0.000 68.000 20.000 92.965 ;
+    END
+    PORT
       LAYER met5 ;
         RECT 0.000 17.850 20.000 22.300 ;
     END
@@ -166,7 +168,6 @@
   OBS
       LAYER met4 ;
         RECT 0.000 173.750 20.000 197.965 ;
-        RECT 0.000 68.000 20.000 92.965 ;
         RECT 0.000 49.610 20.000 50.790 ;
   END
 END sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vccd_slice_5um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vccd_slice_5um.lef
index 8b85966..dabdfeb 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vccd_slice_5um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vccd_slice_5um.lef
@@ -14,10 +14,6 @@
       LAYER met4 ;
         RECT 0.000 51.090 5.000 54.070 ;
     END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 51.090 5.000 54.070 ;
-    END
   END AMUXBUS_A
   PIN AMUXBUS_B
     DIRECTION INOUT ;
@@ -26,10 +22,6 @@
       LAYER met4 ;
         RECT 0.000 46.330 5.000 49.310 ;
     END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 46.330 5.000 49.310 ;
-    END
   END AMUXBUS_B
   PIN VSSA
     DIRECTION INOUT ;
@@ -54,26 +46,6 @@
       LAYER met4 ;
         RECT 0.000 34.700 5.000 38.150 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 45.700 5.000 54.700 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 54.370 5.000 54.700 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 45.700 5.000 46.030 ;
-    END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 34.800 5.000 38.050 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 34.700 5.000 38.150 ;
-    END
   END VSSA
   PIN VDDA
     DIRECTION INOUT ;
@@ -86,14 +58,6 @@
       LAYER met4 ;
         RECT 0.000 12.900 5.000 16.350 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 13.000 5.000 16.250 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 12.900 5.000 16.350 ;
-    END
   END VDDA
   PIN VSWITCH
     DIRECTION INOUT ;
@@ -106,14 +70,6 @@
       LAYER met4 ;
         RECT 0.000 29.850 5.000 33.300 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 29.950 5.000 33.200 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 29.850 5.000 33.300 ;
-    END
   END VSWITCH
   PIN VDDIO_Q
     DIRECTION INOUT ;
@@ -126,14 +82,6 @@
       LAYER met4 ;
         RECT 0.000 62.050 5.000 66.500 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 62.150 5.000 66.400 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 62.050 5.000 66.500 ;
-    END
   END VDDIO_Q
   PIN VCCHIB
     DIRECTION INOUT ;
@@ -146,25 +94,17 @@
       LAYER met4 ;
         RECT 0.000 0.000 5.000 5.450 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 0.100 5.000 5.350 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 0.000 5.000 5.450 ;
-    END
   END VCCHIB
   PIN VDDIO
     DIRECTION INOUT ;
     USE POWER ;
     PORT
       LAYER met5 ;
-        RECT 0.000 68.000 1.000 92.950 ;
+        RECT 0.000 68.000 5.000 92.950 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 68.000 1.000 92.965 ;
+        RECT 0.000 68.000 5.000 92.965 ;
     END
     PORT
       LAYER met5 ;
@@ -174,22 +114,6 @@
       LAYER met4 ;
         RECT 0.000 17.750 5.000 22.400 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 68.000 5.000 92.950 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 68.000 5.000 92.965 ;
-    END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 17.850 5.000 22.300 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 17.750 5.000 22.400 ;
-    END
   END VDDIO
   PIN VSSIO
     DIRECTION INOUT ;
@@ -206,18 +130,6 @@
       LAYER met5 ;
         RECT 0.000 173.750 5.000 197.965 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 23.900 5.000 28.350 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 23.800 5.000 28.450 ;
-    END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 173.750 5.000 197.965 ;
-    END
   END VSSIO
   PIN VSSIO_Q
     DIRECTION INOUT ;
@@ -230,22 +142,11 @@
       LAYER met4 ;
         RECT 0.000 56.200 5.000 60.650 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 56.300 5.000 60.550 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 56.200 5.000 60.650 ;
-    END
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 66.900 5.000 95.000 ;
-        RECT 0.000 172.000 5.000 197.965 ;
-        RECT 0.000 61.050 5.000 61.650 ;
-        RECT 0.000 55.100 5.000 55.800 ;
-        RECT 0.000 49.710 5.000 50.690 ;
+        RECT 0.000 173.750 5.000 197.965 ;
+        RECT 0.000 49.610 5.000 50.790 ;
   END
 END sky130_ef_io__disconnect_vccd_slice_5um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vdda_slice_5um.lef b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vdda_slice_5um.lef
index f887dcf..45b1ef1 100644
--- a/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vdda_slice_5um.lef
+++ b/sky130/custom/sky130_fd_io/lef/sky130_ef_io__disconnect_vdda_slice_5um.lef
@@ -14,10 +14,6 @@
       LAYER met4 ;
         RECT 0.000 51.090 5.000 54.070 ;
     END
-    PORT
-      LAYER met4 ;
-        RECT 0.000 51.090 1.000 54.070 ;
-    END
   END AMUXBUS_A
   PIN AMUXBUS_B
     DIRECTION INOUT ;
@@ -26,10 +22,6 @@
       LAYER met4 ;
         RECT 0.000 46.330 5.000 49.310 ;
     END
-    PORT
-      LAYER met4 ;
-        RECT 0.000 46.330 1.000 49.310 ;
-    END
   END AMUXBUS_B
   PIN VSWITCH
     DIRECTION INOUT ;
@@ -42,14 +34,6 @@
       LAYER met4 ;
         RECT 0.000 29.850 5.000 33.300 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 29.950 5.000 33.200 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 29.850 5.000 33.300 ;
-    END
   END VSWITCH
   PIN VDDIO_Q
     DIRECTION INOUT ;
@@ -59,10 +43,6 @@
         RECT 0.000 62.150 5.000 66.400 ;
     END
     PORT
-      LAYER met5 ;
-        RECT 4.000 62.150 5.000 66.400 ;
-    END
-    PORT
       LAYER met4 ;
         RECT 0.000 62.050 5.000 66.500 ;
     END
@@ -78,14 +58,6 @@
       LAYER met4 ;
         RECT 0.000 0.000 5.000 5.450 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 0.100 5.000 5.350 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 0.000 5.000 5.450 ;
-    END
   END VCCHIB
   PIN VDDIO
     DIRECTION INOUT ;
@@ -96,36 +68,16 @@
     END
     PORT
       LAYER met5 ;
-        RECT 0.000 68.000 1.000 92.950 ;
+        RECT 0.000 68.000 5.000 92.950 ;
     END
     PORT
       LAYER met4 ;
-        RECT 0.000 68.000 1.000 92.965 ;
+        RECT 0.000 68.000 5.000 92.965 ;
     END
     PORT
       LAYER met5 ;
         RECT 0.000 17.850 5.000 22.300 ;
     END
-    PORT
-      LAYER met4 ;
-        RECT 0.000 17.750 1.000 22.400 ;
-    END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 68.000 5.000 92.950 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 68.000 5.000 92.965 ;
-    END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 17.850 5.000 22.300 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 17.750 5.000 22.400 ;
-    END
   END VDDIO
   PIN VCCD
     DIRECTION INOUT ;
@@ -138,14 +90,6 @@
       LAYER met4 ;
         RECT 0.000 6.850 5.000 11.500 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 6.950 5.000 11.400 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 6.850 5.000 11.500 ;
-    END
   END VCCD
   PIN VSSIO
     DIRECTION INOUT ;
@@ -162,18 +106,6 @@
       LAYER met5 ;
         RECT 0.000 173.750 5.000 197.965 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 23.900 5.000 28.350 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 23.800 5.000 28.450 ;
-    END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 173.750 5.000 197.965 ;
-    END
   END VSSIO
   PIN VSSD
     DIRECTION INOUT ;
@@ -186,14 +118,6 @@
       LAYER met4 ;
         RECT 0.000 39.550 5.000 44.200 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 39.650 5.000 44.100 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 39.550 5.000 44.200 ;
-    END
   END VSSD
   PIN VSSIO_Q
     DIRECTION INOUT ;
@@ -206,19 +130,10 @@
       LAYER met4 ;
         RECT 0.000 56.200 5.000 60.650 ;
     END
-    PORT
-      LAYER met5 ;
-        RECT 4.000 56.300 5.000 60.550 ;
-    END
-    PORT
-      LAYER met4 ;
-        RECT 4.000 56.200 5.000 60.650 ;
-    END
   END VSSIO_Q
   OBS
       LAYER met4 ;
-        RECT 0.000 68.000 5.000 95.000 ;
-        RECT 0.000 172.000 5.000 197.965 ;
+        RECT 0.000 173.750 5.000 197.965 ;
   END
 END sky130_ef_io__disconnect_vdda_slice_5um
 END LIBRARY
diff --git a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.mag b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.mag
index 96caef6..0492cc2 100644
--- a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.mag
+++ b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1606173980
+timestamp 1609262803
 << metal3 >>
 rect 198 6606 3800 6640
 rect 198 6016 218 6606
@@ -39,8 +39,6 @@
 rect 0 0 4000 1090
 << metal5 >>
 rect 0 34750 4000 39593
-rect 0 18590 200 18593
-rect 3800 18590 4000 18593
 rect 0 13600 4000 18590
 rect 0 12430 4000 13280
 rect 0 11260 4000 12110
@@ -169,6 +167,6 @@
 string LEFclass PAD AREAIO
 string FIXED_BBOX 0 0 4000 39593
 string GDS_FILE ../gds/sky130_ef_io__connect_vcchib_vccd_and_vswitch_vddio_slice_20um.gds
-string GDS_END 56838
+string GDS_END 56710
 string GDS_START 214
 << end >>
diff --git a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vccd_slice_5um.mag b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vccd_slice_5um.mag
index 62799bb..ebde0db 100644
--- a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vccd_slice_5um.mag
+++ b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vccd_slice_5um.mag
@@ -1,13 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1606130423
-<< checkpaint >>
-rect -1260 10182 2260 40853
-rect -1470 6602 2548 10182
-rect -1260 3688 2260 6602
-rect -1404 -42 2424 3688
-rect -1260 -1260 2260 -42
+timestamp 1609262803
 << metal4 >>
 rect 0 34750 1000 39593
 rect 0 13600 1000 18593
@@ -26,8 +20,6 @@
 rect 0 0 1000 1090
 << metal5 >>
 rect 0 34750 1000 39593
-rect 0 18590 200 18593
-rect 800 18590 1000 18593
 rect 0 13600 1000 18590
 rect 0 12430 1000 13280
 rect 0 11260 1000 12110
@@ -139,6 +131,6 @@
 string LEFclass PAD AREAIO
 string FIXED_BBOX 0 0 1000 39593
 string GDS_FILE ../gds/sky130_ef_io__disconnect_vccd_slice_5um.gds
-string GDS_END 8282
+string GDS_END 8154
 string GDS_START 170
 << end >>
diff --git a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vdda_slice_5um.mag b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vdda_slice_5um.mag
index 5f15955..361ec41 100644
--- a/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vdda_slice_5um.mag
+++ b/sky130/custom/sky130_fd_io/mag/sky130_ef_io__disconnect_vdda_slice_5um.mag
@@ -1,9 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1606142287
-<< checkpaint >>
-rect -1260 8662 2260 11418
+timestamp 1609262875
 << metal4 >>
 rect 0 34750 1000 39593
 rect 0 13600 1000 18593
@@ -19,8 +17,6 @@
 rect 0 0 1000 1090
 << metal5 >>
 rect 0 34750 1000 39593
-rect 0 18590 200 18593
-rect 800 18590 1000 18593
 rect 0 13600 1000 18590
 rect 0 12430 1000 13280
 rect 0 11260 1000 12110
@@ -119,6 +115,6 @@
 string LEFclass PAD AREAIO
 string FIXED_BBOX 0 0 1000 39593
 string GDS_FILE ../gds/sky130_ef_io__disconnect_vdda_slice_5um.gds
-string GDS_END 7232
+string GDS_END 7104
 string GDS_START 170
 << end >>