diff --git a/diylc-regression-data/input/cloud/netlist/121_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/121_excl_switches.txt
index b2bc5efb..8b0f00bc 100644
--- a/diylc-regression-data/input/cloud/netlist/121_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/121_excl_switches.txt
@@ -5,6 +5,6 @@ Switch setup: [Default]
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1
 	C2.2 <-> R4.2 <-> R5.2 <-> R6.2
 	C3.1 <-> R3.2
-	R1.1 <-> R2.1
+	C3.2 <-> R1.1 <-> R2.1
 	R2.2 <-> R3.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/121_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/121_incl_switches.txt
index b2bc5efb..8b0f00bc 100644
--- a/diylc-regression-data/input/cloud/netlist/121_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/121_incl_switches.txt
@@ -5,6 +5,6 @@ Switch setup: [Default]
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1
 	C2.2 <-> R4.2 <-> R5.2 <-> R6.2
 	C3.1 <-> R3.2
-	R1.1 <-> R2.1
+	C3.2 <-> R1.1 <-> R2.1
 	R2.2 <-> R3.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/123_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/123_excl_switches.txt
index 00baa1b2..738352e5 100644
--- a/diylc-regression-data/input/cloud/netlist/123_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/123_excl_switches.txt
@@ -1,13 +1,10 @@
 Switch setup: [Default]
 
 	C1.1 <-> C2.1 <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R2.2 <-> R9.2
-	C1.2 <-> Q1.3 <-> R7.1
-	C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R8.2
-	C3.1 <-> Q2.1 <-> R4.1 <-> R6.1
+	C1.2 <-> C4.2 <-> Q1.3 <-> R11.2 <-> R7.1
+	C2.2 <-> C3.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R4.1 <-> R6.1 <-> R8.2
 	C3.2 <-> C4.1 <-> D1.1 <-> D2.2
-	C4.2 <-> R11.2
 	C5.1 <-> R5.2 <-> R6.2
-	Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2
-	R1.1 <-> R2.1
-	R7.2 <-> R8.1 <-> R9.1
+	Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.1
+	R1.1 <-> R2.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/123_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/123_incl_switches.txt
index 00baa1b2..738352e5 100644
--- a/diylc-regression-data/input/cloud/netlist/123_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/123_incl_switches.txt
@@ -1,13 +1,10 @@
 Switch setup: [Default]
 
 	C1.1 <-> C2.1 <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R2.2 <-> R9.2
-	C1.2 <-> Q1.3 <-> R7.1
-	C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R8.2
-	C3.1 <-> Q2.1 <-> R4.1 <-> R6.1
+	C1.2 <-> C4.2 <-> Q1.3 <-> R11.2 <-> R7.1
+	C2.2 <-> C3.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R4.1 <-> R6.1 <-> R8.2
 	C3.2 <-> C4.1 <-> D1.1 <-> D2.2
-	C4.2 <-> R11.2
 	C5.1 <-> R5.2 <-> R6.2
-	Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2
-	R1.1 <-> R2.1
-	R7.2 <-> R8.1 <-> R9.1
+	Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.1
+	R1.1 <-> R2.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/124_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/124_excl_switches.txt
index 926ecf9e..7a53fe06 100644
--- a/diylc-regression-data/input/cloud/netlist/124_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/124_excl_switches.txt
@@ -1,8 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> R1.1 <-> R2.2
-	C1.2 <-> C3.1 <-> C4.2 <-> Q1.3 <-> R4.2
-	C2.2 <-> C3.2 <-> Q2.3 <-> R3.2
+	C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> Q1.3 <-> R4.2
+	C2.2 <-> C3.2 <-> C5.2 <-> Q2.3 <-> R3.2
 	C4.1 <-> R1.2
 	C5.1 <-> Q2.1 <-> Q2.2
 	Q1.1 <-> Q1.2 <-> R3.1
diff --git a/diylc-regression-data/input/cloud/netlist/124_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/124_incl_switches.txt
index 926ecf9e..7a53fe06 100644
--- a/diylc-regression-data/input/cloud/netlist/124_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/124_incl_switches.txt
@@ -1,8 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> R1.1 <-> R2.2
-	C1.2 <-> C3.1 <-> C4.2 <-> Q1.3 <-> R4.2
-	C2.2 <-> C3.2 <-> Q2.3 <-> R3.2
+	C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> Q1.3 <-> R4.2
+	C2.2 <-> C3.2 <-> C5.2 <-> Q2.3 <-> R3.2
 	C4.1 <-> R1.2
 	C5.1 <-> Q2.1 <-> Q2.2
 	Q1.1 <-> Q1.2 <-> R3.1
diff --git a/diylc-regression-data/input/cloud/netlist/125_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/125_excl_switches.txt
index 85a8f98e..17382325 100644
--- a/diylc-regression-data/input/cloud/netlist/125_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/125_excl_switches.txt
@@ -1,6 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
+	C1.1 <-> C2.2 <-> R1.1
 	C1.2 <-> C3.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.1
 	C2.1 <-> R3.1
 	C3.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
diff --git a/diylc-regression-data/input/cloud/netlist/125_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/125_incl_switches.txt
index 85a8f98e..17382325 100644
--- a/diylc-regression-data/input/cloud/netlist/125_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/125_incl_switches.txt
@@ -1,6 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
+	C1.1 <-> C2.2 <-> R1.1
 	C1.2 <-> C3.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.1
 	C2.1 <-> R3.1
 	C3.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
diff --git a/diylc-regression-data/input/cloud/netlist/130_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/130_excl_switches.txt
index 4900a2e0..a3cda271 100644
--- a/diylc-regression-data/input/cloud/netlist/130_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/130_excl_switches.txt
@@ -1,14 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> C6.2 <-> R1.1
-	C1.2 <-> C2.2 <-> Q1.2 <-> Q1.3 <-> R2.2
-	C2.1 <-> C4.1 <-> R2.1 <-> R3.1
-	C3.1 <-> R3.2 <-> R4.1
-	C3.2 <-> R4.2 <-> R6.2
-	C4.2 <-> Q2.2 <-> Q2.3 <-> R5.1
-	C5.2 <-> C6.1 <-> R5.2 <-> R6.1
-	C7.1 <-> R7.1
-	C7.2 <-> R8.1
-	C8.1 <-> R7.2 <-> R8.2
+	C1.2 <-> C2.2 <-> C4.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R5.1
+	C2.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> R2.1 <-> R3.1 <-> R5.2 <-> R6.1 <-> R7.1
+	C3.1 <-> C8.1 <-> R3.2 <-> R4.1 <-> R7.2 <-> R8.2
+	C3.2 <-> C7.2 <-> R4.2 <-> R6.2 <-> R8.1
 	Q1.1 <-> Q2.1 <-> R1.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/130_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/130_incl_switches.txt
index 4900a2e0..a3cda271 100644
--- a/diylc-regression-data/input/cloud/netlist/130_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/130_incl_switches.txt
@@ -1,14 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> C6.2 <-> R1.1
-	C1.2 <-> C2.2 <-> Q1.2 <-> Q1.3 <-> R2.2
-	C2.1 <-> C4.1 <-> R2.1 <-> R3.1
-	C3.1 <-> R3.2 <-> R4.1
-	C3.2 <-> R4.2 <-> R6.2
-	C4.2 <-> Q2.2 <-> Q2.3 <-> R5.1
-	C5.2 <-> C6.1 <-> R5.2 <-> R6.1
-	C7.1 <-> R7.1
-	C7.2 <-> R8.1
-	C8.1 <-> R7.2 <-> R8.2
+	C1.2 <-> C2.2 <-> C4.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R5.1
+	C2.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> R2.1 <-> R3.1 <-> R5.2 <-> R6.1 <-> R7.1
+	C3.1 <-> C8.1 <-> R3.2 <-> R4.1 <-> R7.2 <-> R8.2
+	C3.2 <-> C7.2 <-> R4.2 <-> R6.2 <-> R8.1
 	Q1.1 <-> Q2.1 <-> R1.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/135_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/135_excl_switches.txt
index 530b3f0c..1b9756ed 100644
--- a/diylc-regression-data/input/cloud/netlist/135_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/135_excl_switches.txt
@@ -5,5 +5,5 @@ Switch setup: [Default]
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1
 	C2.2 <-> C3.2 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2
 	C3.1 <-> R2.2
-	C4.2 <-> R5.1
+	C4.2 <-> R1.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/135_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/135_incl_switches.txt
index 530b3f0c..1b9756ed 100644
--- a/diylc-regression-data/input/cloud/netlist/135_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/135_incl_switches.txt
@@ -5,5 +5,5 @@ Switch setup: [Default]
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1
 	C2.2 <-> C3.2 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2
 	C3.1 <-> R2.2
-	C4.2 <-> R5.1
+	C4.2 <-> R1.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/147_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/147_excl_switches.txt
index 4abfd985..c035b989 100644
--- a/diylc-regression-data/input/cloud/netlist/147_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/147_excl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R3.1 <-> R4.1
-	C1.2 <-> R5.1
+	C1.2 <-> C2.2 <-> R5.1
 	C2.1 <-> R2.1
 	Q1.1 <-> Q1.2 <-> R1.1
 	R1.2 <-> R4.2 <-> R5.2
diff --git a/diylc-regression-data/input/cloud/netlist/147_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/147_incl_switches.txt
index 4abfd985..c035b989 100644
--- a/diylc-regression-data/input/cloud/netlist/147_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/147_incl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R3.1 <-> R4.1
-	C1.2 <-> R5.1
+	C1.2 <-> C2.2 <-> R5.1
 	C2.1 <-> R2.1
 	Q1.1 <-> Q1.2 <-> R1.1
 	R1.2 <-> R4.2 <-> R5.2
diff --git a/diylc-regression-data/input/cloud/netlist/150_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/150_excl_switches.txt
index f422af61..2f6ac7fa 100644
--- a/diylc-regression-data/input/cloud/netlist/150_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/150_excl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R1.1 <-> R2.1
+	C1.1 <-> C2.2 <-> C4.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R1.2 <-> R2.1
+	C1.2 <-> C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
 	C2.1 <-> R2.2 <-> R4.1
-	C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R1.2
 	C3.1 <-> Q2.2 <-> Q2.3 <-> R3.1
-	C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
-	C4.1 <-> D1.1 <-> D2.2
 	C5.1 <-> R5.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/150_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/150_incl_switches.txt
index f422af61..2f6ac7fa 100644
--- a/diylc-regression-data/input/cloud/netlist/150_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/150_incl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R1.1 <-> R2.1
+	C1.1 <-> C2.2 <-> C4.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R1.2 <-> R2.1
+	C1.2 <-> C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
 	C2.1 <-> R2.2 <-> R4.1
-	C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R1.2
 	C3.1 <-> Q2.2 <-> Q2.3 <-> R3.1
-	C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
-	C4.1 <-> D1.1 <-> D2.2
 	C5.1 <-> R5.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/156_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/156_excl_switches.txt
index dc78a33f..a679c818 100644
--- a/diylc-regression-data/input/cloud/netlist/156_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/156_excl_switches.txt
@@ -1,10 +1,9 @@
 Switch setup: [Default]
 
+	C1.1 <-> C3.1 <-> R1.2 <-> VR1.1
+	C1.2 <-> VR1.2 <-> VR1.3
 	C2.1 <-> Q1.1 <-> R4.1
-	C2.2 <-> Q2.1 <-> Q2.2 <-> R3.2 <-> R4.2
-	C3.1 <-> R1.2 <-> VR1.1
-	Q1.2 <-> Q1.3 <-> R3.1
-	Q2.3 <-> R2.1
+	C2.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R3.2 <-> R4.2
+	C3.2 <-> Q2.3 <-> R2.1
 	R1.1 <-> R2.2
-	VR1.2 <-> VR1.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/156_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/156_incl_switches.txt
index dc78a33f..a679c818 100644
--- a/diylc-regression-data/input/cloud/netlist/156_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/156_incl_switches.txt
@@ -1,10 +1,9 @@
 Switch setup: [Default]
 
+	C1.1 <-> C3.1 <-> R1.2 <-> VR1.1
+	C1.2 <-> VR1.2 <-> VR1.3
 	C2.1 <-> Q1.1 <-> R4.1
-	C2.2 <-> Q2.1 <-> Q2.2 <-> R3.2 <-> R4.2
-	C3.1 <-> R1.2 <-> VR1.1
-	Q1.2 <-> Q1.3 <-> R3.1
-	Q2.3 <-> R2.1
+	C2.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R3.2 <-> R4.2
+	C3.2 <-> Q2.3 <-> R2.1
 	R1.1 <-> R2.2
-	VR1.2 <-> VR1.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/159_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/159_excl_switches.txt
index aad412e5..1d71d28a 100644
--- a/diylc-regression-data/input/cloud/netlist/159_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/159_excl_switches.txt
@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> IC1.2 <-> R1.1
-	C1.2 <-> C5.1 <-> IC1.7 <-> R1.2
+	C1.1 <-> C2.1 <-> C3.2 <-> IC1.2 <-> IC1.6 <-> R1.1 <-> R8.1
+	C1.2 <-> C5.1 <-> IC1.1 <-> IC1.3 <-> IC1.5 <-> IC1.7 <-> R1.2 <-> R2.1 <-> R3.1 <-> R4.1
 	C2.2 <-> R2.2
-	C3.1 <-> R3.2
-	C3.2 <-> R8.1
-	C4.1 <-> R4.2 <-> R5.1
-	C4.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R5.2 <-> R6.1 <-> R8.2
-	C5.2 <-> R9.1
-	C6.1 <-> D1.1 <-> D3.2 <-> R9.2
-	D2.2 <-> D3.1
-	IC1.1 <-> IC1.3 <-> IC1.5 <-> R3.1 <-> R4.1
-	R6.2 <-> R7.2
+	C3.1 <-> C6.1 <-> D1.1 <-> D3.2 <-> R3.2 <-> R9.2
+	C4.1 <-> D2.2 <-> D3.1 <-> R4.2 <-> R5.1
+	C4.2 <-> C5.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R5.2 <-> R6.1 <-> R8.2 <-> R9.1
+	R6.2 <-> R7.1 <-> R7.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/159_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/159_incl_switches.txt
index aad412e5..1d71d28a 100644
--- a/diylc-regression-data/input/cloud/netlist/159_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/159_incl_switches.txt
@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> IC1.2 <-> R1.1
-	C1.2 <-> C5.1 <-> IC1.7 <-> R1.2
+	C1.1 <-> C2.1 <-> C3.2 <-> IC1.2 <-> IC1.6 <-> R1.1 <-> R8.1
+	C1.2 <-> C5.1 <-> IC1.1 <-> IC1.3 <-> IC1.5 <-> IC1.7 <-> R1.2 <-> R2.1 <-> R3.1 <-> R4.1
 	C2.2 <-> R2.2
-	C3.1 <-> R3.2
-	C3.2 <-> R8.1
-	C4.1 <-> R4.2 <-> R5.1
-	C4.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R5.2 <-> R6.1 <-> R8.2
-	C5.2 <-> R9.1
-	C6.1 <-> D1.1 <-> D3.2 <-> R9.2
-	D2.2 <-> D3.1
-	IC1.1 <-> IC1.3 <-> IC1.5 <-> R3.1 <-> R4.1
-	R6.2 <-> R7.2
+	C3.1 <-> C6.1 <-> D1.1 <-> D3.2 <-> R3.2 <-> R9.2
+	C4.1 <-> D2.2 <-> D3.1 <-> R4.2 <-> R5.1
+	C4.2 <-> C5.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R5.2 <-> R6.1 <-> R8.2 <-> R9.1
+	R6.2 <-> R7.1 <-> R7.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/164_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/164_excl_switches.txt
index 8f172f62..a95751eb 100644
--- a/diylc-regression-data/input/cloud/netlist/164_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/164_excl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C2.2 <-> Q1.3 <-> R2.1
+	C1.1 <-> C5.2 <-> R1.1 <-> R6.2
+	C1.2 <-> C2.2 <-> C4.1 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R2.1 <-> R2.2 <-> R4.1
 	C2.1 <-> Q2.3 <-> R3.2
 	C3.1 <-> R3.1 <-> R5.1
-	C3.2 <-> C4.2 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R2.2 <-> R4.1
-	C5.1 <-> R5.2 <-> R6.1
+	C3.2 <-> C4.2 <-> C5.1 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 <-> R5.2 <-> R6.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/164_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/164_incl_switches.txt
index 8f172f62..a95751eb 100644
--- a/diylc-regression-data/input/cloud/netlist/164_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/164_incl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C2.2 <-> Q1.3 <-> R2.1
+	C1.1 <-> C5.2 <-> R1.1 <-> R6.2
+	C1.2 <-> C2.2 <-> C4.1 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R2.1 <-> R2.2 <-> R4.1
 	C2.1 <-> Q2.3 <-> R3.2
 	C3.1 <-> R3.1 <-> R5.1
-	C3.2 <-> C4.2 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R2.2 <-> R4.1
-	C5.1 <-> R5.2 <-> R6.1
+	C3.2 <-> C4.2 <-> C5.1 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 <-> R5.2 <-> R6.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/174_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/174_excl_switches.txt
index dadce826..a7fa11c1 100644
--- a/diylc-regression-data/input/cloud/netlist/174_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/174_excl_switches.txt
@@ -6,5 +6,4 @@ Switch setup: [Default]
 	C3.1 <-> IC1.6
 	C4.1 <-> IC1.7 <-> Q1.1
 	C5.1 <-> IC1.8 <-> R1.2
-	IC1.8 <-> R1.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/174_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/174_incl_switches.txt
index dadce826..a7fa11c1 100644
--- a/diylc-regression-data/input/cloud/netlist/174_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/174_incl_switches.txt
@@ -6,5 +6,4 @@ Switch setup: [Default]
 	C3.1 <-> IC1.6
 	C4.1 <-> IC1.7 <-> Q1.1
 	C5.1 <-> IC1.8 <-> R1.2
-	IC1.8 <-> R1.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt
index 55a6528f..0242222f 100644
--- a/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/181_excl_switches.txt
@@ -5,17 +5,15 @@ Switch setup: [Default]
 	.4 <-> C2.2
 	.7 <-> Led.2
 	.8 <-> Gate.1 <-> Q3.1 <-> R5.2 <-> Volume.3
-	C1.1 <-> Compress.2 <-> Compress.3 <-> Drive.3 <-> R3.2 <-> Stability.2
+	C1.1 <-> Compress.1 <-> Compress.2 <-> Compress.3 <-> Drive.1 <-> Drive.3 <-> R3.2 <-> R4.1 <-> R7.1 <-> Stability.1 <-> Stability.2
 	C1.2 <-> Drive.2
 	C2.1 <-> Q3.2 <-> Q3.3 <-> R6.2
 	C3.1 <-> Q2.2 <-> Q2.3 <-> R4.2
 	C3.2 <-> R3.1 <-> R6.1
 	C4.1 <-> Volume.2
-	Compress.1 <-> Drive.1 <-> R4.1
 	Gate.2 <-> Gate.3 <-> R1.2
 	Led.1 <-> R7.2
 	Q1.1 <-> Q1.2 <-> R2.2
 	Q1.3 <-> Q2.1 <-> R1.1
 	R2.1 <-> Volume.1
-	R7.1 <-> Stability.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt
index 59e6999b..cd635e7a 100644
--- a/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/181_incl_switches.txt
@@ -1,36 +1,32 @@
 Switch setup: [.ON1]
 
-	C1.1 <-> Compress.2 <-> Compress.3 <-> Drive.3 <-> R3.2 <-> Stability.2
+	C1.1 <-> Compress.1 <-> Compress.2 <-> Compress.3 <-> Drive.1 <-> Drive.3 <-> R3.2 <-> R4.1 <-> R7.1 <-> Stability.1 <-> Stability.2
 	C1.2 <-> Drive.2
 	C2.1 <-> Q3.2 <-> Q3.3 <-> R6.2
 	C3.1 <-> Q2.2 <-> Q2.3 <-> R4.2
 	C3.2 <-> R3.1 <-> R6.1
 	C4.1 <-> Volume.2
 	C4.2 <-> R5.1
-	Compress.1 <-> Drive.1 <-> R4.1
 	Gate.1 <-> Led.2 <-> Q3.1 <-> R5.2 <-> Volume.3
 	Gate.2 <-> Gate.3 <-> R1.2
 	Led.1 <-> R7.2
 	Q1.1 <-> Q1.2 <-> R2.2
 	Q1.3 <-> Q2.1 <-> R1.1
 	R2.1 <-> Volume.1
-	R7.1 <-> Stability.1
 
 Switch setup: [.ON2]
 
-	C1.1 <-> Compress.2 <-> Compress.3 <-> Drive.3 <-> R3.2 <-> Stability.2
+	C1.1 <-> Compress.1 <-> Compress.2 <-> Compress.3 <-> Drive.1 <-> Drive.3 <-> R3.2 <-> R4.1 <-> R7.1 <-> Stability.1 <-> Stability.2
 	C1.2 <-> Drive.2
 	C2.1 <-> Q3.2 <-> Q3.3 <-> R6.2
 	C3.1 <-> Q2.2 <-> Q2.3 <-> R4.2
 	C3.2 <-> R3.1 <-> R6.1
 	C4.1 <-> Volume.2
 	C4.2 <-> R5.1
-	Compress.1 <-> Drive.1 <-> R4.1
 	Gate.1 <-> Q3.1 <-> R5.2 <-> Volume.3
 	Gate.2 <-> Gate.3 <-> R1.2
 	Led.1 <-> R7.2
 	Q1.1 <-> Q1.2 <-> R2.2
 	Q1.3 <-> Q2.1 <-> R1.1
 	R2.1 <-> Volume.1
-	R7.1 <-> Stability.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/187_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/187_excl_switches.txt
index ed3c1dac..56ed2d63 100644
--- a/diylc-regression-data/input/cloud/netlist/187_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/187_excl_switches.txt
@@ -10,6 +10,5 @@ Switch setup: [Default]
 	C1.1 <-> Q1.3 <-> R4.1 <-> R5.2
 	C2.1 <-> R3.2
 	Q1.1 <-> Q1.2 <-> R1.1
-	Q1.1 <-> R1.1
 	R2.1 <-> R3.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/187_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/187_incl_switches.txt
index 4adca3c7..84edb265 100644
--- a/diylc-regression-data/input/cloud/netlist/187_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/187_incl_switches.txt
@@ -7,7 +7,6 @@ Switch setup: [.ON1]
 	C2.1 <-> R3.2
 	LED.1 <-> R2.2
 	Q1.1 <-> Q1.2 <-> R1.1
-	Q1.1 <-> R1.1
 	R2.1 <-> R3.1 <-> R5.1
 
 Switch setup: [.ON2]
@@ -18,6 +17,5 @@ Switch setup: [.ON2]
 	C1.2 <-> R6.1
 	C2.1 <-> R3.2
 	Q1.1 <-> Q1.2 <-> R1.1
-	Q1.1 <-> R1.1
 	R2.1 <-> R3.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/189_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/189_excl_switches.txt
index 03279c80..5cb71629 100644
--- a/diylc-regression-data/input/cloud/netlist/189_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/189_excl_switches.txt
@@ -6,5 +6,4 @@ Switch setup: [Default]
 	C3.1 <-> IC1.6
 	C4.2 <-> IC1.7 <-> Q1.1
 	C5.1 <-> IC1.8 <-> R1.2
-	IC1.8 <-> R1.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/189_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/189_incl_switches.txt
index 03279c80..5cb71629 100644
--- a/diylc-regression-data/input/cloud/netlist/189_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/189_incl_switches.txt
@@ -6,5 +6,4 @@ Switch setup: [Default]
 	C3.1 <-> IC1.6
 	C4.2 <-> IC1.7 <-> Q1.1
 	C5.1 <-> IC1.8 <-> R1.2
-	IC1.8 <-> R1.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt
index 31cc83bb..913a4578 100644
--- a/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/202_excl_switches.txt
@@ -4,7 +4,6 @@ Switch setup: [Default]
 	.2 <-> C1.2
 	.3 <-> C1.1 <-> C2.1
 	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1
-	C3.2 <-> C4.1
 	C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1
 	C4.1 <-> Q1.1 <-> Q2.2
 	C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2
diff --git a/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt
index c5d5e635..81375742 100644
--- a/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/202_incl_switches.txt
@@ -3,7 +3,6 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2]
 	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1
 	C1.1 <-> C2.1
 	C1.2 <-> C2.2
-	C3.2 <-> C4.1
 	C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1
 	C4.1 <-> Q1.1 <-> Q2.2
 	C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2
@@ -23,7 +22,6 @@ Switch setup: [.ON2:.ON1, .ON2:.ON2]
 
 	C1.1 <-> C1.2 <-> C2.1
 	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1
-	C3.2 <-> C4.1
 	C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1
 	C4.1 <-> Q1.1 <-> Q2.2
 	C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2
diff --git a/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt
index 31cc83bb..913a4578 100644
--- a/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/205_excl_switches.txt
@@ -4,7 +4,6 @@ Switch setup: [Default]
 	.2 <-> C1.2
 	.3 <-> C1.1 <-> C2.1
 	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1
-	C3.2 <-> C4.1
 	C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1
 	C4.1 <-> Q1.1 <-> Q2.2
 	C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2
diff --git a/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt
index c5d5e635..81375742 100644
--- a/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/205_incl_switches.txt
@@ -3,7 +3,6 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2]
 	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1
 	C1.1 <-> C2.1
 	C1.2 <-> C2.2
-	C3.2 <-> C4.1
 	C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1
 	C4.1 <-> Q1.1 <-> Q2.2
 	C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2
@@ -23,7 +22,6 @@ Switch setup: [.ON2:.ON1, .ON2:.ON2]
 
 	C1.1 <-> C1.2 <-> C2.1
 	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1
-	C3.2 <-> C4.1
 	C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1
 	C4.1 <-> Q1.1 <-> Q2.2
 	C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2
diff --git a/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt
index 8711fbf1..19e8a0d8 100644
--- a/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/211_incl_switches.txt
@@ -1,25 +1,11 @@
 Switch setup: [Default]
 
-	2K2.1 <-> D1.2 <-> D4.2 <-> Q1.2
-	2K2.1 <-> D2.1 <-> D3.1 <-> Q2.2
-	2K2.2 <-> 2K2.2 <-> C6.2 <-> C7.2 <-> J1.Tip <-> J2.Tip <-> J3.Tip <-> LM324.10 <-> LM324.3 <-> LM324.5 <-> Q1.1 <-> Q2.1 <-> R5.2 <-> VR1.1 <-> VR2.1
-	C1.1 <-> J1.Sleeve
-	C1.2 <-> R1.1
-	C2.1 <-> J2.Sleeve
-	C2.2 <-> R2.1
-	C3.1 <-> LM324.7 <-> R1.2
+	2K2.1 <-> 2K2.2 <-> 2K2.2 <-> C4.1 <-> C5.1 <-> C6.2 <-> C7.2 <-> D2.1 <-> D3.1 <-> D3.2 <-> D4.1 <-> J1.Tip <-> J2.Tip <-> J3.Tip <-> LM324.1 <-> LM324.10 <-> LM324.12 <-> LM324.3 <-> LM324.5 <-> LM324.8 <-> Q1.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R3.2 <-> R3.2 <-> R5.2 <-> VR1.1 <-> VR2.1 <-> VR2.2
+	2K2.1 <-> C4.2 <-> C5.2 <-> C6.1 <-> C7.1 <-> D1.2 <-> D4.2 <-> J3.Sleeve <-> LM324.11 <-> LM324.4 <-> Q1.2 <-> Q1.3 <-> Q2.3 <-> R5.1 <-> VR1.3
+	C1.1 <-> C1.2 <-> J1.Sleeve <-> LM324.2 <-> LM324.9 <-> R1.1 <-> R1.1 <-> R1.2 <-> R3.1 <-> R3.1 <-> R4.1
+	C2.1 <-> C2.2 <-> J2.Sleeve <-> LM324.13 <-> LM324.6 <-> R1.1 <-> R2.1 <-> R2.2
+	C3.1 <-> LM324.14 <-> LM324.7 <-> R1.2
 	C3.2 <-> VR2.3
-	C4.1 <-> LM324.1 <-> R1.2
-	C4.2 <-> VR1.3
-	C5.1 <-> LM324.8 <-> R3.2
-	C5.2 <-> J3.Sleeve <-> R5.1
-	C6.1 <-> LM324.11 <-> Q2.3
-	C7.1 <-> LM324.4 <-> Q1.3
 	D1.1 <-> D2.2
-	D3.2 <-> D4.1
-	LM324.2 <-> R1.1 <-> R1.2
-	LM324.6 <-> R1.1 <-> R2.2
-	LM324.9 <-> R3.1 <-> R3.1 <-> R4.1
-	R3.2 <-> VR2.2
 	R4.2 <-> VR1.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt
index 31cc83bb..913a4578 100644
--- a/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/220_excl_switches.txt
@@ -4,7 +4,6 @@ Switch setup: [Default]
 	.2 <-> C1.2
 	.3 <-> C1.1 <-> C2.1
 	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1
-	C3.2 <-> C4.1
 	C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1
 	C4.1 <-> Q1.1 <-> Q2.2
 	C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2
diff --git a/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt
index c5d5e635..81375742 100644
--- a/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/220_incl_switches.txt
@@ -3,7 +3,6 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2]
 	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1
 	C1.1 <-> C2.1
 	C1.2 <-> C2.2
-	C3.2 <-> C4.1
 	C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1
 	C4.1 <-> Q1.1 <-> Q2.2
 	C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2
@@ -23,7 +22,6 @@ Switch setup: [.ON2:.ON1, .ON2:.ON2]
 
 	C1.1 <-> C1.2 <-> C2.1
 	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> Q1.Q1.0 <-> R1.1
-	C3.2 <-> C4.1
 	C3.2 <-> C4.1 <-> Q1.Q1.2 <-> Q2.Q2.0 <-> R2.1
 	C4.1 <-> Q1.1 <-> Q2.2
 	C4.2 <-> C5.2 <-> Q3.1 <-> R5.1 <-> R7.2
diff --git a/diylc-regression-data/input/cloud/netlist/222_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/222_excl_switches.txt
index 6176a4f2..705ac01e 100644
--- a/diylc-regression-data/input/cloud/netlist/222_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/222_excl_switches.txt
@@ -1,19 +1,6 @@
 Switch setup: [Default]
 
-	3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.2
-	3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> R2.1 <-> R2.2
-	3915.4 <-> 3915.4 <-> 3915.6 <-> 3915.6 <-> R2.1 <-> R2.2
-	3915.4 <-> 3915.6 <-> R2.1 <-> R2.2
-	3915.5 <-> 3915.5
-	3915.5 <-> 3915.5
-	3915.5 <-> 3915.5
-	3915.6 <-> 3915.6 <-> 3915.6 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2
-	3915.7 <-> R1.1
-	3915.7 <-> R1.1
-	3915.7 <-> R1.1
-	3915.7 <-> R1.2
-	3915.7 <-> R1.2
-	3915.7 <-> R1.2
-	R2.1 <-> R2.2
-	R2.1 <-> R2.2
+	3915.1 <-> 3915.1 <-> 3915.1 <-> 3915.10 <-> 3915.10 <-> 3915.10
+	3915.1 <-> 3915.1 <-> 3915.1 <-> 3915.10 <-> 3915.10 <-> 3915.10 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.16 <-> 3915.16 <-> 3915.16 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.7 <-> 3915.7 <-> 3915.7 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2
+	3915.16 <-> 3915.16 <-> 3915.16 <-> 3915.7 <-> 3915.7 <-> 3915.7 <-> R1.1 <-> R1.1 <-> R1.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/222_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/222_incl_switches.txt
index 6176a4f2..705ac01e 100644
--- a/diylc-regression-data/input/cloud/netlist/222_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/222_incl_switches.txt
@@ -1,19 +1,6 @@
 Switch setup: [Default]
 
-	3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.2
-	3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> R2.1 <-> R2.2
-	3915.4 <-> 3915.4 <-> 3915.6 <-> 3915.6 <-> R2.1 <-> R2.2
-	3915.4 <-> 3915.6 <-> R2.1 <-> R2.2
-	3915.5 <-> 3915.5
-	3915.5 <-> 3915.5
-	3915.5 <-> 3915.5
-	3915.6 <-> 3915.6 <-> 3915.6 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2
-	3915.7 <-> R1.1
-	3915.7 <-> R1.1
-	3915.7 <-> R1.1
-	3915.7 <-> R1.2
-	3915.7 <-> R1.2
-	3915.7 <-> R1.2
-	R2.1 <-> R2.2
-	R2.1 <-> R2.2
+	3915.1 <-> 3915.1 <-> 3915.1 <-> 3915.10 <-> 3915.10 <-> 3915.10
+	3915.1 <-> 3915.1 <-> 3915.1 <-> 3915.10 <-> 3915.10 <-> 3915.10 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.11 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.12 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.13 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.14 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.15 <-> 3915.16 <-> 3915.16 <-> 3915.16 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.17 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.18 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.2 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.3 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.4 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.5 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.6 <-> 3915.7 <-> 3915.7 <-> 3915.7 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.8 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> 3915.9 <-> R1.1 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R1.2 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.1 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2 <-> R2.2
+	3915.16 <-> 3915.16 <-> 3915.16 <-> 3915.7 <-> 3915.7 <-> 3915.7 <-> R1.1 <-> R1.1 <-> R1.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/223_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/223_excl_switches.txt
index aa4da3dd..61438e2b 100644
--- a/diylc-regression-data/input/cloud/netlist/223_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/223_excl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.3 <-> R1.1 <-> R1.1
-	C1.2 <-> IC1.4 <-> R1.2
-	IC1.2 <-> IC1.7
-	IC1.6 <-> R1.2
+	C1.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R1.1 <-> R1.2
+	C1.2 <-> IC1.4 <-> IC1.8 <-> R1.2
+	IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/cloud/netlist/223_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/223_incl_switches.txt
index aa4da3dd..61438e2b 100644
--- a/diylc-regression-data/input/cloud/netlist/223_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/223_incl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.3 <-> R1.1 <-> R1.1
-	C1.2 <-> IC1.4 <-> R1.2
-	IC1.2 <-> IC1.7
-	IC1.6 <-> R1.2
+	C1.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R1.1 <-> R1.2
+	C1.2 <-> IC1.4 <-> IC1.8 <-> R1.2
+	IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/cloud/netlist/224_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/224_excl_switches.txt
index 97fd35fd..0d993c3a 100644
--- a/diylc-regression-data/input/cloud/netlist/224_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/224_excl_switches.txt
@@ -1,9 +1,6 @@
 Switch setup: [Default]
 
-	.1 <-> .2 <-> .2 <-> IC1.2
-	.1 <-> IC1.1 <-> IC1.8
-	.1 <-> IC1.3
-	.1 <-> IC1.5 <-> VR1.1
-	.2 <-> IC1.7 <-> VR1.3
-	IC1.6 <-> VR1.2
+	.1 <-> .1 <-> IC1.1 <-> IC1.4 <-> IC1.5 <-> IC1.8 <-> VR1.1
+	.1 <-> .2 <-> .2 <-> IC1.2 <-> IC1.6 <-> VR1.2
+	.1 <-> .2 <-> IC1.3 <-> IC1.7 <-> VR1.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/224_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/224_incl_switches.txt
index 97fd35fd..0d993c3a 100644
--- a/diylc-regression-data/input/cloud/netlist/224_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/224_incl_switches.txt
@@ -1,9 +1,6 @@
 Switch setup: [Default]
 
-	.1 <-> .2 <-> .2 <-> IC1.2
-	.1 <-> IC1.1 <-> IC1.8
-	.1 <-> IC1.3
-	.1 <-> IC1.5 <-> VR1.1
-	.2 <-> IC1.7 <-> VR1.3
-	IC1.6 <-> VR1.2
+	.1 <-> .1 <-> IC1.1 <-> IC1.4 <-> IC1.5 <-> IC1.8 <-> VR1.1
+	.1 <-> .2 <-> .2 <-> IC1.2 <-> IC1.6 <-> VR1.2
+	.1 <-> .2 <-> IC1.3 <-> IC1.7 <-> VR1.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/225_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/225_excl_switches.txt
index aa4da3dd..61438e2b 100644
--- a/diylc-regression-data/input/cloud/netlist/225_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/225_excl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.3 <-> R1.1 <-> R1.1
-	C1.2 <-> IC1.4 <-> R1.2
-	IC1.2 <-> IC1.7
-	IC1.6 <-> R1.2
+	C1.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R1.1 <-> R1.2
+	C1.2 <-> IC1.4 <-> IC1.8 <-> R1.2
+	IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/cloud/netlist/225_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/225_incl_switches.txt
index aa4da3dd..61438e2b 100644
--- a/diylc-regression-data/input/cloud/netlist/225_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/225_incl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.3 <-> R1.1 <-> R1.1
-	C1.2 <-> IC1.4 <-> R1.2
-	IC1.2 <-> IC1.7
-	IC1.6 <-> R1.2
+	C1.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R1.1 <-> R1.2
+	C1.2 <-> IC1.4 <-> IC1.8 <-> R1.2
+	IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/cloud/netlist/226_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/226_excl_switches.txt
index 7c46af2f..45871a26 100644
--- a/diylc-regression-data/input/cloud/netlist/226_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/226_excl_switches.txt
@@ -1,17 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.1 <-> R1.1
-	C1.2 <-> C11.2 <-> C6.2 <-> C7.2 <-> IC1.4 <-> R4.2
-	C10.1 <-> IC1.14 <-> IC1.15
-	C11.1 <-> IC1.12 <-> R1.2
-	C2.1 <-> C3.1 <-> C5.1 <-> IC1.7 <-> R3.1
-	C2.2 <-> IC1.2
-	C3.2 <-> IC1.3
-	C4.1 <-> IC1.6
-	C6.1 <-> R2.2 <-> R3.2
-	C7.1 <-> IC1.9 <-> R4.1
-	C8.1 <-> IC1.10
-	C8.2 <-> C9.2
-	C9.1 <-> IC1.11
-	IC1.5 <-> R2.1
+	C1.1 <-> C6.1 <-> C7.1 <-> IC1.1 <-> IC1.9 <-> R1.1 <-> R2.2 <-> R3.2 <-> R4.1
+	C1.2 <-> C10.1 <-> C11.1 <-> C11.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.1 <-> C5.2 <-> C6.2 <-> C7.2 <-> IC1.12 <-> IC1.14 <-> IC1.15 <-> IC1.4 <-> IC1.6 <-> IC1.7 <-> R1.2 <-> R3.1 <-> R4.2
+	C2.2 <-> C8.1 <-> IC1.10 <-> IC1.2
+	C3.2 <-> C9.1 <-> IC1.11 <-> IC1.3
+	C4.2 <-> IC1.16 <-> IC1.8
+	C8.2 <-> C9.2 <-> IC1.13 <-> IC1.5 <-> R2.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/226_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/226_incl_switches.txt
index 7c46af2f..45871a26 100644
--- a/diylc-regression-data/input/cloud/netlist/226_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/226_incl_switches.txt
@@ -1,17 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.1 <-> R1.1
-	C1.2 <-> C11.2 <-> C6.2 <-> C7.2 <-> IC1.4 <-> R4.2
-	C10.1 <-> IC1.14 <-> IC1.15
-	C11.1 <-> IC1.12 <-> R1.2
-	C2.1 <-> C3.1 <-> C5.1 <-> IC1.7 <-> R3.1
-	C2.2 <-> IC1.2
-	C3.2 <-> IC1.3
-	C4.1 <-> IC1.6
-	C6.1 <-> R2.2 <-> R3.2
-	C7.1 <-> IC1.9 <-> R4.1
-	C8.1 <-> IC1.10
-	C8.2 <-> C9.2
-	C9.1 <-> IC1.11
-	IC1.5 <-> R2.1
+	C1.1 <-> C6.1 <-> C7.1 <-> IC1.1 <-> IC1.9 <-> R1.1 <-> R2.2 <-> R3.2 <-> R4.1
+	C1.2 <-> C10.1 <-> C11.1 <-> C11.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.1 <-> C5.2 <-> C6.2 <-> C7.2 <-> IC1.12 <-> IC1.14 <-> IC1.15 <-> IC1.4 <-> IC1.6 <-> IC1.7 <-> R1.2 <-> R3.1 <-> R4.2
+	C2.2 <-> C8.1 <-> IC1.10 <-> IC1.2
+	C3.2 <-> C9.1 <-> IC1.11 <-> IC1.3
+	C4.2 <-> IC1.16 <-> IC1.8
+	C8.2 <-> C9.2 <-> IC1.13 <-> IC1.5 <-> R2.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/230_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/230_excl_switches.txt
index ed9e2044..d34ef2bc 100644
--- a/diylc-regression-data/input/cloud/netlist/230_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/230_excl_switches.txt
@@ -1,5 +1,6 @@
 Switch setup: [Default]
 
-	C1.2 <-> TL071.7 <-> VR1.1 <-> VR1.2
-	TL071.2 <-> VR1.3
+	C1.1 <-> C1.2 <-> TL071.1 <-> TL071.3 <-> TL071.5 <-> TL071.7 <-> VR1.1 <-> VR1.2
+	TL071.2 <-> TL071.6 <-> VR1.3
+	TL071.4 <-> TL071.8
 
diff --git a/diylc-regression-data/input/cloud/netlist/230_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/230_incl_switches.txt
index ed9e2044..d34ef2bc 100644
--- a/diylc-regression-data/input/cloud/netlist/230_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/230_incl_switches.txt
@@ -1,5 +1,6 @@
 Switch setup: [Default]
 
-	C1.2 <-> TL071.7 <-> VR1.1 <-> VR1.2
-	TL071.2 <-> VR1.3
+	C1.1 <-> C1.2 <-> TL071.1 <-> TL071.3 <-> TL071.5 <-> TL071.7 <-> VR1.1 <-> VR1.2
+	TL071.2 <-> TL071.6 <-> VR1.3
+	TL071.4 <-> TL071.8
 
diff --git a/diylc-regression-data/input/cloud/netlist/231_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/231_excl_switches.txt
index 833e0296..e0c86c2b 100644
--- a/diylc-regression-data/input/cloud/netlist/231_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/231_excl_switches.txt
@@ -1,15 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> L1.2
-	C1.2 <-> R1.1
-	C2.1 <-> L2.2
-	C2.2 <-> R2.1
-	C3.1 <-> L3.2
-	C3.2 <-> R3.1
-	C4.1 <-> L4.2
-	C4.2 <-> R4.1
-	C5.1 <-> L5.2
-	C5.2 <-> R5.1
-	L1.1 <-> L2.1 <-> L3.1 <-> L4.1 <-> L5.1
-	R1.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R5.2
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> L1.1 <-> L1.2 <-> L2.1 <-> L2.2 <-> L3.1 <-> L3.2 <-> L4.1 <-> L4.2 <-> L5.1 <-> L5.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/231_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/231_incl_switches.txt
index 833e0296..e0c86c2b 100644
--- a/diylc-regression-data/input/cloud/netlist/231_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/231_incl_switches.txt
@@ -1,15 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> L1.2
-	C1.2 <-> R1.1
-	C2.1 <-> L2.2
-	C2.2 <-> R2.1
-	C3.1 <-> L3.2
-	C3.2 <-> R3.1
-	C4.1 <-> L4.2
-	C4.2 <-> R4.1
-	C5.1 <-> L5.2
-	C5.2 <-> R5.1
-	L1.1 <-> L2.1 <-> L3.1 <-> L4.1 <-> L5.1
-	R1.2 <-> R2.2 <-> R3.2 <-> R4.2 <-> R5.2
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> L1.1 <-> L1.2 <-> L2.1 <-> L2.2 <-> L3.1 <-> L3.2 <-> L4.1 <-> L4.2 <-> L5.1 <-> L5.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/232_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/232_excl_switches.txt
index bc884515..df329345 100644
--- a/diylc-regression-data/input/cloud/netlist/232_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/232_excl_switches.txt
@@ -1,11 +1,5 @@
 Switch setup: [Default]
 
+	10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8
 	10k.1 <-> 47n.1
-	10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4
-	10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.2 <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5
-	150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7
-	150n.2 <-> 220u.1 <-> 47n.2 <-> 47u.2 <-> IC1.1 <-> IC2.4 <-> IC3.1
-	2,2k.1 <-> IC3.6
-	47u.1 <-> 560.2 <-> IC1.2 <-> IC1.7
-	560.1 <-> IC1.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/232_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/232_incl_switches.txt
index bc884515..df329345 100644
--- a/diylc-regression-data/input/cloud/netlist/232_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/232_incl_switches.txt
@@ -1,11 +1,5 @@
 Switch setup: [Default]
 
+	10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8
 	10k.1 <-> 47n.1
-	10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4
-	10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.2 <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5
-	150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7
-	150n.2 <-> 220u.1 <-> 47n.2 <-> 47u.2 <-> IC1.1 <-> IC2.4 <-> IC3.1
-	2,2k.1 <-> IC3.6
-	47u.1 <-> 560.2 <-> IC1.2 <-> IC1.7
-	560.1 <-> IC1.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/233_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/233_excl_switches.txt
index bc884515..df329345 100644
--- a/diylc-regression-data/input/cloud/netlist/233_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/233_excl_switches.txt
@@ -1,11 +1,5 @@
 Switch setup: [Default]
 
+	10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8
 	10k.1 <-> 47n.1
-	10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4
-	10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.2 <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5
-	150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7
-	150n.2 <-> 220u.1 <-> 47n.2 <-> 47u.2 <-> IC1.1 <-> IC2.4 <-> IC3.1
-	2,2k.1 <-> IC3.6
-	47u.1 <-> 560.2 <-> IC1.2 <-> IC1.7
-	560.1 <-> IC1.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/233_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/233_incl_switches.txt
index bc884515..df329345 100644
--- a/diylc-regression-data/input/cloud/netlist/233_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/233_incl_switches.txt
@@ -1,11 +1,5 @@
 Switch setup: [Default]
 
+	10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8
 	10k.1 <-> 47n.1
-	10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4
-	10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.2 <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5
-	150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7
-	150n.2 <-> 220u.1 <-> 47n.2 <-> 47u.2 <-> IC1.1 <-> IC2.4 <-> IC3.1
-	2,2k.1 <-> IC3.6
-	47u.1 <-> 560.2 <-> IC1.2 <-> IC1.7
-	560.1 <-> IC1.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/234_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/234_excl_switches.txt
index bc884515..df329345 100644
--- a/diylc-regression-data/input/cloud/netlist/234_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/234_excl_switches.txt
@@ -1,11 +1,5 @@
 Switch setup: [Default]
 
+	10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8
 	10k.1 <-> 47n.1
-	10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4
-	10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.2 <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5
-	150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7
-	150n.2 <-> 220u.1 <-> 47n.2 <-> 47u.2 <-> IC1.1 <-> IC2.4 <-> IC3.1
-	2,2k.1 <-> IC3.6
-	47u.1 <-> 560.2 <-> IC1.2 <-> IC1.7
-	560.1 <-> IC1.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/234_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/234_incl_switches.txt
index bc884515..df329345 100644
--- a/diylc-regression-data/input/cloud/netlist/234_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/234_incl_switches.txt
@@ -1,11 +1,5 @@
 Switch setup: [Default]
 
+	10k.1 <-> 10k.2 <-> 150n.1 <-> 150n.2 <-> 1K.2 <-> 2,2k.1 <-> 2,2k.1 <-> 2,2k.2 <-> 220u.1 <-> 220u.2 <-> 47n.2 <-> 47u.1 <-> 47u.2 <-> 560.1 <-> 560.2 <-> 560.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8
 	10k.1 <-> 47n.1
-	10k.1 <-> IC1.4 <-> IC2.2 <-> IC2.7 <-> IC3.4
-	10k.2 <-> 1K.2 <-> 2,2k.2 <-> 220u.2 <-> 560.2 <-> IC1.5 <-> IC2.6 <-> IC3.5
-	150n.1 <-> 2,2k.1 <-> IC3.2 <-> IC3.7
-	150n.2 <-> 220u.1 <-> 47n.2 <-> 47u.2 <-> IC1.1 <-> IC2.4 <-> IC3.1
-	2,2k.1 <-> IC3.6
-	47u.1 <-> 560.2 <-> IC1.2 <-> IC1.7
-	560.1 <-> IC1.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/241_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/241_excl_switches.txt
index 71afbe17..0f4c6fd2 100644
--- a/diylc-regression-data/input/cloud/netlist/241_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/241_excl_switches.txt
@@ -1,19 +1,12 @@
 Switch setup: [Default]
 
-	1K.1 <-> 1K.1
-	1K.1 <-> 1K.1
-	1K.1 <-> BC327.2
-	1K.1 <-> BC327.2
-	1K.1 <-> BC337.2
-	1K.1 <-> BC337.2
-	1K.2 <-> 1K.2
-	1K.2 <-> 1K.2
-	1K.2 <-> 1K.2 <-> BC337.2 <-> BC337.2 <-> BC337.3 <-> BC337.3
-	1K.2 <-> BC327.2
-	1K.2 <-> BC327.2
-	BC327.1 <-> BC337.1
-	BC327.1 <-> BC337.1
-	BC327.1 <-> BC337.1
-	BC327.1 <-> BC337.1
+	1K.1 <-> 1K.1 <-> 1K.1 <-> 1K.1
+	1K.1 <-> 1K.1 <-> BC327.2 <-> BC327.2
+	1K.1 <-> 1K.1 <-> BC337.2 <-> BC337.2
+	1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2
+	1K.2 <-> 1K.2 <-> BC327.1 <-> BC327.1 <-> BC337.1 <-> BC337.1 <-> BC337.2 <-> BC337.2 <-> BC337.3 <-> BC337.3
+	1K.2 <-> 1K.2 <-> BC327.2 <-> BC327.2
+	BC327.1 <-> BC327.1 <-> BC337.1 <-> BC337.1
 	BC327.3 <-> BC327.3 <-> BC327.3 <-> BC327.3
+	BC337.3 <-> BC337.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/241_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/241_incl_switches.txt
index 71afbe17..0f4c6fd2 100644
--- a/diylc-regression-data/input/cloud/netlist/241_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/241_incl_switches.txt
@@ -1,19 +1,12 @@
 Switch setup: [Default]
 
-	1K.1 <-> 1K.1
-	1K.1 <-> 1K.1
-	1K.1 <-> BC327.2
-	1K.1 <-> BC327.2
-	1K.1 <-> BC337.2
-	1K.1 <-> BC337.2
-	1K.2 <-> 1K.2
-	1K.2 <-> 1K.2
-	1K.2 <-> 1K.2 <-> BC337.2 <-> BC337.2 <-> BC337.3 <-> BC337.3
-	1K.2 <-> BC327.2
-	1K.2 <-> BC327.2
-	BC327.1 <-> BC337.1
-	BC327.1 <-> BC337.1
-	BC327.1 <-> BC337.1
-	BC327.1 <-> BC337.1
+	1K.1 <-> 1K.1 <-> 1K.1 <-> 1K.1
+	1K.1 <-> 1K.1 <-> BC327.2 <-> BC327.2
+	1K.1 <-> 1K.1 <-> BC337.2 <-> BC337.2
+	1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2
+	1K.2 <-> 1K.2 <-> BC327.1 <-> BC327.1 <-> BC337.1 <-> BC337.1 <-> BC337.2 <-> BC337.2 <-> BC337.3 <-> BC337.3
+	1K.2 <-> 1K.2 <-> BC327.2 <-> BC327.2
+	BC327.1 <-> BC327.1 <-> BC337.1 <-> BC337.1
 	BC327.3 <-> BC327.3 <-> BC327.3 <-> BC327.3
+	BC337.3 <-> BC337.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/245_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/245_excl_switches.txt
index c7bf3981..c0d9dccb 100644
--- a/diylc-regression-data/input/cloud/netlist/245_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/245_excl_switches.txt
@@ -13,33 +13,19 @@ Switch setup: [Default]
 	C4.1 <-> Opamp.6 <-> R3.2
 	C4.2 <-> Level.1
 	DIP.1 <-> DIP.2 <-> Ge.2 <-> Rct.1
-	DIP.1 <-> Ge.2
 	DIP.10 <-> DIP.11 <-> Rct.2 <-> Sch.1
 	DIP.10 <-> DIP.9 <-> Ge.1 <-> Rct.2
-	DIP.10 <-> Rct.2
 	DIP.11 <-> DIP.12 <-> FET.2 <-> Sch.1
-	DIP.11 <-> Sch.1
 	DIP.12 <-> DIP.13 <-> FET.2 <-> Si.1
-	DIP.12 <-> FET.2
 	DIP.13 <-> DIP.14 <-> LED.2 <-> Si.1
-	DIP.13 <-> Si.1
 	DIP.14 <-> DIP.15 <-> LED.2 <-> Si.1
-	DIP.14 <-> LED.2
 	DIP.15 <-> DIP.16 <-> Si.1
-	DIP.15 <-> Si.1
 	DIP.2 <-> DIP.3 <-> Rct.1 <-> Sch.2
-	DIP.2 <-> Rct.1
 	DIP.3 <-> DIP.4 <-> FET.1 <-> Sch.2
-	DIP.3 <-> Sch.2
 	DIP.4 <-> DIP.5 <-> FET.1 <-> Si.2
-	DIP.4 <-> FET.1
 	DIP.5 <-> DIP.6 <-> LED.1 <-> Si.2
-	DIP.5 <-> Si.2
 	DIP.6 <-> DIP.7 <-> LED.1 <-> Si.2
-	DIP.6 <-> LED.1
 	DIP.7 <-> DIP.8 <-> Si.2
-	DIP.7 <-> Si.2
-	DIP.9 <-> Ge.1
 	Drive.2 <-> R2.1
 	Opamp.7 <-> R2.1 <-> R3.1
 	R2.2 <-> Treble.3
diff --git a/diylc-regression-data/input/cloud/netlist/245_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/245_incl_switches.txt
index 0d92c769..e1376e95 100644
--- a/diylc-regression-data/input/cloud/netlist/245_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/245_incl_switches.txt
@@ -13,33 +13,19 @@ Switch setup: [.ON1, .ON2]
 	C4.1 <-> Opamp.6 <-> R3.2
 	C4.2 <-> Level.1
 	DIP.1 <-> DIP.2 <-> Ge.2 <-> Rct.1
-	DIP.1 <-> Ge.2
 	DIP.10 <-> DIP.11 <-> Rct.2 <-> Sch.1
 	DIP.10 <-> DIP.9 <-> Ge.1 <-> Rct.2
-	DIP.10 <-> Rct.2
 	DIP.11 <-> DIP.12 <-> FET.2 <-> Sch.1
-	DIP.11 <-> Sch.1
 	DIP.12 <-> DIP.13 <-> FET.2 <-> Si.1
-	DIP.12 <-> FET.2
 	DIP.13 <-> DIP.14 <-> LED.2 <-> Si.1
-	DIP.13 <-> Si.1
 	DIP.14 <-> DIP.15 <-> LED.2 <-> Si.1
-	DIP.14 <-> LED.2
 	DIP.15 <-> DIP.16 <-> Si.1
-	DIP.15 <-> Si.1
 	DIP.2 <-> DIP.3 <-> Rct.1 <-> Sch.2
-	DIP.2 <-> Rct.1
 	DIP.3 <-> DIP.4 <-> FET.1 <-> Sch.2
-	DIP.3 <-> Sch.2
 	DIP.4 <-> DIP.5 <-> FET.1 <-> Si.2
-	DIP.4 <-> FET.1
 	DIP.5 <-> DIP.6 <-> LED.1 <-> Si.2
-	DIP.5 <-> Si.2
 	DIP.6 <-> DIP.7 <-> LED.1 <-> Si.2
-	DIP.6 <-> LED.1
 	DIP.7 <-> DIP.8 <-> Si.2
-	DIP.7 <-> Si.2
-	DIP.9 <-> Ge.1
 	Drive.2 <-> R2.1
 	Opamp.7 <-> R2.1 <-> R3.1
 	R2.2 <-> Treble.3
diff --git a/diylc-regression-data/input/cloud/netlist/251_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/251_excl_switches.txt
index 2b292573..b3c9cc35 100644
--- a/diylc-regression-data/input/cloud/netlist/251_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/251_excl_switches.txt
@@ -1,12 +1,17 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.2 <-> C4.2 <-> C4.2 <-> D1.2 <-> IC1.21 <-> IC1.8 <-> Q1.2 <-> R3.1
-	C1.2 <-> IC1.10
-	C2.1 <-> IC1.9
-	C3.1 <-> IC1.1 <-> R1.1
-	C4.1 <-> D2.2 <-> Q1.1
-	C4.1 <-> IC1.23 <-> IC1.7 <-> Q1.3 <-> R1.2 <-> R2.1
-	D1.1 <-> IC1.24
+	C1.1 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C4.2 <-> D1.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 <-> R3.1
+	C1.2 <-> D1.1 <-> IC1.10 <-> IC1.24
+	C3.1 <-> IC1.1 <-> IC1.15 <-> R1.1
+	C3.2 <-> IC1.18 <-> IC1.4
+	C4.1 <-> D2.1 <-> D2.2 <-> Q1.1
 	D1.1 <-> R2.2
-	D1.2 <-> R3.2
+	D1.2 <-> IC1.11 <-> IC1.25 <-> R3.2
+	IC1.12 <-> IC1.26
+	IC1.13 <-> IC1.27
+	IC1.14 <-> IC1.28
+	IC1.16 <-> IC1.2
+	IC1.17 <-> IC1.3
+	IC1.19 <-> IC1.5
+	IC1.20 <-> IC1.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/251_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/251_incl_switches.txt
index 2b292573..b3c9cc35 100644
--- a/diylc-regression-data/input/cloud/netlist/251_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/251_incl_switches.txt
@@ -1,12 +1,17 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.2 <-> C4.2 <-> C4.2 <-> D1.2 <-> IC1.21 <-> IC1.8 <-> Q1.2 <-> R3.1
-	C1.2 <-> IC1.10
-	C2.1 <-> IC1.9
-	C3.1 <-> IC1.1 <-> R1.1
-	C4.1 <-> D2.2 <-> Q1.1
-	C4.1 <-> IC1.23 <-> IC1.7 <-> Q1.3 <-> R1.2 <-> R2.1
-	D1.1 <-> IC1.24
+	C1.1 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C4.2 <-> D1.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 <-> R3.1
+	C1.2 <-> D1.1 <-> IC1.10 <-> IC1.24
+	C3.1 <-> IC1.1 <-> IC1.15 <-> R1.1
+	C3.2 <-> IC1.18 <-> IC1.4
+	C4.1 <-> D2.1 <-> D2.2 <-> Q1.1
 	D1.1 <-> R2.2
-	D1.2 <-> R3.2
+	D1.2 <-> IC1.11 <-> IC1.25 <-> R3.2
+	IC1.12 <-> IC1.26
+	IC1.13 <-> IC1.27
+	IC1.14 <-> IC1.28
+	IC1.16 <-> IC1.2
+	IC1.17 <-> IC1.3
+	IC1.19 <-> IC1.5
+	IC1.20 <-> IC1.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/252_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/252_excl_switches.txt
index 2223c4df..e74195df 100644
--- a/diylc-regression-data/input/cloud/netlist/252_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/252_excl_switches.txt
@@ -1,12 +1,17 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.2 <-> C4.2 <-> C5.2 <-> IC1.21 <-> IC1.8 <-> LED.2 <-> Q1.2 <-> R3.1
-	C1.2 <-> IC1.10
-	C2.1 <-> IC1.9
-	C3.1 <-> IC1.1 <-> R1.1
-	C4.1 <-> IC1.23 <-> IC1.7 <-> Q1.3 <-> R1.2 <-> R2.1
-	C5.1 <-> D2.2 <-> Q1.1
-	IC1.24 <-> LED.1
+	C1.1 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C5.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> LED.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 <-> R3.1
+	C1.2 <-> IC1.10 <-> IC1.24 <-> LED.1
+	C3.1 <-> IC1.1 <-> IC1.15 <-> R1.1
+	C3.2 <-> IC1.18 <-> IC1.4
+	C5.1 <-> D2.1 <-> D2.2 <-> Q1.1
+	IC1.11 <-> IC1.25 <-> LED.2 <-> R3.2
+	IC1.12 <-> IC1.26
+	IC1.13 <-> IC1.27
+	IC1.14 <-> IC1.28
+	IC1.16 <-> IC1.2
+	IC1.17 <-> IC1.3
+	IC1.19 <-> IC1.5
+	IC1.20 <-> IC1.6
 	LED.1 <-> R2.2
-	LED.2 <-> R3.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/252_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/252_incl_switches.txt
index 2223c4df..e74195df 100644
--- a/diylc-regression-data/input/cloud/netlist/252_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/252_incl_switches.txt
@@ -1,12 +1,17 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.2 <-> C4.2 <-> C5.2 <-> IC1.21 <-> IC1.8 <-> LED.2 <-> Q1.2 <-> R3.1
-	C1.2 <-> IC1.10
-	C2.1 <-> IC1.9
-	C3.1 <-> IC1.1 <-> R1.1
-	C4.1 <-> IC1.23 <-> IC1.7 <-> Q1.3 <-> R1.2 <-> R2.1
-	C5.1 <-> D2.2 <-> Q1.1
-	IC1.24 <-> LED.1
+	C1.1 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C5.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> LED.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1 <-> R3.1
+	C1.2 <-> IC1.10 <-> IC1.24 <-> LED.1
+	C3.1 <-> IC1.1 <-> IC1.15 <-> R1.1
+	C3.2 <-> IC1.18 <-> IC1.4
+	C5.1 <-> D2.1 <-> D2.2 <-> Q1.1
+	IC1.11 <-> IC1.25 <-> LED.2 <-> R3.2
+	IC1.12 <-> IC1.26
+	IC1.13 <-> IC1.27
+	IC1.14 <-> IC1.28
+	IC1.16 <-> IC1.2
+	IC1.17 <-> IC1.3
+	IC1.19 <-> IC1.5
+	IC1.20 <-> IC1.6
 	LED.1 <-> R2.2
-	LED.2 <-> R3.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/253_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/253_excl_switches.txt
index 275e1bb7..9e8ade73 100644
--- a/diylc-regression-data/input/cloud/netlist/253_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/253_excl_switches.txt
@@ -1,12 +1,17 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.1 <-> R1.1
-	C2.1 <-> C3.2 <-> C4.2 <-> C5.2 <-> IC1.21 <-> IC1.8 <-> IC2.2 <-> LED2.2 <-> R2.1
-	C2.2 <-> IC1.10
-	C3.1 <-> IC1.9
-	C4.1 <-> D1.2 <-> IC2.1
-	C5.1 <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1
-	IC1.24 <-> LED1.1
-	LED1.2 <-> R2.2
+	C1.1 <-> IC1.1 <-> IC1.15 <-> R1.1
+	C1.2 <-> IC1.18 <-> IC1.4
+	C2.1 <-> C3.1 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.2 <-> IC2.3 <-> LED2.2 <-> R1.2 <-> R2.1 <-> R3.1
+	C2.2 <-> IC1.10 <-> IC1.24 <-> LED1.1
+	C4.1 <-> D1.1 <-> D1.2 <-> IC2.1
+	IC1.11 <-> IC1.25 <-> LED1.2 <-> R2.2
+	IC1.12 <-> IC1.26
+	IC1.13 <-> IC1.27
+	IC1.14 <-> IC1.28
+	IC1.16 <-> IC1.2
+	IC1.17 <-> IC1.3
+	IC1.19 <-> IC1.5
+	IC1.20 <-> IC1.6
 	LED2.1 <-> R3.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/253_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/253_incl_switches.txt
index 275e1bb7..9e8ade73 100644
--- a/diylc-regression-data/input/cloud/netlist/253_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/253_incl_switches.txt
@@ -1,12 +1,17 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.1 <-> R1.1
-	C2.1 <-> C3.2 <-> C4.2 <-> C5.2 <-> IC1.21 <-> IC1.8 <-> IC2.2 <-> LED2.2 <-> R2.1
-	C2.2 <-> IC1.10
-	C3.1 <-> IC1.9
-	C4.1 <-> D1.2 <-> IC2.1
-	C5.1 <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1
-	IC1.24 <-> LED1.1
-	LED1.2 <-> R2.2
+	C1.1 <-> IC1.1 <-> IC1.15 <-> R1.1
+	C1.2 <-> IC1.18 <-> IC1.4
+	C2.1 <-> C3.1 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.2 <-> IC2.3 <-> LED2.2 <-> R1.2 <-> R2.1 <-> R3.1
+	C2.2 <-> IC1.10 <-> IC1.24 <-> LED1.1
+	C4.1 <-> D1.1 <-> D1.2 <-> IC2.1
+	IC1.11 <-> IC1.25 <-> LED1.2 <-> R2.2
+	IC1.12 <-> IC1.26
+	IC1.13 <-> IC1.27
+	IC1.14 <-> IC1.28
+	IC1.16 <-> IC1.2
+	IC1.17 <-> IC1.3
+	IC1.19 <-> IC1.5
+	IC1.20 <-> IC1.6
 	LED2.1 <-> R3.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/254_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/254_excl_switches.txt
index f8771edc..b6e78e34 100644
--- a/diylc-regression-data/input/cloud/netlist/254_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/254_excl_switches.txt
@@ -1,12 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.1 <-> R1.1
-	C2.1 <-> C3.2 <-> C4.2 <-> C5.2 <-> IC1.11 <-> IC1.21 <-> IC1.27 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.2 <-> LED2.2 <-> R2.1
-	C2.2 <-> IC1.10
-	C3.1 <-> IC1.9
-	C4.1 <-> D1.2 <-> IC2.1
-	C5.1 <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1
-	IC1.24 <-> LED1.1
-	LED1.2 <-> R2.2
-	LED2.1 <-> R3.2
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> LED1.1 <-> LED1.2 <-> LED2.1 <-> LED2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/254_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/254_incl_switches.txt
index f8771edc..b6e78e34 100644
--- a/diylc-regression-data/input/cloud/netlist/254_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/254_incl_switches.txt
@@ -1,12 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.1 <-> R1.1
-	C2.1 <-> C3.2 <-> C4.2 <-> C5.2 <-> IC1.11 <-> IC1.21 <-> IC1.27 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.2 <-> LED2.2 <-> R2.1
-	C2.2 <-> IC1.10
-	C3.1 <-> IC1.9
-	C4.1 <-> D1.2 <-> IC2.1
-	C5.1 <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1
-	IC1.24 <-> LED1.1
-	LED1.2 <-> R2.2
-	LED2.1 <-> R3.2
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> LED1.1 <-> LED1.2 <-> LED2.1 <-> LED2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/255_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/255_excl_switches.txt
index 41baba71..c73e04e2 100644
--- a/diylc-regression-data/input/cloud/netlist/255_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/255_excl_switches.txt
@@ -1,13 +1,11 @@
 Switch setup: [Default]
 
 	.1 <-> 2.2K.1 <-> 2.2K.1 <-> 2.2K.2 <-> 22K.2 <-> 50uF.1 <-> 50uF.2 <-> 50uF.2 <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.4 <-> MID.3 <-> R2.2 <-> R3.1 <-> V1.2 <-> V1.8 <-> VOLUME.3
-	.1 <-> J1.1
 	.2 <-> J1.2 <-> R2.1
 	2.2K.2 <-> 50uF.1 <-> V1.3
 	2.2nf.1 <-> 2.2nf.2 <-> BASS.2 <-> R1.1
 	2.2nf.1 <-> BASS.1
 	2.2nf.2 <-> 22K.1 <-> BASS.3
-	50uF.2 <-> 50uF.2
 	C1.2 <-> TREBLE.3
 	C2.1 <-> V1.7 <-> VOLUME.2
 	C2.2 <-> R1.2 <-> TREBLE.2 <-> VOLUME.1
diff --git a/diylc-regression-data/input/cloud/netlist/255_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/255_incl_switches.txt
index 41baba71..c73e04e2 100644
--- a/diylc-regression-data/input/cloud/netlist/255_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/255_incl_switches.txt
@@ -1,13 +1,11 @@
 Switch setup: [Default]
 
 	.1 <-> 2.2K.1 <-> 2.2K.1 <-> 2.2K.2 <-> 22K.2 <-> 50uF.1 <-> 50uF.2 <-> 50uF.2 <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.4 <-> MID.3 <-> R2.2 <-> R3.1 <-> V1.2 <-> V1.8 <-> VOLUME.3
-	.1 <-> J1.1
 	.2 <-> J1.2 <-> R2.1
 	2.2K.2 <-> 50uF.1 <-> V1.3
 	2.2nf.1 <-> 2.2nf.2 <-> BASS.2 <-> R1.1
 	2.2nf.1 <-> BASS.1
 	2.2nf.2 <-> 22K.1 <-> BASS.3
-	50uF.2 <-> 50uF.2
 	C1.2 <-> TREBLE.3
 	C2.1 <-> V1.7 <-> VOLUME.2
 	C2.2 <-> R1.2 <-> TREBLE.2 <-> VOLUME.1
diff --git a/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt
index dff08485..88feb7f4 100644
--- a/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/256_excl_switches.txt
@@ -3,11 +3,10 @@ Switch setup: [Default]
 	    2MH.1 <-> BOOST.2
 	    2MH.2 <-> 470nF.1
 	.1 <-> 10nf.2 <-> 22K.2 <-> 470nF.2 <-> 50uF.2 <-> BOOST.3 <-> GAIN.3 <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.3 <-> J2.3 <-> J2.4 <-> J2.4 <-> J2.4 <-> R2.2 <-> R3.1 <-> V1.2
-	.1 <-> J1.1
 	.2 <-> J1.2 <-> R2.1
 	1,5nf.1 <-> TREBLE.3
 	1,5nf.2 <-> 100K.2 <-> 68nf.1
-	100K 2Watt.1 <-> 100K 2watt.1 <-> 32uF.1 <-> 32uF.2
+	100K 2watt.1 <-> 100K 2Watt.1 <-> 32uF.1 <-> 32uF.2
 	100K 2Watt.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 32uF.1 <-> 33K.2
 	100K 2watt.2 <-> 32uF.2
 	100K.1 <-> 100K.1 <-> 1nF.1 <-> 33K.1 <-> 33K.1
@@ -15,7 +14,6 @@ Switch setup: [Default]
 	100K.1 <-> 1K5.1 <-> 220K.1
 	100K.1 <-> 2.2nf.1 <-> 2.2nf.2 <-> BASS.2
 	100K.1 <-> 2.2nf.1 <-> BASS.1
-	100K.1 <-> J2.1
 	100K.1 <-> J2.1 <-> J2.2
 	100K.1 <-> J2.1 <-> J2.2
 	100K.2 <-> 100K.2 <-> 220K.2 <-> V2.2
@@ -27,8 +25,6 @@ Switch setup: [Default]
 	15K.1 <-> 1K5.2 <-> BOOST.1 <-> V2.3
 	15K.2 <-> 1Ohm.2 <-> J18.1 <-> J18.1 <-> J18.2 <-> J18.2 <-> J18.3 <-> J18.3 <-> J18.4 <-> J18.4
 	1K.1 <-> 220K.1 <-> 220K.2 <-> 22uF  63v.2 <-> TREBLE.3
-	1K.2 <-> 1K.2
-	1K.2 <-> 1K.2
 	1K.2 <-> 22uf  63v.2 <-> D2.1 <-> D3.1
 	1K5.1 <-> V2.8
 	1M.1 <-> 68nF.1 <-> V2.7
@@ -37,7 +33,6 @@ Switch setup: [Default]
 	2,2nf.1 <-> 4,7nf.1
 	2.2nf.2 <-> 22K.1 <-> BASS.3
 	220K.1 <-> 220K.1 <-> 33K.2
-	220K.1 <-> 220K.2
 	220K.2 <-> 68nf.2
 	220K.2 <-> 68nf.2
 	22uf  63v.1 <-> 22uF  63v.1 <-> D1.1 <-> D1.2 <-> D2.2 <-> D3.2 <-> GND <-> TREBLE.1 <-> TREBLE.2
diff --git a/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt
index dff08485..88feb7f4 100644
--- a/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/256_incl_switches.txt
@@ -3,11 +3,10 @@ Switch setup: [Default]
 	    2MH.1 <-> BOOST.2
 	    2MH.2 <-> 470nF.1
 	.1 <-> 10nf.2 <-> 22K.2 <-> 470nF.2 <-> 50uF.2 <-> BOOST.3 <-> GAIN.3 <-> J1.1 <-> J1.3 <-> J1.4 <-> J2.1 <-> J2.3 <-> J2.3 <-> J2.3 <-> J2.4 <-> J2.4 <-> J2.4 <-> R2.2 <-> R3.1 <-> V1.2
-	.1 <-> J1.1
 	.2 <-> J1.2 <-> R2.1
 	1,5nf.1 <-> TREBLE.3
 	1,5nf.2 <-> 100K.2 <-> 68nf.1
-	100K 2Watt.1 <-> 100K 2watt.1 <-> 32uF.1 <-> 32uF.2
+	100K 2watt.1 <-> 100K 2Watt.1 <-> 32uF.1 <-> 32uF.2
 	100K 2Watt.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 1K.2 <-> 32uF.1 <-> 33K.2
 	100K 2watt.2 <-> 32uF.2
 	100K.1 <-> 100K.1 <-> 1nF.1 <-> 33K.1 <-> 33K.1
@@ -15,7 +14,6 @@ Switch setup: [Default]
 	100K.1 <-> 1K5.1 <-> 220K.1
 	100K.1 <-> 2.2nf.1 <-> 2.2nf.2 <-> BASS.2
 	100K.1 <-> 2.2nf.1 <-> BASS.1
-	100K.1 <-> J2.1
 	100K.1 <-> J2.1 <-> J2.2
 	100K.1 <-> J2.1 <-> J2.2
 	100K.2 <-> 100K.2 <-> 220K.2 <-> V2.2
@@ -27,8 +25,6 @@ Switch setup: [Default]
 	15K.1 <-> 1K5.2 <-> BOOST.1 <-> V2.3
 	15K.2 <-> 1Ohm.2 <-> J18.1 <-> J18.1 <-> J18.2 <-> J18.2 <-> J18.3 <-> J18.3 <-> J18.4 <-> J18.4
 	1K.1 <-> 220K.1 <-> 220K.2 <-> 22uF  63v.2 <-> TREBLE.3
-	1K.2 <-> 1K.2
-	1K.2 <-> 1K.2
 	1K.2 <-> 22uf  63v.2 <-> D2.1 <-> D3.1
 	1K5.1 <-> V2.8
 	1M.1 <-> 68nF.1 <-> V2.7
@@ -37,7 +33,6 @@ Switch setup: [Default]
 	2,2nf.1 <-> 4,7nf.1
 	2.2nf.2 <-> 22K.1 <-> BASS.3
 	220K.1 <-> 220K.1 <-> 33K.2
-	220K.1 <-> 220K.2
 	220K.2 <-> 68nf.2
 	220K.2 <-> 68nf.2
 	22uf  63v.1 <-> 22uF  63v.1 <-> D1.1 <-> D1.2 <-> D2.2 <-> D3.2 <-> GND <-> TREBLE.1 <-> TREBLE.2
diff --git a/diylc-regression-data/input/cloud/netlist/257_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/257_excl_switches.txt
index ccb5f782..6cbe2981 100644
--- a/diylc-regression-data/input/cloud/netlist/257_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/257_excl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
 	.1 <-> .9 <-> J1.Tip
-	.2 <-> C3.2 <-> R3.1
+	.2 <-> C2.1 <-> C3.1 <-> C3.2 <-> Gain.2 <-> Q1.2 <-> R1.2 <-> R3.1
 	.3 <-> .6
 	.4 <-> D3.1
 	.5 <-> J1.Sleeve
@@ -9,8 +9,6 @@ Switch setup: [Default]
 	.8 <-> J2.Tip
 	C1.1 <-> R4.2 <-> R5.1
 	C1.2 <-> C2.2 <-> D1.2 <-> D2.1 <-> Gain.3 <-> J2.Sleeve <-> J3.1 <-> R2.2 <-> R3.2 <-> vol.3
-	C2.1 <-> Gain.2
-	C3.1 <-> Q1.2 <-> R1.2
 	C4.1 <-> Q1.3 <-> R1.1 <-> R4.1
 	C4.2 <-> D1.1 <-> D2.2 <-> vol.1
 	D3.2 <-> R5.2
diff --git a/diylc-regression-data/input/cloud/netlist/257_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/257_incl_switches.txt
index a7b0f17a..83ac7376 100644
--- a/diylc-regression-data/input/cloud/netlist/257_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/257_incl_switches.txt
@@ -2,9 +2,7 @@ Switch setup: [.ON1]
 
 	C1.1 <-> R4.2 <-> R5.1
 	C1.2 <-> C2.2 <-> D1.2 <-> D2.1 <-> Gain.3 <-> J2.Sleeve <-> J3.1 <-> R2.2 <-> R3.2 <-> vol.3
-	C2.1 <-> Gain.2
-	C3.1 <-> Q1.2 <-> R1.2
-	C3.2 <-> J1.Tip <-> R3.1
+	C2.1 <-> C3.1 <-> C3.2 <-> Gain.2 <-> J1.Tip <-> Q1.2 <-> R1.2 <-> R3.1
 	C4.1 <-> Q1.3 <-> R1.1 <-> R4.1
 	C4.2 <-> D1.1 <-> D2.2 <-> vol.1
 	D3.1 <-> J1.Sleeve
@@ -16,9 +14,7 @@ Switch setup: [.ON2]
 
 	C1.1 <-> R4.2 <-> R5.1
 	C1.2 <-> C2.2 <-> D1.2 <-> D2.1 <-> Gain.3 <-> J2.Sleeve <-> J3.1 <-> R2.2 <-> R3.2 <-> vol.3
-	C2.1 <-> Gain.2
-	C3.1 <-> Q1.2 <-> R1.2
-	C3.2 <-> J1.Sleeve <-> R3.1
+	C2.1 <-> C3.1 <-> C3.2 <-> Gain.2 <-> J1.Sleeve <-> Q1.2 <-> R1.2 <-> R3.1
 	C4.1 <-> Q1.3 <-> R1.1 <-> R4.1
 	C4.2 <-> D1.1 <-> D2.2 <-> vol.1
 	D3.2 <-> R5.2
diff --git a/diylc-regression-data/input/cloud/netlist/260_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/260_excl_switches.txt
index f8771edc..e8d22471 100644
--- a/diylc-regression-data/input/cloud/netlist/260_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/260_excl_switches.txt
@@ -1,12 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.1 <-> R1.1
-	C2.1 <-> C3.2 <-> C4.2 <-> C5.2 <-> IC1.11 <-> IC1.21 <-> IC1.27 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.2 <-> LED2.2 <-> R2.1
-	C2.2 <-> IC1.10
-	C3.1 <-> IC1.9
-	C4.1 <-> D1.2 <-> IC2.1
-	C5.1 <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1
-	IC1.24 <-> LED1.1
-	LED1.2 <-> R2.2
-	LED2.1 <-> R3.2
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> LED1.1 <-> LED1.2 <-> LED2.1 <-> LED2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2
+	R4.1 <-> R4.2
+	R5.1 <-> R5.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/260_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/260_incl_switches.txt
index f8771edc..e8d22471 100644
--- a/diylc-regression-data/input/cloud/netlist/260_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/260_incl_switches.txt
@@ -1,12 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.1 <-> R1.1
-	C2.1 <-> C3.2 <-> C4.2 <-> C5.2 <-> IC1.11 <-> IC1.21 <-> IC1.27 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.2 <-> LED2.2 <-> R2.1
-	C2.2 <-> IC1.10
-	C3.1 <-> IC1.9
-	C4.1 <-> D1.2 <-> IC2.1
-	C5.1 <-> IC1.23 <-> IC1.7 <-> IC2.3 <-> R1.2 <-> R3.1
-	IC1.24 <-> LED1.1
-	LED1.2 <-> R2.2
-	LED2.1 <-> R3.2
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.2 <-> IC2.3 <-> LED1.1 <-> LED1.2 <-> LED2.1 <-> LED2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2
+	R4.1 <-> R4.2
+	R5.1 <-> R5.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/263_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/263_excl_switches.txt
index 8f8dd80b..6c95e4f7 100644
--- a/diylc-regression-data/input/cloud/netlist/263_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/263_excl_switches.txt
@@ -1,8 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> Q1.2 <-> R3.2
+	C1.1 <-> C1.2 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R3.2 <-> Sensitivity.1 <-> Sensitivity.2 <-> Sensitivity.3
 	C2.1 <-> Q1.3 <-> R2.1 <-> R3.1
-	C2.2 <-> Q1.1 <-> Sensitivity.1 <-> Sensitivity.3
 	R1.2 <-> R2.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/263_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/263_incl_switches.txt
index 8f8dd80b..6c95e4f7 100644
--- a/diylc-regression-data/input/cloud/netlist/263_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/263_incl_switches.txt
@@ -1,8 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> Q1.2 <-> R3.2
+	C1.1 <-> C1.2 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R3.2 <-> Sensitivity.1 <-> Sensitivity.2 <-> Sensitivity.3
 	C2.1 <-> Q1.3 <-> R2.1 <-> R3.1
-	C2.2 <-> Q1.1 <-> Sensitivity.1 <-> Sensitivity.3
 	R1.2 <-> R2.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/264_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/264_excl_switches.txt
index 8ee4dd46..b9299236 100644
--- a/diylc-regression-data/input/cloud/netlist/264_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/264_excl_switches.txt
@@ -1,10 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C2.2 <-> R2.1
-	C2.1 <-> R6.1
-	C3.1 <-> IC1.2 <-> R2.2
-	IC1.3 <-> IC1.4
-	IC1.7 <-> R4.2 <-> R6.2
-	R1.2 <-> R3.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R2.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R6.1 <-> R6.2
+	C3.1 <-> IC1.2 <-> IC1.6 <-> R2.2
+	IC1.1 <-> IC1.5 <-> R1.2 <-> R3.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/264_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/264_incl_switches.txt
index 8ee4dd46..b9299236 100644
--- a/diylc-regression-data/input/cloud/netlist/264_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/264_incl_switches.txt
@@ -1,10 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C2.2 <-> R2.1
-	C2.1 <-> R6.1
-	C3.1 <-> IC1.2 <-> R2.2
-	IC1.3 <-> IC1.4
-	IC1.7 <-> R4.2 <-> R6.2
-	R1.2 <-> R3.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R2.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R6.1 <-> R6.2
+	C3.1 <-> IC1.2 <-> IC1.6 <-> R2.2
+	IC1.1 <-> IC1.5 <-> R1.2 <-> R3.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/265_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/265_excl_switches.txt
index 0d1b07f9..6dd70273 100644
--- a/diylc-regression-data/input/cloud/netlist/265_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/265_excl_switches.txt
@@ -6,13 +6,11 @@ Switch setup: [Default]
 	               56K.2 <->               100K.2 <-> 270pF.2
 	              100K.1 <->               100K.1 <->              1.5M.1 <->              270K.1 <->          33K 1W.2 <-> 12pF.1 <-> 20uF 525v.1
 	              100K.2 <-> 100nF.2
-	              1K5.1 <->               1K5.1
 	              1K5.1 <->               1K5.1 <-> 250uF.2
 	              1K5.2 <-> 250uF.1 <-> V1.8
 	              1K5.2 <-> V1.3
 	              68K.1 <->         1M.1 <-> J2.Ring <-> J2.Sleeve <-> J2.Tip
 	              68K.1 <-> J2.Tip
-	              68K.2 <->               68K.2
 	              68K.2 <->               68K.2 <-> V1.7
 	             1.5M.2 <-> 1uF.1 <-> V1.7
 	             1K.1 <->              680R.2 <-> 12pF.1
@@ -29,9 +27,7 @@ Switch setup: [Default]
 	          47K.2 <-> 250nF.2
 	          680R.2 <-> 1uF.2
 	         15K 2W.1 <-> 20uF 525v.1
-	        1M.1 <-> J2.Tip
 	        1M.2 <-> J2.Ring <-> J2.Sleeve
-	        1M.2 <-> J2.Sleeve
 	   47K.1 <-> 250nF.2 <-> V1.3
 	100nF.1 <-> 470pf.1 <-> Volume.1
 	20uF 525v.2 <-> 20uF 525v.2 <-> 20uF 525v.2 <-> 30uF 525v.2 <-> V1.8
diff --git a/diylc-regression-data/input/cloud/netlist/265_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/265_incl_switches.txt
index 0d1b07f9..6dd70273 100644
--- a/diylc-regression-data/input/cloud/netlist/265_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/265_incl_switches.txt
@@ -6,13 +6,11 @@ Switch setup: [Default]
 	               56K.2 <->               100K.2 <-> 270pF.2
 	              100K.1 <->               100K.1 <->              1.5M.1 <->              270K.1 <->          33K 1W.2 <-> 12pF.1 <-> 20uF 525v.1
 	              100K.2 <-> 100nF.2
-	              1K5.1 <->               1K5.1
 	              1K5.1 <->               1K5.1 <-> 250uF.2
 	              1K5.2 <-> 250uF.1 <-> V1.8
 	              1K5.2 <-> V1.3
 	              68K.1 <->         1M.1 <-> J2.Ring <-> J2.Sleeve <-> J2.Tip
 	              68K.1 <-> J2.Tip
-	              68K.2 <->               68K.2
 	              68K.2 <->               68K.2 <-> V1.7
 	             1.5M.2 <-> 1uF.1 <-> V1.7
 	             1K.1 <->              680R.2 <-> 12pF.1
@@ -29,9 +27,7 @@ Switch setup: [Default]
 	          47K.2 <-> 250nF.2
 	          680R.2 <-> 1uF.2
 	         15K 2W.1 <-> 20uF 525v.1
-	        1M.1 <-> J2.Tip
 	        1M.2 <-> J2.Ring <-> J2.Sleeve
-	        1M.2 <-> J2.Sleeve
 	   47K.1 <-> 250nF.2 <-> V1.3
 	100nF.1 <-> 470pf.1 <-> Volume.1
 	20uF 525v.2 <-> 20uF 525v.2 <-> 20uF 525v.2 <-> 30uF 525v.2 <-> V1.8
diff --git a/diylc-regression-data/input/cloud/netlist/266_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/266_excl_switches.txt
index 9c788597..a04b5e1f 100644
--- a/diylc-regression-data/input/cloud/netlist/266_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/266_excl_switches.txt
@@ -2,7 +2,7 @@ Switch setup: [Default]
 
 	100K.1 <-> 4.7uF.1 <-> Pitch.1 <-> Q1.1
 	100K.1 <-> 4.7uF.1 <-> Pitch.1 <-> Q1.1 <-> Q1.2
-	100K.2 <-> 1K.1 <-> D1.2 <-> Pitch.2 <-> Pitch.3
+	100K.2 <-> 1K.1 <-> 1K.2 <-> D1.2 <-> Pitch.2 <-> Pitch.3
 	100K.2 <-> 1K.1 <-> Pitch.2 <-> Pitch.3
 	4.7uF.2 <-> D1.1
 	4.7uF.2 <-> D1.1 <-> Q1.3
diff --git a/diylc-regression-data/input/cloud/netlist/266_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/266_incl_switches.txt
index 9c788597..a04b5e1f 100644
--- a/diylc-regression-data/input/cloud/netlist/266_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/266_incl_switches.txt
@@ -2,7 +2,7 @@ Switch setup: [Default]
 
 	100K.1 <-> 4.7uF.1 <-> Pitch.1 <-> Q1.1
 	100K.1 <-> 4.7uF.1 <-> Pitch.1 <-> Q1.1 <-> Q1.2
-	100K.2 <-> 1K.1 <-> D1.2 <-> Pitch.2 <-> Pitch.3
+	100K.2 <-> 1K.1 <-> 1K.2 <-> D1.2 <-> Pitch.2 <-> Pitch.3
 	100K.2 <-> 1K.1 <-> Pitch.2 <-> Pitch.3
 	4.7uF.2 <-> D1.1
 	4.7uF.2 <-> D1.1 <-> Q1.3
diff --git a/diylc-regression-data/input/cloud/netlist/267_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/267_excl_switches.txt
index 4b2df31c..65a82ba7 100644
--- a/diylc-regression-data/input/cloud/netlist/267_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/267_excl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> C3.1 <-> IC1.5 <-> Q2.3
-	C1.2 <-> C2.2
 	C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q2.2 <-> R12.1 <-> R6.2 <-> R9.2
 	C2.1 <-> C4.1 <-> Q2.1 <-> R1.1
-	C3.2 <-> C4.2
 	C5.1 <-> IC1.2 <-> R2.1
 	C5.2 <-> IC1.1 <-> R3.2
 	Q1.1 <-> R3.1
diff --git a/diylc-regression-data/input/cloud/netlist/267_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/267_incl_switches.txt
index 4b2df31c..65a82ba7 100644
--- a/diylc-regression-data/input/cloud/netlist/267_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/267_incl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> C3.1 <-> IC1.5 <-> Q2.3
-	C1.2 <-> C2.2
 	C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q2.2 <-> R12.1 <-> R6.2 <-> R9.2
 	C2.1 <-> C4.1 <-> Q2.1 <-> R1.1
-	C3.2 <-> C4.2
 	C5.1 <-> IC1.2 <-> R2.1
 	C5.2 <-> IC1.1 <-> R3.2
 	Q1.1 <-> R3.1
diff --git a/diylc-regression-data/input/cloud/netlist/277_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/277_excl_switches.txt
index e7d974e2..bafd4734 100644
--- a/diylc-regression-data/input/cloud/netlist/277_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/277_excl_switches.txt
@@ -7,14 +7,10 @@ Switch setup: [Default]
 	C2.1 <-> VR8.1
 	C2.2 <-> Normal Volume.1
 	C6.1 <-> C7.1 <-> R2.1
-	J1.1 <-> R1.1
-	J1.1 <-> R1.1
 	J1.3 <-> R1.1
 	J1.3 <-> R1.1
 	J1.3 <-> R1.1 <-> R1.2
 	J1.3 <-> R1.1 <-> R1.2
-	J1.4 <-> R1.2 <-> R1.2
-	J1.4 <-> R1.2 <-> R1.2
 	Normal Volume.2 <-> R2.1
 	R2.1 <-> R2.1
 	R2.2 <-> VR7.1
diff --git a/diylc-regression-data/input/cloud/netlist/277_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/277_incl_switches.txt
index e7d974e2..bafd4734 100644
--- a/diylc-regression-data/input/cloud/netlist/277_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/277_incl_switches.txt
@@ -7,14 +7,10 @@ Switch setup: [Default]
 	C2.1 <-> VR8.1
 	C2.2 <-> Normal Volume.1
 	C6.1 <-> C7.1 <-> R2.1
-	J1.1 <-> R1.1
-	J1.1 <-> R1.1
 	J1.3 <-> R1.1
 	J1.3 <-> R1.1
 	J1.3 <-> R1.1 <-> R1.2
 	J1.3 <-> R1.1 <-> R1.2
-	J1.4 <-> R1.2 <-> R1.2
-	J1.4 <-> R1.2 <-> R1.2
 	Normal Volume.2 <-> R2.1
 	R2.1 <-> R2.1
 	R2.2 <-> VR7.1
diff --git a/diylc-regression-data/input/cloud/netlist/278_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/278_excl_switches.txt
index e7d974e2..bafd4734 100644
--- a/diylc-regression-data/input/cloud/netlist/278_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/278_excl_switches.txt
@@ -7,14 +7,10 @@ Switch setup: [Default]
 	C2.1 <-> VR8.1
 	C2.2 <-> Normal Volume.1
 	C6.1 <-> C7.1 <-> R2.1
-	J1.1 <-> R1.1
-	J1.1 <-> R1.1
 	J1.3 <-> R1.1
 	J1.3 <-> R1.1
 	J1.3 <-> R1.1 <-> R1.2
 	J1.3 <-> R1.1 <-> R1.2
-	J1.4 <-> R1.2 <-> R1.2
-	J1.4 <-> R1.2 <-> R1.2
 	Normal Volume.2 <-> R2.1
 	R2.1 <-> R2.1
 	R2.2 <-> VR7.1
diff --git a/diylc-regression-data/input/cloud/netlist/278_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/278_incl_switches.txt
index e7d974e2..bafd4734 100644
--- a/diylc-regression-data/input/cloud/netlist/278_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/278_incl_switches.txt
@@ -7,14 +7,10 @@ Switch setup: [Default]
 	C2.1 <-> VR8.1
 	C2.2 <-> Normal Volume.1
 	C6.1 <-> C7.1 <-> R2.1
-	J1.1 <-> R1.1
-	J1.1 <-> R1.1
 	J1.3 <-> R1.1
 	J1.3 <-> R1.1
 	J1.3 <-> R1.1 <-> R1.2
 	J1.3 <-> R1.1 <-> R1.2
-	J1.4 <-> R1.2 <-> R1.2
-	J1.4 <-> R1.2 <-> R1.2
 	Normal Volume.2 <-> R2.1
 	R2.1 <-> R2.1
 	R2.2 <-> VR7.1
diff --git a/diylc-regression-data/input/cloud/netlist/279_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/279_excl_switches.txt
index 8594714d..9e0a7f69 100644
--- a/diylc-regression-data/input/cloud/netlist/279_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/279_excl_switches.txt
@@ -3,16 +3,11 @@ Switch setup: [Default]
 	C1.1 <-> R7.2 <-> V1.3 <-> V1.8
 	C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C7.2 <-> J1.5 <-> J1.6 <-> J2.1 <-> J2.5 <-> J2.6 <-> J3.1 <-> J3.5 <-> J3.6 <-> J4.5 <-> J4.6 <-> R13.2 <-> R20.2 <-> R3.2 <-> R4.1 <-> R7.1 <-> VR1.1 <-> VR1.3 <-> VR2.1 <-> VR2.3 <-> VR3.1 <-> VR3.3
 	C10.2 <-> C9.1 <-> R15.2
-	C2.1 <-> R10.1
 	C2.1 <-> R10.1 <-> R8.1 <-> R9.1
 	C3.1 <-> C5.1 <-> R8.2
-	C3.2 <-> VR2.1
 	C4.1 <-> R9.2 <-> V1.1
-	C4.2 <-> VR1.3
-	C5.2 <-> R11.1 <-> R12.1
 	C5.2 <-> R11.1 <-> R12.1 <-> R13.1
 	C6.1 <-> V2.2 <-> VR3.2
-	C6.1 <-> VR3.2
 	C7.1 <-> R20.1 <-> V2.3
 	C8.1 <-> R16.2
 	C8.2 <-> R14.2
@@ -25,7 +20,5 @@ Switch setup: [Default]
 	J4.2 <-> R6.2
 	R11.2 <-> VR2.2
 	R12.2 <-> VR1.2
-	R13.2 <-> VR3.1
 	R16.1 <-> R17.2
-	R8.1 <-> R9.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/279_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/279_incl_switches.txt
index 8594714d..9e0a7f69 100644
--- a/diylc-regression-data/input/cloud/netlist/279_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/279_incl_switches.txt
@@ -3,16 +3,11 @@ Switch setup: [Default]
 	C1.1 <-> R7.2 <-> V1.3 <-> V1.8
 	C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C7.2 <-> J1.5 <-> J1.6 <-> J2.1 <-> J2.5 <-> J2.6 <-> J3.1 <-> J3.5 <-> J3.6 <-> J4.5 <-> J4.6 <-> R13.2 <-> R20.2 <-> R3.2 <-> R4.1 <-> R7.1 <-> VR1.1 <-> VR1.3 <-> VR2.1 <-> VR2.3 <-> VR3.1 <-> VR3.3
 	C10.2 <-> C9.1 <-> R15.2
-	C2.1 <-> R10.1
 	C2.1 <-> R10.1 <-> R8.1 <-> R9.1
 	C3.1 <-> C5.1 <-> R8.2
-	C3.2 <-> VR2.1
 	C4.1 <-> R9.2 <-> V1.1
-	C4.2 <-> VR1.3
-	C5.2 <-> R11.1 <-> R12.1
 	C5.2 <-> R11.1 <-> R12.1 <-> R13.1
 	C6.1 <-> V2.2 <-> VR3.2
-	C6.1 <-> VR3.2
 	C7.1 <-> R20.1 <-> V2.3
 	C8.1 <-> R16.2
 	C8.2 <-> R14.2
@@ -25,7 +20,5 @@ Switch setup: [Default]
 	J4.2 <-> R6.2
 	R11.2 <-> VR2.2
 	R12.2 <-> VR1.2
-	R13.2 <-> VR3.1
 	R16.1 <-> R17.2
-	R8.1 <-> R9.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt
index 11fa66c3..08038ef9 100644
--- a/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/287_excl_switches.txt
@@ -7,15 +7,17 @@ Switch setup: [Default]
 	C10.2 <-> C11.2 <-> R10.2
 	C11.1 <-> Q1.3 <-> R11.1
 	C12.1 <-> Q1.2 <-> R12.1
+	C12.2 <-> Volume.1
 	C2.1 <-> C3.1 <-> D1.2 <-> OP07.6 <-> Q1.1 <-> R1.2 <-> R2.1
 	C4.1 <-> R4.2
 	C4.2 <-> R5.2 <-> R6.1
 	C5.1 <-> OP07.3 <-> R6.2
-	C6.1 <-> Dist.1 <-> OP07.2 <-> R7.1 <-> R8.1
+	C6.1 <-> Dist.1 <-> Dist.2 <-> OP07.2 <-> R7.1 <-> R8.1
 	C6.2 <-> C9.1 <-> Dist.3 <-> OP07.7
 	C7.1 <-> R8.2
 	C8.1 <-> R7.2
 	C9.2 <-> R9.1
-	D2.2 <-> D3.1 <-> R9.2 <-> Tone.1
+	D2.2 <-> D3.1 <-> R9.2 <-> Tone.1 <-> Tone.2
 	D4.1 <-> R13.1
+	R10.1 <-> Tone.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt
index 11fa66c3..08038ef9 100644
--- a/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/287_incl_switches.txt
@@ -7,15 +7,17 @@ Switch setup: [Default]
 	C10.2 <-> C11.2 <-> R10.2
 	C11.1 <-> Q1.3 <-> R11.1
 	C12.1 <-> Q1.2 <-> R12.1
+	C12.2 <-> Volume.1
 	C2.1 <-> C3.1 <-> D1.2 <-> OP07.6 <-> Q1.1 <-> R1.2 <-> R2.1
 	C4.1 <-> R4.2
 	C4.2 <-> R5.2 <-> R6.1
 	C5.1 <-> OP07.3 <-> R6.2
-	C6.1 <-> Dist.1 <-> OP07.2 <-> R7.1 <-> R8.1
+	C6.1 <-> Dist.1 <-> Dist.2 <-> OP07.2 <-> R7.1 <-> R8.1
 	C6.2 <-> C9.1 <-> Dist.3 <-> OP07.7
 	C7.1 <-> R8.2
 	C8.1 <-> R7.2
 	C9.2 <-> R9.1
-	D2.2 <-> D3.1 <-> R9.2 <-> Tone.1
+	D2.2 <-> D3.1 <-> R9.2 <-> Tone.1 <-> Tone.2
 	D4.1 <-> R13.1
+	R10.1 <-> Tone.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt
index 4ebf3132..0139ca8a 100644
--- a/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/291_excl_switches.txt
@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
 	10K.1 <-> 22nF.2
-	10K.2 <-> 470K.2
 	10K.2 <-> 470K.2 <-> IC1.2
 	10uF.1 <-> 470K.1
 	10uF.2 <-> 1M.2 <-> 2.2nF.2 <-> D1.2 <-> GND
 	1M.1 <-> 2.2nF.1 <-> 22nF.1
-	2.2nF.1 <-> 22nF.1
 	D1.1 <-> IC1.4
 
diff --git a/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt
index 4ebf3132..0139ca8a 100644
--- a/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/291_incl_switches.txt
@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
 	10K.1 <-> 22nF.2
-	10K.2 <-> 470K.2
 	10K.2 <-> 470K.2 <-> IC1.2
 	10uF.1 <-> 470K.1
 	10uF.2 <-> 1M.2 <-> 2.2nF.2 <-> D1.2 <-> GND
 	1M.1 <-> 2.2nF.1 <-> 22nF.1
-	2.2nF.1 <-> 22nF.1
 	D1.1 <-> IC1.4
 
diff --git a/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt
index 94ca7090..0835c9d9 100644
--- a/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/298_excl_switches.txt
@@ -1,13 +1,13 @@
 Switch setup: [Default]
 
-	.1 <-> C8.2
+	.1 <-> C8.2 <-> R13.1
 	.2 <-> .3
+	.3 <-> C9.2 <-> R14.2
 	C1-B.1 <-> R1.2
 	C2.1 <-> R2.2
 	C3.1 <-> R2.1
 	C3.2 <-> R5.2 <-> V1.1
 	C6.2 <-> R8.2 <-> V1.6
-	C6.2 <-> V1.6
 	J1.1 <-> J1.4 <-> R3.1
 	R11.1 <-> V2.5
 	R4.2 <-> V1.2
diff --git a/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt
index d3df02fb..4094f871 100644
--- a/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/298_incl_switches.txt
@@ -5,7 +5,8 @@ Switch setup: [.ON1:.ON1:.ON1:.ON1, .ON1:.ON1:.ON1:.ON2, .ON1:.ON1:.ON2:.ON1, .O
 	C3.1 <-> R2.1
 	C3.2 <-> R5.2 <-> V1.1
 	C6.2 <-> R8.2 <-> V1.6
-	C6.2 <-> V1.6
+	C8.2 <-> R13.1
+	C9.2 <-> R14.2
 	J1.1 <-> J1.4 <-> R3.1
 	R11.1 <-> V2.5
 	R4.2 <-> V1.2
diff --git a/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt
index 6de2a625..59165c1f 100644
--- a/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/305_excl_switches.txt
@@ -6,12 +6,6 @@ Switch setup: [Default]
 	C4.2 <-> IC2.10 <-> IC2.9 <-> VR4.3
 	C6.1 <-> VR6.1
 	C6.2 <-> IC2.13
-	C7.1 <-> IC3.10 <-> IC3.9 <-> VR7.3
-	C7.2 <-> C9.2 <-> IC3.7 <-> VR9.3
-	C8.1 <-> VR9.1
-	C8.2 <-> IC3.13
-	C9.1 <-> IC3.2 <-> IC3.6 <-> R2.2
+	C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> R2.1 <-> R2.2 <-> VR7.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 <-> VR9.1 <-> VR9.2 <-> VR9.3
 	IC2.14 <-> IC2.5
-	IC3.1 <-> IC3.12 <-> IC3.4 <-> IC3.8 <-> R2.1 <-> VR7.1 <-> VR7.2 <-> VR8.1 <-> VR8.2 <-> VR8.3
-	IC3.14 <-> IC3.5
 
diff --git a/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt
index 6de2a625..59165c1f 100644
--- a/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/305_incl_switches.txt
@@ -6,12 +6,6 @@ Switch setup: [Default]
 	C4.2 <-> IC2.10 <-> IC2.9 <-> VR4.3
 	C6.1 <-> VR6.1
 	C6.2 <-> IC2.13
-	C7.1 <-> IC3.10 <-> IC3.9 <-> VR7.3
-	C7.2 <-> C9.2 <-> IC3.7 <-> VR9.3
-	C8.1 <-> VR9.1
-	C8.2 <-> IC3.13
-	C9.1 <-> IC3.2 <-> IC3.6 <-> R2.2
+	C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> R2.1 <-> R2.2 <-> VR7.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 <-> VR9.1 <-> VR9.2 <-> VR9.3
 	IC2.14 <-> IC2.5
-	IC3.1 <-> IC3.12 <-> IC3.4 <-> IC3.8 <-> R2.1 <-> VR7.1 <-> VR7.2 <-> VR8.1 <-> VR8.2 <-> VR8.3
-	IC3.14 <-> IC3.5
 
diff --git a/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt
index e2f84178..e3ca04a1 100644
--- a/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/307_excl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	.1 <-> .2 <-> .3 <-> 100   K.1 <-> C3.1 <-> L2.1 <-> Q1.1 <-> R1.1
+	.1 <-> .2 <-> .3 <-> 100   K.1 <-> C3.1 <-> Q1.1 <-> R1.1
 	C3.2 <-> D1.1
-	D1.2 <-> L2.2
 	Q1.2 <-> Q1.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt
index e2f84178..e3ca04a1 100644
--- a/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/307_incl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	.1 <-> .2 <-> .3 <-> 100   K.1 <-> C3.1 <-> L2.1 <-> Q1.1 <-> R1.1
+	.1 <-> .2 <-> .3 <-> 100   K.1 <-> C3.1 <-> Q1.1 <-> R1.1
 	C3.2 <-> D1.1
-	D1.2 <-> L2.2
 	Q1.2 <-> Q1.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/313_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/313_excl_switches.txt
index 7f7a4d64..a9f968ee 100644
--- a/diylc-regression-data/input/cloud/netlist/313_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/313_excl_switches.txt
@@ -1,29 +1,16 @@
 Switch setup: [Default]
 
-	.1 <-> .1 <-> C16.1 <-> R21.1
-	.1 <-> .2 <-> C1.1 <-> C15.2
+	.1 <-> .1 <-> .1 <-> .2 <-> .2 <-> .3 <-> .3 <-> .3 <-> C10.1 <-> C12.1 <-> C14.1 <-> C5.1 <-> C7.1 <-> C9.1 <-> R10.1 <-> R13.1 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.1 <-> R20.1 <-> R23.1 <-> R24.1 <-> R3.1 <-> R4.2 <-> R6.2 <-> R7.2 <-> R8.1 <-> R8.2
+	.1 <-> .1 <-> .2 <-> .2 <-> .2 <-> C11.1 <-> C16.1 <-> C2.1 <-> C4.1 <-> R11.1 <-> R2.1 <-> R21.1 <-> R25.1 <-> R8.2
+	.1 <-> .2 <-> C1.1 <-> C11.2 <-> C14.2 <-> C15.2 <-> R15.2 <-> R18.2 <-> R5.1
 	.1 <-> .2 <-> C12.2 <-> C16.2 <-> C9.2 <-> R10.2 <-> R11.2 <-> R2.2 <-> R2.2 <-> R20.2 <-> R24.2 <-> R3.2 <-> R5.2
-	.1 <-> C12.1 <-> R3.1
-	.1 <-> C14.1 <-> R10.1
-	.1 <-> R2.1
-	.2 <-> C11.1 <-> R8.2
-	.2 <-> C2.1 <-> R2.1 <-> R25.1
-	.2 <-> C4.1 <-> R11.1
-	.2 <-> R18.1 <-> R23.1 <-> R24.1
-	.2 <-> R19.1 <-> R20.1 <-> R6.2
-	.3 <-> .3 <-> C15.1 <-> R22.1
-	.3 <-> C10.1 <-> R14.2
-	.3 <-> C5.1 <-> R7.2 <-> R8.1
-	.3 <-> C7.1 <-> R4.2
-	C1.2 <-> C13.1 <-> R13.2 <-> R15.1
-	C13.2 <-> R8.1
-	C14.2 <-> R18.2
+	.3 <-> .3 <-> C15.1 <-> C2.2 <-> R22.1
+	C1.2 <-> C13.1 <-> C4.2 <-> R13.2 <-> R15.1
+	C10.2 <-> C7.2
+	C13.2 <-> C5.2 <-> R6.1 <-> R8.1
 	C17.1 <-> R12.1 <-> R9.2
-	C17.2 <-> C3.2 <-> C6.2 <-> C8.2
+	C17.2 <-> C3.2 <-> C6.2 <-> C8.2 <-> D3.1
 	C3.1 <-> D3.2 <-> R1.1 <-> R9.1
-	C5.2 <-> R6.1
 	C6.1 <-> C8.1 <-> R1.2
-	C9.1 <-> R13.1 <-> R8.2
 	R14.1 <-> R19.2 <-> R22.2 <-> R23.2 <-> R25.2 <-> R4.1 <-> R7.1
-	R15.2 <-> R5.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/313_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/313_incl_switches.txt
index 7f7a4d64..a9f968ee 100644
--- a/diylc-regression-data/input/cloud/netlist/313_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/313_incl_switches.txt
@@ -1,29 +1,16 @@
 Switch setup: [Default]
 
-	.1 <-> .1 <-> C16.1 <-> R21.1
-	.1 <-> .2 <-> C1.1 <-> C15.2
+	.1 <-> .1 <-> .1 <-> .2 <-> .2 <-> .3 <-> .3 <-> .3 <-> C10.1 <-> C12.1 <-> C14.1 <-> C5.1 <-> C7.1 <-> C9.1 <-> R10.1 <-> R13.1 <-> R14.2 <-> R18.1 <-> R19.1 <-> R2.1 <-> R20.1 <-> R23.1 <-> R24.1 <-> R3.1 <-> R4.2 <-> R6.2 <-> R7.2 <-> R8.1 <-> R8.2
+	.1 <-> .1 <-> .2 <-> .2 <-> .2 <-> C11.1 <-> C16.1 <-> C2.1 <-> C4.1 <-> R11.1 <-> R2.1 <-> R21.1 <-> R25.1 <-> R8.2
+	.1 <-> .2 <-> C1.1 <-> C11.2 <-> C14.2 <-> C15.2 <-> R15.2 <-> R18.2 <-> R5.1
 	.1 <-> .2 <-> C12.2 <-> C16.2 <-> C9.2 <-> R10.2 <-> R11.2 <-> R2.2 <-> R2.2 <-> R20.2 <-> R24.2 <-> R3.2 <-> R5.2
-	.1 <-> C12.1 <-> R3.1
-	.1 <-> C14.1 <-> R10.1
-	.1 <-> R2.1
-	.2 <-> C11.1 <-> R8.2
-	.2 <-> C2.1 <-> R2.1 <-> R25.1
-	.2 <-> C4.1 <-> R11.1
-	.2 <-> R18.1 <-> R23.1 <-> R24.1
-	.2 <-> R19.1 <-> R20.1 <-> R6.2
-	.3 <-> .3 <-> C15.1 <-> R22.1
-	.3 <-> C10.1 <-> R14.2
-	.3 <-> C5.1 <-> R7.2 <-> R8.1
-	.3 <-> C7.1 <-> R4.2
-	C1.2 <-> C13.1 <-> R13.2 <-> R15.1
-	C13.2 <-> R8.1
-	C14.2 <-> R18.2
+	.3 <-> .3 <-> C15.1 <-> C2.2 <-> R22.1
+	C1.2 <-> C13.1 <-> C4.2 <-> R13.2 <-> R15.1
+	C10.2 <-> C7.2
+	C13.2 <-> C5.2 <-> R6.1 <-> R8.1
 	C17.1 <-> R12.1 <-> R9.2
-	C17.2 <-> C3.2 <-> C6.2 <-> C8.2
+	C17.2 <-> C3.2 <-> C6.2 <-> C8.2 <-> D3.1
 	C3.1 <-> D3.2 <-> R1.1 <-> R9.1
-	C5.2 <-> R6.1
 	C6.1 <-> C8.1 <-> R1.2
-	C9.1 <-> R13.1 <-> R8.2
 	R14.1 <-> R19.2 <-> R22.2 <-> R23.2 <-> R25.2 <-> R4.1 <-> R7.1
-	R15.2 <-> R5.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/314_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/314_excl_switches.txt
index 8434f242..c1a4122c 100644
--- a/diylc-regression-data/input/cloud/netlist/314_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/314_excl_switches.txt
@@ -1,26 +1,13 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> Q1.2 <-> R2.1 <-> R3.1
-	C10.1 <-> R17.2 <-> R18.1 <-> R19.1
+	C1.1 <-> C12.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.2 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q5.2 <-> Q5.3 <-> R1.1 <-> R10.1 <-> R17.1 <-> R23.2 <-> R7.2 <-> R8.1 <-> R9.1 <-> R9.2
+	C1.2 <-> C9.1 <-> Q1.2 <-> Q3.1 <-> Q4.3 <-> R14.1 <-> R15.2 <-> R16.1 <-> R2.1 <-> R22.1 <-> R3.1
+	C10.1 <-> C6.2 <-> C9.2 <-> D4.1 <-> Q3.3 <-> R13.1 <-> R17.2 <-> R18.1 <-> R19.1
 	C10.2 <-> C13.2 <-> C14.2 <-> C8.2 <-> R1.2 <-> R11.2 <-> R12.2 <-> R13.2 <-> R16.2 <-> R18.2 <-> R2.2 <-> R22.2 <-> R4.2 <-> R6.1 <-> R8.2
-	C11.1 <-> C12.2 <-> R20.2 <-> R21.1
-	C11.2 <-> C14.1 <-> D1.2 <-> R10.2 <-> R14.2 <-> R21.2 <-> R3.2 <-> R5.2
-	C2.1 <-> Q1.1 <-> R5.1
-	C3.1 <-> R7.1
-	C4.1 <-> D2.2 <-> D3.1 <-> Q2.2 <-> R7.2 <-> R8.1 <-> R9.1
-	C4.2 <-> C5.2 <-> C6.1 <-> Q2.1 <-> R10.1 <-> R9.2
-	C5.1 <-> D2.1 <-> D3.2
-	C7.1 <-> Q3.2 <-> R12.1 <-> R15.1
-	C7.2 <-> C8.1
-	C9.1 <-> Q3.1 <-> R14.1 <-> R15.2
-	C9.2 <-> D4.1
-	D4.2 <-> Q4.2 <-> R19.2
-	Q1.3 <-> R4.1
-	Q2.3 <-> R11.1
-	Q3.3 <-> R13.1
-	Q4.1 <-> Q5.2 <-> R23.2
-	Q4.3 <-> R16.1
-	Q5.1 <-> R20.1
-	Q5.3 <-> R17.1
+	C11.1 <-> C12.2 <-> C5.1 <-> D1.1 <-> D2.1 <-> D3.2 <-> R20.2 <-> R21.1
+	C11.2 <-> C14.1 <-> D1.2 <-> Q5.1 <-> R10.2 <-> R14.2 <-> R20.1 <-> R21.2 <-> R3.2 <-> R5.2
+	C13.1 <-> C7.2 <-> C8.1
+	C2.1 <-> D4.2 <-> Q1.1 <-> Q2.3 <-> Q4.2 <-> R11.1 <-> R19.2 <-> R5.1
+	C3.1 <-> R23.1 <-> R7.1
+	C7.1 <-> Q1.3 <-> Q3.2 <-> R12.1 <-> R15.1 <-> R4.1 <-> R6.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/314_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/314_incl_switches.txt
index 8434f242..c1a4122c 100644
--- a/diylc-regression-data/input/cloud/netlist/314_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/314_incl_switches.txt
@@ -1,26 +1,13 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> Q1.2 <-> R2.1 <-> R3.1
-	C10.1 <-> R17.2 <-> R18.1 <-> R19.1
+	C1.1 <-> C12.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.2 <-> C6.1 <-> D2.2 <-> D3.1 <-> Q2.1 <-> Q2.2 <-> Q4.1 <-> Q5.2 <-> Q5.3 <-> R1.1 <-> R10.1 <-> R17.1 <-> R23.2 <-> R7.2 <-> R8.1 <-> R9.1 <-> R9.2
+	C1.2 <-> C9.1 <-> Q1.2 <-> Q3.1 <-> Q4.3 <-> R14.1 <-> R15.2 <-> R16.1 <-> R2.1 <-> R22.1 <-> R3.1
+	C10.1 <-> C6.2 <-> C9.2 <-> D4.1 <-> Q3.3 <-> R13.1 <-> R17.2 <-> R18.1 <-> R19.1
 	C10.2 <-> C13.2 <-> C14.2 <-> C8.2 <-> R1.2 <-> R11.2 <-> R12.2 <-> R13.2 <-> R16.2 <-> R18.2 <-> R2.2 <-> R22.2 <-> R4.2 <-> R6.1 <-> R8.2
-	C11.1 <-> C12.2 <-> R20.2 <-> R21.1
-	C11.2 <-> C14.1 <-> D1.2 <-> R10.2 <-> R14.2 <-> R21.2 <-> R3.2 <-> R5.2
-	C2.1 <-> Q1.1 <-> R5.1
-	C3.1 <-> R7.1
-	C4.1 <-> D2.2 <-> D3.1 <-> Q2.2 <-> R7.2 <-> R8.1 <-> R9.1
-	C4.2 <-> C5.2 <-> C6.1 <-> Q2.1 <-> R10.1 <-> R9.2
-	C5.1 <-> D2.1 <-> D3.2
-	C7.1 <-> Q3.2 <-> R12.1 <-> R15.1
-	C7.2 <-> C8.1
-	C9.1 <-> Q3.1 <-> R14.1 <-> R15.2
-	C9.2 <-> D4.1
-	D4.2 <-> Q4.2 <-> R19.2
-	Q1.3 <-> R4.1
-	Q2.3 <-> R11.1
-	Q3.3 <-> R13.1
-	Q4.1 <-> Q5.2 <-> R23.2
-	Q4.3 <-> R16.1
-	Q5.1 <-> R20.1
-	Q5.3 <-> R17.1
+	C11.1 <-> C12.2 <-> C5.1 <-> D1.1 <-> D2.1 <-> D3.2 <-> R20.2 <-> R21.1
+	C11.2 <-> C14.1 <-> D1.2 <-> Q5.1 <-> R10.2 <-> R14.2 <-> R20.1 <-> R21.2 <-> R3.2 <-> R5.2
+	C13.1 <-> C7.2 <-> C8.1
+	C2.1 <-> D4.2 <-> Q1.1 <-> Q2.3 <-> Q4.2 <-> R11.1 <-> R19.2 <-> R5.1
+	C3.1 <-> R23.1 <-> R7.1
+	C7.1 <-> Q1.3 <-> Q3.2 <-> R12.1 <-> R15.1 <-> R4.1 <-> R6.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/325_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/325_excl_switches.txt
index ec824771..a6441cec 100644
--- a/diylc-regression-data/input/cloud/netlist/325_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/325_excl_switches.txt
@@ -1,18 +1,9 @@
 Switch setup: [Default]
 
-	C2*.1 <-> R2*.2
-	C2*.2 <-> IC2.8 <-> R1*.2
+	C1*.1 <-> C2*.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C8.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1*.2 <-> R14.1 <-> R5.2 <-> R8.1 <-> R9.1 <-> R9.2
+	C1*.2 <-> C2*.1 <-> R2*.2
 	C3.1 <-> R13.1 <-> R14.2 <-> R4.2 <-> R7.2
-	C3.2 <-> C6.2 <-> C8.2 <-> IC1.4 <-> IC2.4 <-> R14.1 <-> R5.2 <-> R9.2
-	C4.1 <-> IC1.6 <-> R6.1
-	C5.1 <-> R5.1
-	C5.2 <-> IC1.3 <-> R4.1
-	C6.1 <-> C8.1 <-> IC1.5 <-> IC2.5 <-> R13.2
-	IC1.1 <-> IC1.2 <-> R3.1
-	IC1.7 <-> R6.2 <-> R7.1
-	IC1.8 <-> R8.1 <-> R9.1
-	IC2.1 <-> R10.2 <-> R8.2
-	IC2.2 <-> R10.1
-	IC2.3 <-> R3.2
-	IC2.6 <-> IC2.7 <-> R2*.1
+	C4.1 <-> C5.1 <-> C6.1 <-> C8.1 <-> IC1.1 <-> IC1.2 <-> IC1.5 <-> IC1.6 <-> IC2.1 <-> IC2.5 <-> R10.2 <-> R13.2 <-> R3.1 <-> R5.1 <-> R6.1 <-> R8.2
+	C5.2 <-> IC1.3 <-> IC1.7 <-> R4.1 <-> R6.2 <-> R7.1
+	IC2.2 <-> IC2.3 <-> IC2.6 <-> IC2.7 <-> R1*.1 <-> R10.1 <-> R2*.1 <-> R3.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/325_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/325_incl_switches.txt
index ec824771..a6441cec 100644
--- a/diylc-regression-data/input/cloud/netlist/325_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/325_incl_switches.txt
@@ -1,18 +1,9 @@
 Switch setup: [Default]
 
-	C2*.1 <-> R2*.2
-	C2*.2 <-> IC2.8 <-> R1*.2
+	C1*.1 <-> C2*.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C8.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1*.2 <-> R14.1 <-> R5.2 <-> R8.1 <-> R9.1 <-> R9.2
+	C1*.2 <-> C2*.1 <-> R2*.2
 	C3.1 <-> R13.1 <-> R14.2 <-> R4.2 <-> R7.2
-	C3.2 <-> C6.2 <-> C8.2 <-> IC1.4 <-> IC2.4 <-> R14.1 <-> R5.2 <-> R9.2
-	C4.1 <-> IC1.6 <-> R6.1
-	C5.1 <-> R5.1
-	C5.2 <-> IC1.3 <-> R4.1
-	C6.1 <-> C8.1 <-> IC1.5 <-> IC2.5 <-> R13.2
-	IC1.1 <-> IC1.2 <-> R3.1
-	IC1.7 <-> R6.2 <-> R7.1
-	IC1.8 <-> R8.1 <-> R9.1
-	IC2.1 <-> R10.2 <-> R8.2
-	IC2.2 <-> R10.1
-	IC2.3 <-> R3.2
-	IC2.6 <-> IC2.7 <-> R2*.1
+	C4.1 <-> C5.1 <-> C6.1 <-> C8.1 <-> IC1.1 <-> IC1.2 <-> IC1.5 <-> IC1.6 <-> IC2.1 <-> IC2.5 <-> R10.2 <-> R13.2 <-> R3.1 <-> R5.1 <-> R6.1 <-> R8.2
+	C5.2 <-> IC1.3 <-> IC1.7 <-> R4.1 <-> R6.2 <-> R7.1
+	IC2.2 <-> IC2.3 <-> IC2.6 <-> IC2.7 <-> R1*.1 <-> R10.1 <-> R2*.1 <-> R3.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/333_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/333_excl_switches.txt
index accb2a33..5d1a4134 100644
--- a/diylc-regression-data/input/cloud/netlist/333_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/333_excl_switches.txt
@@ -2,7 +2,6 @@ Switch setup: [Default]
 
 	10 K.1 <-> 100 nF 400 V.1 <-> 680 K.1
 	100 nF .2 <-> 680 K.1
-	100 nF 400 V.1 <-> 680 K.1
 	100 nF 400 V.2 <-> 330 K.2
 	120   5 W.1 <-> 47uF30 V.1
 	33 nF 400 V.1 <-> 330 K.2
diff --git a/diylc-regression-data/input/cloud/netlist/333_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/333_incl_switches.txt
index accb2a33..5d1a4134 100644
--- a/diylc-regression-data/input/cloud/netlist/333_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/333_incl_switches.txt
@@ -2,7 +2,6 @@ Switch setup: [Default]
 
 	10 K.1 <-> 100 nF 400 V.1 <-> 680 K.1
 	100 nF .2 <-> 680 K.1
-	100 nF 400 V.1 <-> 680 K.1
 	100 nF 400 V.2 <-> 330 K.2
 	120   5 W.1 <-> 47uF30 V.1
 	33 nF 400 V.1 <-> 330 K.2
diff --git a/diylc-regression-data/input/cloud/netlist/351_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/351_excl_switches.txt
index 2ba03db3..a8c7fc37 100644
--- a/diylc-regression-data/input/cloud/netlist/351_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/351_excl_switches.txt
@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	BIAS.2 <-> R8.1
+	BIAS.1 <-> C6.1 <-> D1.1 <-> D1.2 <-> R4.2 <-> R6.2 <-> R8.2
+	BIAS.2 <-> C2.1 <-> Q1.3 <-> Q2.3 <-> Q3.2 <-> R1.2 <-> R4.1 <-> R6.1 <-> R8.1
 	BIAS.3 <-> C4.1 <-> Q3.3
-	C1.1 <-> Q1.2 <-> R1.1 <-> R2.1
-	C2.1 <-> Q1.3 <-> R1.2 <-> R4.1
-	C2.2 <-> Q2.2 <-> R7.2
+	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> C4.2 <-> Q1.2 <-> Q2.2 <-> Q3.1 <-> R1.1 <-> R2.1 <-> R7.1 <-> R7.2
 	C3.2 <-> C5.2 <-> C6.2 <-> R2.2 <-> R3.2 <-> R5.2
-	C6.1 <-> D1.2 <-> R4.2 <-> R6.2 <-> R8.2
-	Q1.1 <-> R3.1
-	Q2.1 <-> R5.1
-	Q2.3 <-> Q3.2 <-> R6.1
-	Q3.1 <-> R7.1
+	Q1.1 <-> Q2.1 <-> R3.1 <-> R5.1
 	TOP.2 <-> TOP.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/351_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/351_incl_switches.txt
index 2ba03db3..a8c7fc37 100644
--- a/diylc-regression-data/input/cloud/netlist/351_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/351_incl_switches.txt
@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	BIAS.2 <-> R8.1
+	BIAS.1 <-> C6.1 <-> D1.1 <-> D1.2 <-> R4.2 <-> R6.2 <-> R8.2
+	BIAS.2 <-> C2.1 <-> Q1.3 <-> Q2.3 <-> Q3.2 <-> R1.2 <-> R4.1 <-> R6.1 <-> R8.1
 	BIAS.3 <-> C4.1 <-> Q3.3
-	C1.1 <-> Q1.2 <-> R1.1 <-> R2.1
-	C2.1 <-> Q1.3 <-> R1.2 <-> R4.1
-	C2.2 <-> Q2.2 <-> R7.2
+	C1.1 <-> C1.2 <-> C2.2 <-> C3.1 <-> C4.2 <-> Q1.2 <-> Q2.2 <-> Q3.1 <-> R1.1 <-> R2.1 <-> R7.1 <-> R7.2
 	C3.2 <-> C5.2 <-> C6.2 <-> R2.2 <-> R3.2 <-> R5.2
-	C6.1 <-> D1.2 <-> R4.2 <-> R6.2 <-> R8.2
-	Q1.1 <-> R3.1
-	Q2.1 <-> R5.1
-	Q2.3 <-> Q3.2 <-> R6.1
-	Q3.1 <-> R7.1
+	Q1.1 <-> Q2.1 <-> R3.1 <-> R5.1
 	TOP.2 <-> TOP.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/353_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/353_excl_switches.txt
index 53e17a23..ae92beb0 100644
--- a/diylc-regression-data/input/cloud/netlist/353_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/353_excl_switches.txt
@@ -1,3 +1 @@
-Switch setup: [Default]
-
-
+java.lang.NullPointerException: null
\ No newline at end of file
diff --git a/diylc-regression-data/input/cloud/netlist/353_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/353_incl_switches.txt
index 53e17a23..ae92beb0 100644
--- a/diylc-regression-data/input/cloud/netlist/353_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/353_incl_switches.txt
@@ -1,3 +1 @@
-Switch setup: [Default]
-
-
+java.lang.NullPointerException: null
\ No newline at end of file
diff --git a/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt
index 15e714dd..a5dbb308 100644
--- a/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/355_excl_switches.txt
@@ -1,4 +1,7 @@
 Switch setup: [Default]
 
-	GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start <-> SW1.3
+	.1 <-> SW1.2
+	GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start <-> SW1.3 <-> SW2.3 <-> SW4.3
+	SW3.1 <-> SW3.6
+	SW3.3 <-> SW3.4
 
diff --git a/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt
index 5b621b74..ab69c23e 100644
--- a/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/355_incl_switches.txt
@@ -1,4 +1,8 @@
-Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1, SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2, SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1, SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2, SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1, SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2, SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1, SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2, SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1, SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2, SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1, SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2, SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1, SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2, SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1, SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2]
+Switch setup: [SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON1, SW1.ON1:SW2.ON1:SW3.ON1:SW4.ON2, SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON1, SW1.ON1:SW2.ON1:SW3.ON2:SW4.ON2, SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON1, SW1.ON1:SW2.ON2:SW3.ON1:SW4.ON2, SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON1, SW1.ON1:SW2.ON2:SW3.ON2:SW4.ON2]
 
 	GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start
 
+Switch setup: [SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON1, SW1.ON2:SW2.ON1:SW3.ON1:SW4.ON2, SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON1, SW1.ON2:SW2.ON1:SW3.ON2:SW4.ON2, SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON1, SW1.ON2:SW2.ON2:SW3.ON1:SW4.ON2, SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON1, SW1.ON2:SW2.ON2:SW3.ON2:SW4.ON2]
+
+	.1 <-> GND <-> J1.Sleeve <-> PKP1.North Start <-> PKP3.North Start
+
diff --git a/diylc-regression-data/input/cloud/netlist/357_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/357_excl_switches.txt
index 8de591fa..7bebcb90 100644
--- a/diylc-regression-data/input/cloud/netlist/357_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/357_excl_switches.txt
@@ -8,13 +8,11 @@ Switch setup: [Default]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
 	C12.1 <-> Presence.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
diff --git a/diylc-regression-data/input/cloud/netlist/357_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/357_incl_switches.txt
index f08fe797..e29aac38 100644
--- a/diylc-regression-data/input/cloud/netlist/357_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/357_incl_switches.txt
@@ -8,13 +8,11 @@ Switch setup: [SW1.ON1:SW3.ON1, SW1.ON1:SW3.ON2]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
 	C12.1 <-> Presence.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -69,13 +67,11 @@ Switch setup: [SW1.ON2:SW3.ON1, SW1.ON2:SW3.ON2]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
 	C12.1 <-> Presence.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
diff --git a/diylc-regression-data/input/cloud/netlist/358_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/358_excl_switches.txt
index 7304b6e6..95751b91 100644
--- a/diylc-regression-data/input/cloud/netlist/358_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/358_excl_switches.txt
@@ -8,16 +8,13 @@ Switch setup: [Default]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> SW3.1 <-> SW3.4 <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.1
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -25,11 +22,9 @@ Switch setup: [Default]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.2 <-> R16.1
 	C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
diff --git a/diylc-regression-data/input/cloud/netlist/358_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/358_incl_switches.txt
index c076e1ef..9339f8f7 100644
--- a/diylc-regression-data/input/cloud/netlist/358_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/358_incl_switches.txt
@@ -8,16 +8,13 @@ Switch setup: [SW1.ON1:SW3.ON1]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.1
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -25,11 +22,9 @@ Switch setup: [SW1.ON1:SW3.ON1]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.2 <-> R16.1
 	C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
@@ -81,16 +76,13 @@ Switch setup: [SW1.ON1:SW3.ON2]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.1
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -98,11 +90,9 @@ Switch setup: [SW1.ON1:SW3.ON2]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.2 <-> R16.1
 	C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
@@ -154,16 +144,13 @@ Switch setup: [SW1.ON2:SW3.ON1]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.1
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -171,11 +158,9 @@ Switch setup: [SW1.ON2:SW3.ON1]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.2 <-> R16.1
 	C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
@@ -225,16 +210,13 @@ Switch setup: [SW1.ON2:SW3.ON2]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.1
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -242,11 +224,9 @@ Switch setup: [SW1.ON2:SW3.ON2]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.2 <-> R16.1
 	C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
diff --git a/diylc-regression-data/input/cloud/netlist/359_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/359_excl_switches.txt
index b83065f2..2dbe1fc6 100644
--- a/diylc-regression-data/input/cloud/netlist/359_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/359_excl_switches.txt
@@ -8,17 +8,13 @@ Switch setup: [Default]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
-	C11.2 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> SW3.1 <-> SW3.4 <-> V6.H <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -26,18 +22,15 @@ Switch setup: [Default]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.2 <-> R16.1
 	C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
 	C9.2 <-> Middle.2
 	D1.1 <-> R29.2
 	D2.1 <-> D3.1 <-> V6.NC <-> V6.NC
-	D2.1 <-> V6.NC
 	D2.2 <-> V6.P
 	D3.2 <-> V6.P
 	FH1.1 <-> FH1.2 <-> IEC1.2 <-> SW1.2 <-> SW1.5
diff --git a/diylc-regression-data/input/cloud/netlist/359_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/359_incl_switches.txt
index d64f8386..c72a8cf8 100644
--- a/diylc-regression-data/input/cloud/netlist/359_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/359_incl_switches.txt
@@ -8,17 +8,13 @@ Switch setup: [SW1.ON1:SW3.ON1]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
-	C11.2 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -26,18 +22,15 @@ Switch setup: [SW1.ON1:SW3.ON1]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.2 <-> R16.1
 	C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
 	C9.2 <-> Middle.2
 	D1.1 <-> R29.2
 	D2.1 <-> D3.1 <-> V6.NC <-> V6.NC
-	D2.1 <-> V6.NC
 	D2.2 <-> V6.P
 	D3.2 <-> V6.P
 	FH1.1 <-> FH1.2 <-> IEC1.2 <-> PL1.1 <-> PL1.2 <-> PL1.4
@@ -80,17 +73,13 @@ Switch setup: [SW1.ON1:SW3.ON2]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
-	C11.2 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -98,18 +87,15 @@ Switch setup: [SW1.ON1:SW3.ON2]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.2 <-> R16.1
 	C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
 	C9.2 <-> Middle.2
 	D1.1 <-> R29.2
 	D2.1 <-> D3.1 <-> V6.NC <-> V6.NC
-	D2.1 <-> V6.NC
 	D2.2 <-> V6.P
 	D3.2 <-> V6.P
 	FH1.1 <-> FH1.2 <-> IEC1.2 <-> PL1.1 <-> PL1.2 <-> PL1.4
@@ -152,17 +138,13 @@ Switch setup: [SW1.ON2:SW3.ON1]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
-	C11.2 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -170,18 +152,15 @@ Switch setup: [SW1.ON2:SW3.ON1]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.2 <-> R16.1
 	C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
 	C9.2 <-> Middle.2
 	D1.1 <-> R29.2
 	D2.1 <-> D3.1 <-> V6.NC <-> V6.NC
-	D2.1 <-> V6.NC
 	D2.2 <-> V6.P
 	D3.2 <-> V6.P
 	FH1.1 <-> FH1.2 <-> IEC1.2
@@ -225,17 +204,13 @@ Switch setup: [SW1.ON2:SW3.ON2]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> C6.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
-	C11.2 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -243,18 +218,15 @@ Switch setup: [SW1.ON2:SW3.ON2]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.2 <-> R16.1
 	C6.3 <-> Not Original.1 <-> R16.2 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
 	C9.2 <-> Middle.2
 	D1.1 <-> R29.2
 	D2.1 <-> D3.1 <-> V6.NC <-> V6.NC
-	D2.1 <-> V6.NC
 	D2.2 <-> V6.P
 	D3.2 <-> V6.P
 	FH1.1 <-> FH1.2 <-> IEC1.2
diff --git a/diylc-regression-data/input/cloud/netlist/361_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/361_excl_switches.txt
index ef22256a..76c0a075 100644
--- a/diylc-regression-data/input/cloud/netlist/361_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/361_excl_switches.txt
@@ -11,17 +11,13 @@ Switch setup: [Default]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
-	C11.2 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> SW3.1 <-> SW3.4 <-> V6.H <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -29,11 +25,9 @@ Switch setup: [Default]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.1 <-> R22.1 <-> V3.G
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.3 <-> Not Original.1 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
diff --git a/diylc-regression-data/input/cloud/netlist/361_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/361_incl_switches.txt
index 41ba1661..ee4a46f8 100644
--- a/diylc-regression-data/input/cloud/netlist/361_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/361_incl_switches.txt
@@ -11,17 +11,13 @@ Switch setup: [SW1.ON1:SW3.ON1]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
-	C11.2 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -29,11 +25,9 @@ Switch setup: [SW1.ON1:SW3.ON1]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.1 <-> R22.1 <-> V3.G
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.3 <-> Not Original.1 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
@@ -80,17 +74,13 @@ Switch setup: [SW1.ON1:SW3.ON2]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
-	C11.2 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -98,11 +88,9 @@ Switch setup: [SW1.ON1:SW3.ON2]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.1 <-> R22.1 <-> V3.G
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.3 <-> Not Original.1 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
@@ -149,17 +137,13 @@ Switch setup: [SW1.ON2:SW3.ON1]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
-	C11.2 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.1 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -167,11 +151,9 @@ Switch setup: [SW1.ON2:SW3.ON1]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.1 <-> R22.1 <-> V3.G
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.3 <-> Not Original.1 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
@@ -219,17 +201,13 @@ Switch setup: [SW1.ON2:SW3.ON2]
 	C1.2 <-> C12.2 <-> C16/C17.1 <-> C6.1 <-> J10.J10Sleeve <-> J13.J13Sleeve <-> J14.J14Sleeve <-> Not Original.1 <-> Not Original.2 <-> Presence.3
 	C10.1 <-> R18.1 <-> V3.G
 	C10.2 <-> Treble.2
-	C11.1 <-> C11.2 <-> R20.1
 	C11.1 <-> C11.2 <-> R20.1 <-> V3.P
 	C11.1 <-> C4.1 <-> R19.1 <-> V3.P
 	C11.2 <-> R16.1 <-> R25.2
-	C11.2 <-> R25.2
 	C12.1 <-> Presence.2
-	C16/C17.1 <-> Not Original.1
 	C16/C17.2 <-> Not Original.2 <-> Not Original.2 <-> V6.H <-> V6.H&C
 	C16/C17.3 <-> R23.2 <-> R32.2
 	C18.2 <-> R29.1 <-> R30.1
-	C18.2 <-> R30.1
 	C19.2 <-> R24.1 <-> R25.1 <-> R30.2 <-> R31.1
 	C2.1 <-> R3.2 <-> V1.P
 	C2.2 <-> Volume II.1
@@ -237,11 +215,9 @@ Switch setup: [SW1.ON2:SW3.ON2]
 	C3.2 <-> Volume I.1
 	C4.1 <-> Volume I.2
 	C4.2 <-> Not Original.2 <-> R24.2
-	C6.1 <-> Not Original.2
 	C6.1 <-> R22.1 <-> V3.G
 	C6.2 <-> Presence.1 <-> R21.2 <-> R22.2
 	C6.3 <-> Not Original.1 <-> R23.1
-	C7.1 <-> R14.1 <-> R15.2
 	C7.1 <-> R14.1 <-> R15.2 <-> V2.C
 	C7.2 <-> Treble.1
 	C8.1 <-> C9.1 <-> R15.1
diff --git a/diylc-regression-data/input/cloud/netlist/363_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/363_excl_switches.txt
index c66a2c71..b21d7ce8 100644
--- a/diylc-regression-data/input/cloud/netlist/363_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/363_excl_switches.txt
@@ -1,10 +1,12 @@
 Switch setup: [Default]
 
-	.5M.3 <-> .5M.3 <-> 100K.1
-	100K.1 <-> 100K.2 <-> 10K.2 <-> 10K.2 <-> 741.3 <-> 741.7 <-> D1.2 <-> D2.1
-	100K.2 <-> 741.2 <-> 741.6 <-> C1.1
+	.5M.1 <-> .5M.1 <-> 741.1 <-> 741.5
+	.5M.2 <-> .5M.2 <-> .5M.3 <-> .5M.3 <-> 100K.1 <-> 100K.1 <-> 100K.2 <-> 100K.2 <-> 10K.1 <-> 10K.2 <-> 10K.2 <-> 1M.1 <-> 1M.1 <-> 741.2 <-> 741.3 <-> 741.6 <-> 741.7 <-> C1.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2
 	10K.1 <-> C1.2
-	1M.1 <-> D1.1
-	741.1 <-> 741.5
+	1M.1 <-> 1M.1
+	1M.2 <-> 1M.2
+	1M.2 <-> 1M.2
+	1M.3 <-> 1M.3
+	1M.3 <-> 1M.3
 	741.4 <-> 741.8
 
diff --git a/diylc-regression-data/input/cloud/netlist/363_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/363_incl_switches.txt
index c66a2c71..b21d7ce8 100644
--- a/diylc-regression-data/input/cloud/netlist/363_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/363_incl_switches.txt
@@ -1,10 +1,12 @@
 Switch setup: [Default]
 
-	.5M.3 <-> .5M.3 <-> 100K.1
-	100K.1 <-> 100K.2 <-> 10K.2 <-> 10K.2 <-> 741.3 <-> 741.7 <-> D1.2 <-> D2.1
-	100K.2 <-> 741.2 <-> 741.6 <-> C1.1
+	.5M.1 <-> .5M.1 <-> 741.1 <-> 741.5
+	.5M.2 <-> .5M.2 <-> .5M.3 <-> .5M.3 <-> 100K.1 <-> 100K.1 <-> 100K.2 <-> 100K.2 <-> 10K.1 <-> 10K.2 <-> 10K.2 <-> 1M.1 <-> 1M.1 <-> 741.2 <-> 741.3 <-> 741.6 <-> 741.7 <-> C1.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2
 	10K.1 <-> C1.2
-	1M.1 <-> D1.1
-	741.1 <-> 741.5
+	1M.1 <-> 1M.1
+	1M.2 <-> 1M.2
+	1M.2 <-> 1M.2
+	1M.3 <-> 1M.3
+	1M.3 <-> 1M.3
 	741.4 <-> 741.8
 
diff --git a/diylc-regression-data/input/cloud/netlist/364_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/364_excl_switches.txt
index 688f5aa8..b603f392 100644
--- a/diylc-regression-data/input/cloud/netlist/364_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/364_excl_switches.txt
@@ -1,7 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> R7.2
-	C2.2 <-> R2.2
-	C7.2 <-> R1.2 <-> R10.2
-	R1.1 <-> R9.1
+	C1.2 <-> R1.1 <-> R9.1
+	C2.1 <-> R2.1
+	C2.2 <-> C7.2 <-> R1.2 <-> R10.2 <-> R2.2
+	C7.1 <-> R10.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/364_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/364_incl_switches.txt
index 688f5aa8..b603f392 100644
--- a/diylc-regression-data/input/cloud/netlist/364_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/364_incl_switches.txt
@@ -1,7 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> R7.2
-	C2.2 <-> R2.2
-	C7.2 <-> R1.2 <-> R10.2
-	R1.1 <-> R9.1
+	C1.2 <-> R1.1 <-> R9.1
+	C2.1 <-> R2.1
+	C2.2 <-> C7.2 <-> R1.2 <-> R10.2 <-> R2.2
+	C7.1 <-> R10.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/365_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/365_excl_switches.txt
index 04b0332f..16412387 100644
--- a/diylc-regression-data/input/cloud/netlist/365_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/365_excl_switches.txt
@@ -1,12 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> R2.2 <-> R7.2
+	C1.1 <-> R2.2 <-> R6.2 <-> R7.2
 	C1.2 <-> R3.1
-	C5.1 <-> R9.1
-	C7.1 <-> R8.1
-	C7.2 <-> R1.2
-	C9.1 <-> R5.1 <-> R6.1
-	C9.2 <-> R4.2
+	C5.1 <-> C7.1 <-> C9.1 <-> R5.1 <-> R6.1 <-> R8.1 <-> R9.1
+	C5.2 <-> C7.2 <-> C9.2 <-> R1.2 <-> R4.2
 	R1.1 <-> R2.1 <-> R4.1
 	R3.2 <-> R5.2 <-> R8.2 <-> R9.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/365_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/365_incl_switches.txt
index 04b0332f..16412387 100644
--- a/diylc-regression-data/input/cloud/netlist/365_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/365_incl_switches.txt
@@ -1,12 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> R2.2 <-> R7.2
+	C1.1 <-> R2.2 <-> R6.2 <-> R7.2
 	C1.2 <-> R3.1
-	C5.1 <-> R9.1
-	C7.1 <-> R8.1
-	C7.2 <-> R1.2
-	C9.1 <-> R5.1 <-> R6.1
-	C9.2 <-> R4.2
+	C5.1 <-> C7.1 <-> C9.1 <-> R5.1 <-> R6.1 <-> R8.1 <-> R9.1
+	C5.2 <-> C7.2 <-> C9.2 <-> R1.2 <-> R4.2
 	R1.1 <-> R2.1 <-> R4.1
 	R3.2 <-> R5.2 <-> R8.2 <-> R9.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/367_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/367_excl_switches.txt
index fc084ead..a269fbde 100644
--- a/diylc-regression-data/input/cloud/netlist/367_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/367_excl_switches.txt
@@ -1,49 +1,5 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> IC1.20 <-> IC2.1 <-> IC2.10 <-> IC3.14 <-> PH1.2 <-> PH1.22 <-> R1.2 <-> X1.1
-	C1.2 <-> IC1.16 <-> IC3.16 <-> PH1.18
-	C2.2 <-> IC1.18
-	C3.1 <-> IC1.21 <-> IC1.30 <-> IC2.11 <-> IC3.15 <-> PH1.1 <-> PH1.21
-	C3.2 <-> IC1.9 <-> PH1.11 <-> R1.1
-	IC1.1 <-> PH1.3
-	IC1.10 <-> PH1.12
-	IC1.11 <-> PH1.13
-	IC1.12 <-> PH1.14
-	IC1.13 <-> PH1.15
-	IC1.14 <-> PH1.16
-	IC1.15 <-> PH1.17
-	IC1.17 <-> PH1.19
-	IC1.19 <-> X1.2
-	IC1.2 <-> PH1.4
-	IC1.22 <-> IC2.2 <-> IC3.24
-	IC1.23 <-> IC2.3 <-> IC3.25
-	IC1.24 <-> IC2.4 <-> IC3.26
-	IC1.25 <-> IC2.5 <-> IC3.11
-	IC1.26 <-> IC2.6 <-> IC3.27
-	IC1.27 <-> IC2.7 <-> IC3.12
-	IC1.28 <-> IC2.8 <-> IC3.28
-	IC1.29 <-> IC2.9 <-> IC3.13
-	IC1.3 <-> PH1.5
-	IC1.31 <-> IC2.20
-	IC1.32 <-> IC3.21
-	IC1.34 <-> IC3.1
-	IC1.35 <-> IC3.17
-	IC1.36 <-> IC3.2
-	IC1.37 <-> IC3.20
-	IC1.38 <-> IC3.22
-	IC1.39 <-> IC3.19
-	IC1.4 <-> PH1.6
-	IC1.40 <-> IC3.18
-	IC1.5 <-> PH1.7
-	IC1.6 <-> PH1.8
-	IC1.7 <-> PH1.9
-	IC1.8 <-> PH1.10
-	IC2.12 <-> IC3.3
-	IC2.13 <-> IC3.4
-	IC2.14 <-> IC3.5
-	IC2.15 <-> IC3.6
-	IC2.16 <-> IC3.7
-	IC2.17 <-> IC3.8
-	IC2.18 <-> IC3.9
-	IC2.19 <-> IC3.10
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.14 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.20 <-> IC1.21 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.34 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.17 <-> IC2.18 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.11 <-> IC3.12 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.22 <-> IC3.23 <-> IC3.25 <-> IC3.26 <-> IC3.28 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> PH1.1 <-> PH1.10 <-> PH1.12 <-> PH1.13 <-> PH1.15 <-> PH1.16 <-> PH1.18 <-> PH1.19 <-> PH1.2 <-> PH1.20 <-> PH1.21 <-> PH1.22 <-> PH1.3 <-> PH1.5 <-> PH1.6 <-> PH1.7 <-> PH1.9 <-> R1.2 <-> X1.1 <-> X1.2
+	C3.2 <-> IC1.12 <-> IC1.15 <-> IC1.2 <-> IC1.22 <-> IC1.26 <-> IC1.29 <-> IC1.32 <-> IC1.35 <-> IC1.6 <-> IC1.9 <-> IC2.12 <-> IC2.16 <-> IC2.19 <-> IC2.2 <-> IC2.6 <-> IC2.9 <-> IC3.10 <-> IC3.13 <-> IC3.17 <-> IC3.21 <-> IC3.24 <-> IC3.27 <-> IC3.3 <-> IC3.7 <-> PH1.11 <-> PH1.14 <-> PH1.17 <-> PH1.4 <-> PH1.8 <-> R1.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/367_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/367_incl_switches.txt
index fc084ead..a269fbde 100644
--- a/diylc-regression-data/input/cloud/netlist/367_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/367_incl_switches.txt
@@ -1,49 +1,5 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> IC1.20 <-> IC2.1 <-> IC2.10 <-> IC3.14 <-> PH1.2 <-> PH1.22 <-> R1.2 <-> X1.1
-	C1.2 <-> IC1.16 <-> IC3.16 <-> PH1.18
-	C2.2 <-> IC1.18
-	C3.1 <-> IC1.21 <-> IC1.30 <-> IC2.11 <-> IC3.15 <-> PH1.1 <-> PH1.21
-	C3.2 <-> IC1.9 <-> PH1.11 <-> R1.1
-	IC1.1 <-> PH1.3
-	IC1.10 <-> PH1.12
-	IC1.11 <-> PH1.13
-	IC1.12 <-> PH1.14
-	IC1.13 <-> PH1.15
-	IC1.14 <-> PH1.16
-	IC1.15 <-> PH1.17
-	IC1.17 <-> PH1.19
-	IC1.19 <-> X1.2
-	IC1.2 <-> PH1.4
-	IC1.22 <-> IC2.2 <-> IC3.24
-	IC1.23 <-> IC2.3 <-> IC3.25
-	IC1.24 <-> IC2.4 <-> IC3.26
-	IC1.25 <-> IC2.5 <-> IC3.11
-	IC1.26 <-> IC2.6 <-> IC3.27
-	IC1.27 <-> IC2.7 <-> IC3.12
-	IC1.28 <-> IC2.8 <-> IC3.28
-	IC1.29 <-> IC2.9 <-> IC3.13
-	IC1.3 <-> PH1.5
-	IC1.31 <-> IC2.20
-	IC1.32 <-> IC3.21
-	IC1.34 <-> IC3.1
-	IC1.35 <-> IC3.17
-	IC1.36 <-> IC3.2
-	IC1.37 <-> IC3.20
-	IC1.38 <-> IC3.22
-	IC1.39 <-> IC3.19
-	IC1.4 <-> PH1.6
-	IC1.40 <-> IC3.18
-	IC1.5 <-> PH1.7
-	IC1.6 <-> PH1.8
-	IC1.7 <-> PH1.9
-	IC1.8 <-> PH1.10
-	IC2.12 <-> IC3.3
-	IC2.13 <-> IC3.4
-	IC2.14 <-> IC3.5
-	IC2.15 <-> IC3.6
-	IC2.16 <-> IC3.7
-	IC2.17 <-> IC3.8
-	IC2.18 <-> IC3.9
-	IC2.19 <-> IC3.10
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.14 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.20 <-> IC1.21 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.34 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.17 <-> IC2.18 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.11 <-> IC3.12 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.22 <-> IC3.23 <-> IC3.25 <-> IC3.26 <-> IC3.28 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> PH1.1 <-> PH1.10 <-> PH1.12 <-> PH1.13 <-> PH1.15 <-> PH1.16 <-> PH1.18 <-> PH1.19 <-> PH1.2 <-> PH1.20 <-> PH1.21 <-> PH1.22 <-> PH1.3 <-> PH1.5 <-> PH1.6 <-> PH1.7 <-> PH1.9 <-> R1.2 <-> X1.1 <-> X1.2
+	C3.2 <-> IC1.12 <-> IC1.15 <-> IC1.2 <-> IC1.22 <-> IC1.26 <-> IC1.29 <-> IC1.32 <-> IC1.35 <-> IC1.6 <-> IC1.9 <-> IC2.12 <-> IC2.16 <-> IC2.19 <-> IC2.2 <-> IC2.6 <-> IC2.9 <-> IC3.10 <-> IC3.13 <-> IC3.17 <-> IC3.21 <-> IC3.24 <-> IC3.27 <-> IC3.3 <-> IC3.7 <-> PH1.11 <-> PH1.14 <-> PH1.17 <-> PH1.4 <-> PH1.8 <-> R1.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/368_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/368_excl_switches.txt
index fc084ead..a269fbde 100644
--- a/diylc-regression-data/input/cloud/netlist/368_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/368_excl_switches.txt
@@ -1,49 +1,5 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> IC1.20 <-> IC2.1 <-> IC2.10 <-> IC3.14 <-> PH1.2 <-> PH1.22 <-> R1.2 <-> X1.1
-	C1.2 <-> IC1.16 <-> IC3.16 <-> PH1.18
-	C2.2 <-> IC1.18
-	C3.1 <-> IC1.21 <-> IC1.30 <-> IC2.11 <-> IC3.15 <-> PH1.1 <-> PH1.21
-	C3.2 <-> IC1.9 <-> PH1.11 <-> R1.1
-	IC1.1 <-> PH1.3
-	IC1.10 <-> PH1.12
-	IC1.11 <-> PH1.13
-	IC1.12 <-> PH1.14
-	IC1.13 <-> PH1.15
-	IC1.14 <-> PH1.16
-	IC1.15 <-> PH1.17
-	IC1.17 <-> PH1.19
-	IC1.19 <-> X1.2
-	IC1.2 <-> PH1.4
-	IC1.22 <-> IC2.2 <-> IC3.24
-	IC1.23 <-> IC2.3 <-> IC3.25
-	IC1.24 <-> IC2.4 <-> IC3.26
-	IC1.25 <-> IC2.5 <-> IC3.11
-	IC1.26 <-> IC2.6 <-> IC3.27
-	IC1.27 <-> IC2.7 <-> IC3.12
-	IC1.28 <-> IC2.8 <-> IC3.28
-	IC1.29 <-> IC2.9 <-> IC3.13
-	IC1.3 <-> PH1.5
-	IC1.31 <-> IC2.20
-	IC1.32 <-> IC3.21
-	IC1.34 <-> IC3.1
-	IC1.35 <-> IC3.17
-	IC1.36 <-> IC3.2
-	IC1.37 <-> IC3.20
-	IC1.38 <-> IC3.22
-	IC1.39 <-> IC3.19
-	IC1.4 <-> PH1.6
-	IC1.40 <-> IC3.18
-	IC1.5 <-> PH1.7
-	IC1.6 <-> PH1.8
-	IC1.7 <-> PH1.9
-	IC1.8 <-> PH1.10
-	IC2.12 <-> IC3.3
-	IC2.13 <-> IC3.4
-	IC2.14 <-> IC3.5
-	IC2.15 <-> IC3.6
-	IC2.16 <-> IC3.7
-	IC2.17 <-> IC3.8
-	IC2.18 <-> IC3.9
-	IC2.19 <-> IC3.10
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.14 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.20 <-> IC1.21 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.34 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.17 <-> IC2.18 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.11 <-> IC3.12 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.22 <-> IC3.23 <-> IC3.25 <-> IC3.26 <-> IC3.28 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> PH1.1 <-> PH1.10 <-> PH1.12 <-> PH1.13 <-> PH1.15 <-> PH1.16 <-> PH1.18 <-> PH1.19 <-> PH1.2 <-> PH1.20 <-> PH1.21 <-> PH1.22 <-> PH1.3 <-> PH1.5 <-> PH1.6 <-> PH1.7 <-> PH1.9 <-> R1.2 <-> X1.1 <-> X1.2
+	C3.2 <-> IC1.12 <-> IC1.15 <-> IC1.2 <-> IC1.22 <-> IC1.26 <-> IC1.29 <-> IC1.32 <-> IC1.35 <-> IC1.6 <-> IC1.9 <-> IC2.12 <-> IC2.16 <-> IC2.19 <-> IC2.2 <-> IC2.6 <-> IC2.9 <-> IC3.10 <-> IC3.13 <-> IC3.17 <-> IC3.21 <-> IC3.24 <-> IC3.27 <-> IC3.3 <-> IC3.7 <-> PH1.11 <-> PH1.14 <-> PH1.17 <-> PH1.4 <-> PH1.8 <-> R1.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/368_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/368_incl_switches.txt
index fc084ead..a269fbde 100644
--- a/diylc-regression-data/input/cloud/netlist/368_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/368_incl_switches.txt
@@ -1,49 +1,5 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> IC1.20 <-> IC2.1 <-> IC2.10 <-> IC3.14 <-> PH1.2 <-> PH1.22 <-> R1.2 <-> X1.1
-	C1.2 <-> IC1.16 <-> IC3.16 <-> PH1.18
-	C2.2 <-> IC1.18
-	C3.1 <-> IC1.21 <-> IC1.30 <-> IC2.11 <-> IC3.15 <-> PH1.1 <-> PH1.21
-	C3.2 <-> IC1.9 <-> PH1.11 <-> R1.1
-	IC1.1 <-> PH1.3
-	IC1.10 <-> PH1.12
-	IC1.11 <-> PH1.13
-	IC1.12 <-> PH1.14
-	IC1.13 <-> PH1.15
-	IC1.14 <-> PH1.16
-	IC1.15 <-> PH1.17
-	IC1.17 <-> PH1.19
-	IC1.19 <-> X1.2
-	IC1.2 <-> PH1.4
-	IC1.22 <-> IC2.2 <-> IC3.24
-	IC1.23 <-> IC2.3 <-> IC3.25
-	IC1.24 <-> IC2.4 <-> IC3.26
-	IC1.25 <-> IC2.5 <-> IC3.11
-	IC1.26 <-> IC2.6 <-> IC3.27
-	IC1.27 <-> IC2.7 <-> IC3.12
-	IC1.28 <-> IC2.8 <-> IC3.28
-	IC1.29 <-> IC2.9 <-> IC3.13
-	IC1.3 <-> PH1.5
-	IC1.31 <-> IC2.20
-	IC1.32 <-> IC3.21
-	IC1.34 <-> IC3.1
-	IC1.35 <-> IC3.17
-	IC1.36 <-> IC3.2
-	IC1.37 <-> IC3.20
-	IC1.38 <-> IC3.22
-	IC1.39 <-> IC3.19
-	IC1.4 <-> PH1.6
-	IC1.40 <-> IC3.18
-	IC1.5 <-> PH1.7
-	IC1.6 <-> PH1.8
-	IC1.7 <-> PH1.9
-	IC1.8 <-> PH1.10
-	IC2.12 <-> IC3.3
-	IC2.13 <-> IC3.4
-	IC2.14 <-> IC3.5
-	IC2.15 <-> IC3.6
-	IC2.16 <-> IC3.7
-	IC2.17 <-> IC3.8
-	IC2.18 <-> IC3.9
-	IC2.19 <-> IC3.10
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.13 <-> IC1.14 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.20 <-> IC1.21 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.27 <-> IC1.28 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.34 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.17 <-> IC2.18 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.7 <-> IC2.8 <-> IC3.1 <-> IC3.11 <-> IC3.12 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.22 <-> IC3.23 <-> IC3.25 <-> IC3.26 <-> IC3.28 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> PH1.1 <-> PH1.10 <-> PH1.12 <-> PH1.13 <-> PH1.15 <-> PH1.16 <-> PH1.18 <-> PH1.19 <-> PH1.2 <-> PH1.20 <-> PH1.21 <-> PH1.22 <-> PH1.3 <-> PH1.5 <-> PH1.6 <-> PH1.7 <-> PH1.9 <-> R1.2 <-> X1.1 <-> X1.2
+	C3.2 <-> IC1.12 <-> IC1.15 <-> IC1.2 <-> IC1.22 <-> IC1.26 <-> IC1.29 <-> IC1.32 <-> IC1.35 <-> IC1.6 <-> IC1.9 <-> IC2.12 <-> IC2.16 <-> IC2.19 <-> IC2.2 <-> IC2.6 <-> IC2.9 <-> IC3.10 <-> IC3.13 <-> IC3.17 <-> IC3.21 <-> IC3.24 <-> IC3.27 <-> IC3.3 <-> IC3.7 <-> PH1.11 <-> PH1.14 <-> PH1.17 <-> PH1.4 <-> PH1.8 <-> R1.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt
index cfa75ebb..572ba3b4 100644
--- a/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/369_excl_switches.txt
@@ -1,20 +1,17 @@
 Switch setup: [Default]
 
+	.1 <-> C6.2 <-> R10.1 <-> R10.2 <-> R10.3 <-> R11.1 <-> R2.2 <-> R5.2 <-> R6.1 <-> R9.2
 	.1 <-> PLC86.5
-	.1 <-> R11.1 <-> R6.1
 	.2 <-> PLC86.4
 	.2 <-> PLC86.6
 	C1.2 <-> PLC86.9 <-> R2.1
 	C2.1 <-> R3.1 <-> R6.2
 	C2.2 <-> C5.2 <-> R7.2
-	C3.1 <-> R12.3 <-> R4.1 <-> R5.1
+	C3.1 <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1
 	C3.1 <-> R7.1 <-> R8.1
 	C3.2 <-> PLC86.1 <-> R3.2
 	C3.2 <-> PLC86.8 <-> R4.2
 	C5.1 <-> PLC86.3 <-> R9.1
 	C6.1 <-> PLC86.7 <-> R11.2
-	C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2
 	PLC86.2 <-> R8.2
-	R10.1 <-> R9.2
-	R12.1 <-> R12.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt
index f26e988e..1645fe39 100644
--- a/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/369_incl_switches.txt
@@ -3,68 +3,56 @@ Switch setup: [.ON1:.ON1]
 	C1.2 <-> PLC86.9 <-> R2.1
 	C2.1 <-> R3.1 <-> R6.2
 	C2.2 <-> C5.2 <-> R7.2
-	C3.1 <-> R12.3 <-> R4.1 <-> R5.1
+	C3.1 <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1
 	C3.1 <-> R7.1 <-> R8.1
 	C3.2 <-> PLC86.1 <-> R3.2
 	C3.2 <-> PLC86.8 <-> R4.2
 	C5.1 <-> PLC86.3 <-> R9.1
 	C6.1 <-> PLC86.7 <-> R11.2
-	C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2
+	C6.2 <-> PLC86.4 <-> R10.1 <-> R10.2 <-> R10.3 <-> R11.1 <-> R2.2 <-> R5.2 <-> R6.1 <-> R9.2
 	PLC86.2 <-> R8.2
-	PLC86.4 <-> R11.1 <-> R6.1
 	PLC86.5 <-> PLC86.6
-	R10.1 <-> R9.2
-	R12.1 <-> R12.2
 
 Switch setup: [.ON1:.ON2]
 
 	C1.2 <-> PLC86.9 <-> R2.1
 	C2.1 <-> R3.1 <-> R6.2
 	C2.2 <-> C5.2 <-> R7.2
-	C3.1 <-> R12.3 <-> R4.1 <-> R5.1
+	C3.1 <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1
 	C3.1 <-> R7.1 <-> R8.1
 	C3.2 <-> PLC86.1 <-> R3.2
 	C3.2 <-> PLC86.8 <-> R4.2
 	C5.1 <-> PLC86.3 <-> R9.1
 	C6.1 <-> PLC86.7 <-> R11.2
-	C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2
+	C6.2 <-> PLC86.4 <-> R10.1 <-> R10.2 <-> R10.3 <-> R11.1 <-> R2.2 <-> R5.2 <-> R6.1 <-> R9.2
 	PLC86.2 <-> R8.2
-	PLC86.4 <-> R11.1 <-> R6.1
-	R10.1 <-> R9.2
-	R12.1 <-> R12.2
 
 Switch setup: [.ON2:.ON1]
 
 	C1.2 <-> PLC86.9 <-> R2.1
 	C2.1 <-> R3.1 <-> R6.2
 	C2.2 <-> C5.2 <-> R7.2
-	C3.1 <-> R12.3 <-> R4.1 <-> R5.1
+	C3.1 <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1
 	C3.1 <-> R7.1 <-> R8.1
 	C3.2 <-> PLC86.1 <-> R3.2
 	C3.2 <-> PLC86.8 <-> R4.2
 	C5.1 <-> PLC86.3 <-> R9.1
 	C6.1 <-> PLC86.7 <-> R11.2
-	C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2
+	C6.2 <-> R10.1 <-> R10.2 <-> R10.3 <-> R11.1 <-> R2.2 <-> R5.2 <-> R6.1 <-> R9.2
 	PLC86.2 <-> R8.2
 	PLC86.5 <-> PLC86.6
-	R10.1 <-> R9.2
-	R11.1 <-> R6.1
-	R12.1 <-> R12.2
 
 Switch setup: [.ON2:.ON2]
 
 	C1.2 <-> PLC86.9 <-> R2.1
 	C2.1 <-> R3.1 <-> R6.2
 	C2.2 <-> C5.2 <-> R7.2
-	C3.1 <-> R12.3 <-> R4.1 <-> R5.1
+	C3.1 <-> R12.1 <-> R12.2 <-> R12.3 <-> R4.1 <-> R5.1
 	C3.1 <-> R7.1 <-> R8.1
 	C3.2 <-> PLC86.1 <-> R3.2
 	C3.2 <-> PLC86.8 <-> R4.2
 	C5.1 <-> PLC86.3 <-> R9.1
 	C6.1 <-> PLC86.7 <-> R11.2
-	C6.2 <-> R10.2 <-> R10.3 <-> R2.2 <-> R5.2
+	C6.2 <-> R10.1 <-> R10.2 <-> R10.3 <-> R11.1 <-> R2.2 <-> R5.2 <-> R6.1 <-> R9.2
 	PLC86.2 <-> R8.2
-	R10.1 <-> R9.2
-	R11.1 <-> R6.1
-	R12.1 <-> R12.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/372_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/372_excl_switches.txt
index 2ca99ffc..628d11fd 100644
--- a/diylc-regression-data/input/cloud/netlist/372_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/372_excl_switches.txt
@@ -6,9 +6,7 @@ Switch setup: [Default]
 	10 nF 250 V.2 <-> R2.2
 	3,3 nF  100 V.1 <-> R1.2
 	3,3 nF  100 V.2 <-> C1.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> R2.1 <-> R3.2 <-> R4.2 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> R9.2
-	3,3 nF  100 V.2 <-> R2.1
 	C1.1 <-> R5.2 <-> R8.1
 	C2.1 <-> R7.1
 	R3.1 <-> R9.1
-	R4.2 <-> R7.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/372_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/372_incl_switches.txt
index 2ca99ffc..628d11fd 100644
--- a/diylc-regression-data/input/cloud/netlist/372_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/372_incl_switches.txt
@@ -6,9 +6,7 @@ Switch setup: [Default]
 	10 nF 250 V.2 <-> R2.2
 	3,3 nF  100 V.1 <-> R1.2
 	3,3 nF  100 V.2 <-> C1.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> R2.1 <-> R3.2 <-> R4.2 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> R9.2
-	3,3 nF  100 V.2 <-> R2.1
 	C1.1 <-> R5.2 <-> R8.1
 	C2.1 <-> R7.1
 	R3.1 <-> R9.1
-	R4.2 <-> R7.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/377_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/377_excl_switches.txt
index 2e6ad73c..34209492 100644
--- a/diylc-regression-data/input/cloud/netlist/377_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/377_excl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
-	D1.1 <-> IC1.3 <-> J9.Ring
-	D1.2 <-> IC1.2 <-> R1.2
-	IC1.5 <-> R2.1
-	IC1.7 <-> R2.2
-	J9.Tip <-> R1.1
+	D1.1 <-> IC1.3 <-> IC1.7 <-> J9.Ring <-> R2.2
+	D1.2 <-> IC1.2 <-> IC1.6 <-> R1.2
+	IC1.1 <-> IC1.5 <-> J9.Tip <-> R1.1 <-> R2.1
+	IC1.4 <-> IC1.8
 
diff --git a/diylc-regression-data/input/cloud/netlist/377_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/377_incl_switches.txt
index 2e6ad73c..34209492 100644
--- a/diylc-regression-data/input/cloud/netlist/377_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/377_incl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
-	D1.1 <-> IC1.3 <-> J9.Ring
-	D1.2 <-> IC1.2 <-> R1.2
-	IC1.5 <-> R2.1
-	IC1.7 <-> R2.2
-	J9.Tip <-> R1.1
+	D1.1 <-> IC1.3 <-> IC1.7 <-> J9.Ring <-> R2.2
+	D1.2 <-> IC1.2 <-> IC1.6 <-> R1.2
+	IC1.1 <-> IC1.5 <-> J9.Tip <-> R1.1 <-> R2.1
+	IC1.4 <-> IC1.8
 
diff --git a/diylc-regression-data/input/cloud/netlist/379_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/379_excl_switches.txt
index c08b6a5e..df9959b4 100644
--- a/diylc-regression-data/input/cloud/netlist/379_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/379_excl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
-	.1 <-> 1N4148.2 <-> 6N139.2
-	1N4148.1 <-> 6N139.3
-	6N139.5 <-> R1.2
-	6N139.7 <-> R1.1
+	.1 <-> 1N4148.2 <-> 6N139.2 <-> 6N139.6
+	1N4148.1 <-> 6N139.3 <-> 6N139.7 <-> R1.1
+	6N139.1 <-> 6N139.5 <-> R1.2
+	6N139.4 <-> 6N139.8
 
diff --git a/diylc-regression-data/input/cloud/netlist/379_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/379_incl_switches.txt
index c08b6a5e..df9959b4 100644
--- a/diylc-regression-data/input/cloud/netlist/379_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/379_incl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
-	.1 <-> 1N4148.2 <-> 6N139.2
-	1N4148.1 <-> 6N139.3
-	6N139.5 <-> R1.2
-	6N139.7 <-> R1.1
+	.1 <-> 1N4148.2 <-> 6N139.2 <-> 6N139.6
+	1N4148.1 <-> 6N139.3 <-> 6N139.7 <-> R1.1
+	6N139.1 <-> 6N139.5 <-> R1.2
+	6N139.4 <-> 6N139.8
 
diff --git a/diylc-regression-data/input/cloud/netlist/381_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/381_excl_switches.txt
index 7c241322..516ac39c 100644
--- a/diylc-regression-data/input/cloud/netlist/381_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/381_excl_switches.txt
@@ -1,6 +1,4 @@
 Switch setup: [Default]
 
-	40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.2 <-> VR1.3
-	C3.2 <-> R11.1 <-> R12.1
-	R12.2 <-> R13.1
+	40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.1 <-> VR1.2 <-> VR1.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/381_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/381_incl_switches.txt
index 7c241322..516ac39c 100644
--- a/diylc-regression-data/input/cloud/netlist/381_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/381_incl_switches.txt
@@ -1,6 +1,4 @@
 Switch setup: [Default]
 
-	40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.2 <-> VR1.3
-	C3.2 <-> R11.1 <-> R12.1
-	R12.2 <-> R13.1
+	40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.1 <-> VR1.2 <-> VR1.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/382_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/382_excl_switches.txt
index 7f1d9a39..516ac39c 100644
--- a/diylc-regression-data/input/cloud/netlist/382_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/382_excl_switches.txt
@@ -1,6 +1,4 @@
 Switch setup: [Default]
 
-	40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.2 <-> VR1.3
-	C3.2 <-> R11.1 <-> R12.1
-	R12.2 <-> R13.1
+	40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.1 <-> VR1.2 <-> VR1.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/382_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/382_incl_switches.txt
index 7f1d9a39..516ac39c 100644
--- a/diylc-regression-data/input/cloud/netlist/382_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/382_incl_switches.txt
@@ -1,6 +1,4 @@
 Switch setup: [Default]
 
-	40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.2 <-> VR1.3
-	C3.2 <-> R11.1 <-> R12.1
-	R12.2 <-> R13.1
+	40106.1 <-> 40106.10 <-> 40106.11 <-> 40106.12 <-> 40106.13 <-> 40106.14 <-> 40106.2 <-> 40106.3 <-> 40106.4 <-> 40106.5 <-> 40106.6 <-> 40106.7 <-> 40106.8 <-> 40106.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1 <-> R9.2 <-> TL074.1 <-> TL074.10 <-> TL074.11 <-> TL074.12 <-> TL074.13 <-> TL074.14 <-> TL074.2 <-> TL074.3 <-> TL074.4 <-> TL074.5 <-> TL074.6 <-> TL074.7 <-> TL074.8 <-> TL074.9 <-> VR1.1 <-> VR1.2 <-> VR1.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt
index 67c3dd01..6db172e6 100644
--- a/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/384_excl_switches.txt
@@ -1,9 +1,7 @@
 Switch setup: [Default]
 
 	C10.1 <-> C9.2 <-> PR6 (GAIN).3 <-> R10.2 <-> R9.1
-	C10.1 <-> R10.2
 	C10.2 <-> C11.1 <-> C11.2 <-> C12.2 <-> C18.2 <-> C19.1 <-> C20.1 <-> C21.1 <-> GND <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> R10.1 <-> R11.1 <-> R11.2 <-> R13.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R2.1 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> V1.2 <-> V1.4 <-> V2.1 <-> V2.4 <-> V2.6 <-> V2.7 <-> V2.8 <-> V2.9
-	C11.2 <-> R11.1
 	C12.1 <-> R2.2 <-> V1.3
 	C15.1 <-> R14.2 <-> V1.1
 	C15.2 <-> R15.2
@@ -14,7 +12,6 @@ Switch setup: [Default]
 	C20.2 <-> C21.2 <-> C22.2 <-> PR10 (VOLUME).1 <-> PR10 (VOLUME).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).2 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R24.2
 	C22.1 <-> R24.1
 	C9.1 <-> INPUT.2 <-> R9.2
-	C9.1 <-> R9.2
 	R12.1 <-> R13.1 <-> R14.1
 	R15.1 <-> R16.2 <-> V1.7
 	R17.2 <-> V1.8
diff --git a/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt
index 67c3dd01..6db172e6 100644
--- a/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/384_incl_switches.txt
@@ -1,9 +1,7 @@
 Switch setup: [Default]
 
 	C10.1 <-> C9.2 <-> PR6 (GAIN).3 <-> R10.2 <-> R9.1
-	C10.1 <-> R10.2
 	C10.2 <-> C11.1 <-> C11.2 <-> C12.2 <-> C18.2 <-> C19.1 <-> C20.1 <-> C21.1 <-> GND <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> R10.1 <-> R11.1 <-> R11.2 <-> R13.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R2.1 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> V1.2 <-> V1.4 <-> V2.1 <-> V2.4 <-> V2.6 <-> V2.7 <-> V2.8 <-> V2.9
-	C11.2 <-> R11.1
 	C12.1 <-> R2.2 <-> V1.3
 	C15.1 <-> R14.2 <-> V1.1
 	C15.2 <-> R15.2
@@ -14,7 +12,6 @@ Switch setup: [Default]
 	C20.2 <-> C21.2 <-> C22.2 <-> PR10 (VOLUME).1 <-> PR10 (VOLUME).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).2 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R24.2
 	C22.1 <-> R24.1
 	C9.1 <-> INPUT.2 <-> R9.2
-	C9.1 <-> R9.2
 	R12.1 <-> R13.1 <-> R14.1
 	R15.1 <-> R16.2 <-> V1.7
 	R17.2 <-> V1.8
diff --git a/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt
index bf615bab..0df4f0cc 100644
--- a/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/385_excl_switches.txt
@@ -4,4 +4,5 @@ Switch setup: [Default]
 	C10.2 <-> C9.1 <-> PR6 (GAIN).3 <-> R10.2
 	C9.2 <-> INPUT.1 <-> R9.1
 	GND <-> PR6 (GAIN).1 <-> R10.1
+	PR10 (VOLUME).2 <-> PR10 (VOLUME).3
 
diff --git a/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt
index bf615bab..0df4f0cc 100644
--- a/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/385_incl_switches.txt
@@ -4,4 +4,5 @@ Switch setup: [Default]
 	C10.2 <-> C9.1 <-> PR6 (GAIN).3 <-> R10.2
 	C9.2 <-> INPUT.1 <-> R9.1
 	GND <-> PR6 (GAIN).1 <-> R10.1
+	PR10 (VOLUME).2 <-> PR10 (VOLUME).3
 
diff --git a/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt
index add967e1..0e600d04 100644
--- a/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/386_excl_switches.txt
@@ -1,29 +1,20 @@
 Switch setup: [Default]
 
-	(MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C17.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> SW1.1 <-> SW1.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7
+	(MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C16.1 <-> C17.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).2 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> SW1.1 <-> SW1.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7
 	C10.1 <-> R7.1 <-> V2.1
-	C10.1 <-> V2.1
 	C10.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2
 	C11.2 <-> C9.2 <-> R8.1 <-> V2.6
 	C13.1 <-> R17.1 <-> V3.3
 	C14.1 <-> PR9 (HIGH).3
 	C14.2 <-> R19.2
 	C15.2 <-> C16.2 <-> R19.1
-	C16.1 <-> PR8 (MID).2
 	C17.2 <-> V1.7
 	C18.1 <-> SW1.3
-	C2.1 <-> R2.2
-	C2.2 <-> R3.2
-	C3.1 <-> R2.1
 	C3.1 <-> R2.1 <-> V1.1
-	C3.2 <-> R4.1
-	C5.1 <-> PR6 (GAIN).3 <-> R5.2
 	R10.2 <-> V2.7
 	R12.1 <-> R13.1
 	R13.2 <-> V3.2
-	R14.2 <-> V3.1
 	R15.1 <-> V2.3
-	R17.1 <-> V3.3
 	R18.2 <-> V3.8
 	R21.2 <-> R22.1 <-> R23.2
 	R3.1 <-> V1.3
diff --git a/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt
index e673ec5b..bea6f818 100644
--- a/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/386_incl_switches.txt
@@ -1,28 +1,19 @@
 Switch setup: [SW1.ON1, SW1.OFF]
 
-	(MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C17.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7
+	(MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C16.1 <-> C17.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).2 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7
 	C10.1 <-> R7.1 <-> V2.1
-	C10.1 <-> V2.1
 	C10.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2
 	C11.2 <-> C9.2 <-> R8.1 <-> V2.6
 	C13.1 <-> R17.1 <-> V3.3
 	C14.1 <-> PR9 (HIGH).3
 	C14.2 <-> R19.2
 	C15.2 <-> C16.2 <-> R19.1
-	C16.1 <-> PR8 (MID).2
 	C17.2 <-> V1.7
-	C2.1 <-> R2.2
-	C2.2 <-> R3.2
-	C3.1 <-> R2.1
 	C3.1 <-> R2.1 <-> V1.1
-	C3.2 <-> R4.1
-	C5.1 <-> PR6 (GAIN).3 <-> R5.2
 	R10.2 <-> V2.7
 	R12.1 <-> R13.1
 	R13.2 <-> V3.2
-	R14.2 <-> V3.1
 	R15.1 <-> V2.3
-	R17.1 <-> V3.3
 	R18.2 <-> V3.8
 	R21.2 <-> R22.1 <-> R23.2
 	R3.1 <-> V1.3
@@ -30,29 +21,20 @@ Switch setup: [SW1.ON1, SW1.OFF]
 
 Switch setup: [SW1.ON2]
 
-	(MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C17.1 <-> C18.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7
+	(MASTER).1 <-> (MASTER).2 <-> (MASTER).3 <-> C1.1 <-> C12.1 <-> C12.2 <-> C13.2 <-> C15.1 <-> C16.1 <-> C17.1 <-> C18.1 <-> C18.2 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> GND <-> INPUT.1 <-> INPUT.4 <-> OUTPUT.2 <-> OUTPUT.4 <-> PR6 (GAIN).1 <-> PR6 (GAIN).2 <-> PR6 (GAIN).3 <-> PR7 (BASS).1 <-> PR7 (BASS).2 <-> PR7 (BASS).3 <-> PR8 (MID).1 <-> PR8 (MID).2 <-> PR8 (MID).3 <-> PR9 (HIGH).1 <-> PR9 (HIGH).2 <-> R1.1 <-> R1.2 <-> R11.1 <-> R12.2 <-> R14.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R18.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R21.1 <-> R22.2 <-> R24.2 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R9.2 <-> V1.2 <-> V1.6 <-> V1.8 <-> V2.2 <-> V3.1 <-> V3.6 <-> V3.7
 	C10.1 <-> R7.1 <-> V2.1
-	C10.1 <-> V2.1
 	C10.2 <-> C9.1 <-> R10.1 <-> R16.2 <-> R7.2 <-> R8.2
 	C11.2 <-> C9.2 <-> R8.1 <-> V2.6
 	C13.1 <-> R17.1 <-> V3.3
 	C14.1 <-> PR9 (HIGH).3
 	C14.2 <-> R19.2
 	C15.2 <-> C16.2 <-> R19.1
-	C16.1 <-> PR8 (MID).2
 	C17.2 <-> V1.7
-	C2.1 <-> R2.2
-	C2.2 <-> R3.2
-	C3.1 <-> R2.1
 	C3.1 <-> R2.1 <-> V1.1
-	C3.2 <-> R4.1
-	C5.1 <-> PR6 (GAIN).3 <-> R5.2
 	R10.2 <-> V2.7
 	R12.1 <-> R13.1
 	R13.2 <-> V3.2
-	R14.2 <-> V3.1
 	R15.1 <-> V2.3
-	R17.1 <-> V3.3
 	R18.2 <-> V3.8
 	R21.2 <-> R22.1 <-> R23.2
 	R3.1 <-> V1.3
diff --git a/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt
index 160c6583..f257d8bd 100644
--- a/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/388_excl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C14.1 <-> C17.2 <-> C2.2 <-> C3.1 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> GND <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR4 GAIN.2 <-> PR5 VOL.1 <-> PR7 MID.1 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.2 <-> V4.6
-	C1.1 <-> R3.1
+	C1.1 <-> C1.2 <-> C10.1 <-> C14.1 <-> C17.2 <-> C2.2 <-> C3.1 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> GND <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR4 GAIN.2 <-> PR5 VOL.1 <-> PR7 MID.1 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.2 <-> V4.6
+	C10.2 <-> R11.2
 	C14.2 <-> R12.2 <-> R13.1
-	C15.1 <-> R15.2
 	C15.1 <-> R15.2 <-> V4.8
 	C15.2 <-> J4.2 <-> R17.1
 	C17.1 <-> R19.1
@@ -14,18 +13,13 @@ Switch setup: [Default]
 	C3.2 <-> PR1 TREBLE.3
 	C4.1 <-> C5.1 <-> R5.1
 	C4.2 <-> R20.2 <-> R22.2 <-> R23.2 <-> V3.1 <-> V3.7 <-> V3.8
-	C4.2 <-> R22.2
 	C5.2 <-> PR2 BASS.1 <-> PR3 MID.2 <-> PR3 MID.3
 	C6.2 <-> R6.2 <-> V4.3
 	C8.1 <-> PR5 VOL.3
-	C8.2 <-> R7.1
 	C8.2 <-> R7.1 <-> V4.1
-	J4.2 <-> R17.1
 	PR10 VOL.1 <-> R24.1
 	PR2 BASS.2 <-> PR2 BASS.3
 	PR7 MID.3 <-> PR8 BASS.1
-	R1.2 <-> R3.2
-	R12.2 <-> R13.1
 	R14.1 <-> R15.1 <-> R16.2
 	R14.2 <-> V4.7
 	R18.1 <-> R19.2 <-> V3.2
diff --git a/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt
index 160c6583..f257d8bd 100644
--- a/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/388_incl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C14.1 <-> C17.2 <-> C2.2 <-> C3.1 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> GND <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR4 GAIN.2 <-> PR5 VOL.1 <-> PR7 MID.1 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.2 <-> V4.6
-	C1.1 <-> R3.1
+	C1.1 <-> C1.2 <-> C10.1 <-> C14.1 <-> C17.2 <-> C2.2 <-> C3.1 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> GND <-> J1.1 <-> J1.2 <-> J1.4 <-> J4.3 <-> PR4 GAIN.2 <-> PR5 VOL.1 <-> PR7 MID.1 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R12.1 <-> R13.2 <-> R16.1 <-> R17.2 <-> R18.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R22.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R7.2 <-> R8.2 <-> V1.1 <-> V1.2 <-> V1.3 <-> V1.6 <-> V1.7 <-> V1.8 <-> V2.1 <-> V2.2 <-> V2.3 <-> V2.6 <-> V2.7 <-> V2.8 <-> V3.3 <-> V3.6 <-> V4.2 <-> V4.6
+	C10.2 <-> R11.2
 	C14.2 <-> R12.2 <-> R13.1
-	C15.1 <-> R15.2
 	C15.1 <-> R15.2 <-> V4.8
 	C15.2 <-> J4.2 <-> R17.1
 	C17.1 <-> R19.1
@@ -14,18 +13,13 @@ Switch setup: [Default]
 	C3.2 <-> PR1 TREBLE.3
 	C4.1 <-> C5.1 <-> R5.1
 	C4.2 <-> R20.2 <-> R22.2 <-> R23.2 <-> V3.1 <-> V3.7 <-> V3.8
-	C4.2 <-> R22.2
 	C5.2 <-> PR2 BASS.1 <-> PR3 MID.2 <-> PR3 MID.3
 	C6.2 <-> R6.2 <-> V4.3
 	C8.1 <-> PR5 VOL.3
-	C8.2 <-> R7.1
 	C8.2 <-> R7.1 <-> V4.1
-	J4.2 <-> R17.1
 	PR10 VOL.1 <-> R24.1
 	PR2 BASS.2 <-> PR2 BASS.3
 	PR7 MID.3 <-> PR8 BASS.1
-	R1.2 <-> R3.2
-	R12.2 <-> R13.1
 	R14.1 <-> R15.1 <-> R16.2
 	R14.2 <-> V4.7
 	R18.1 <-> R19.2 <-> V3.2
diff --git a/diylc-regression-data/input/cloud/netlist/389_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/389_excl_switches.txt
index e67153c6..60039dbf 100644
--- a/diylc-regression-data/input/cloud/netlist/389_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/389_excl_switches.txt
@@ -1,13 +1,5 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.2 <-> R2.1
-	C1.2 <-> C2.2 <-> IC1.1 <-> R3.2
-	C2.1 <-> IC1.8
-	C3.1 <-> R1.1
-	C3.2 <-> D2.1
-	D1.1 <-> IC1.3
-	D1.2 <-> R3.1
-	D2.2 <-> IC1.4 <-> IC1.5
-	IC1.6 <-> P1.2
-	IC1.7 <-> P1.1 <-> P1.3 <-> R1.2 <-> R2.2
+	C1.1 <-> C3.1 <-> C3.2 <-> D2.1 <-> IC1.2 <-> IC1.6 <-> P1.2 <-> R1.1 <-> R2.1
+	C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> D1.2 <-> D2.2 <-> IC1.1 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> P1.1 <-> P1.3 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/389_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/389_incl_switches.txt
index e67153c6..60039dbf 100644
--- a/diylc-regression-data/input/cloud/netlist/389_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/389_incl_switches.txt
@@ -1,13 +1,5 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.2 <-> R2.1
-	C1.2 <-> C2.2 <-> IC1.1 <-> R3.2
-	C2.1 <-> IC1.8
-	C3.1 <-> R1.1
-	C3.2 <-> D2.1
-	D1.1 <-> IC1.3
-	D1.2 <-> R3.1
-	D2.2 <-> IC1.4 <-> IC1.5
-	IC1.6 <-> P1.2
-	IC1.7 <-> P1.1 <-> P1.3 <-> R1.2 <-> R2.2
+	C1.1 <-> C3.1 <-> C3.2 <-> D2.1 <-> IC1.2 <-> IC1.6 <-> P1.2 <-> R1.1 <-> R2.1
+	C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> D1.2 <-> D2.2 <-> IC1.1 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> P1.1 <-> P1.3 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/391_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/391_excl_switches.txt
index 2cfc3b28..4e54314b 100644
--- a/diylc-regression-data/input/cloud/netlist/391_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/391_excl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
-	10 kohm.1 <-> PH3.2
-	10 kohm.2 <-> PH2.1 <-> PH4.1
-	220 ohm.1 <-> PH2.3 <-> PH3.1 <-> PH4.4
-	220 ohm.2 <-> 220 ohm.2
+	1 mohm.1 <-> 1 mohm.2 <-> 10 kohm.2 <-> 220 ohm.1 <-> PH2.1 <-> PH2.3 <-> PH3.1 <-> PH4.1 <-> PH4.4
+	10 kohm.1 <-> PH3.2 <-> PH4.2
+	220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1
+	220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/391_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/391_incl_switches.txt
index 2cfc3b28..4e54314b 100644
--- a/diylc-regression-data/input/cloud/netlist/391_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/391_incl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
-	10 kohm.1 <-> PH3.2
-	10 kohm.2 <-> PH2.1 <-> PH4.1
-	220 ohm.1 <-> PH2.3 <-> PH3.1 <-> PH4.4
-	220 ohm.2 <-> 220 ohm.2
+	1 mohm.1 <-> 1 mohm.2 <-> 10 kohm.2 <-> 220 ohm.1 <-> PH2.1 <-> PH2.3 <-> PH3.1 <-> PH4.1 <-> PH4.4
+	10 kohm.1 <-> PH3.2 <-> PH4.2
+	220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1
+	220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2
 
diff --git a/diylc-regression-data/input/cloud/netlist/392_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/392_excl_switches.txt
index 120ef996..be65c362 100644
--- a/diylc-regression-data/input/cloud/netlist/392_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/392_excl_switches.txt
@@ -1,13 +1,10 @@
 Switch setup: [Default]
 
-	PH1.1 <-> PH1.14 <-> PH1.3 <-> PH1.9 <-> PH10.3 <-> PH11.2 <-> PH11.4 <-> PH12 <-> PH15 <-> PH2.1 <-> PH2.14 <-> PH2.3 <-> PH2.9 <-> PH3.1 <-> PH3.3 <-> PH4.1 <-> PH4.3 <-> PH5.2 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.3 <-> PH9.2 <-> PH9.4
+	PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.4 <-> PH1.7 <-> PH1.8 <-> PH1.9 <-> PH10.1 <-> PH10.2 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH13.1 <-> PH13.2 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.4 <-> PH2.7 <-> PH2.8 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH3.4 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH4.4 <-> PH5.1 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.2 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5
 	PH1.10 <-> PH2.10
 	PH1.11 <-> PH2.11
-	PH1.12 <-> PH1.13 <-> PH1.2 <-> PH1.7 <-> PH10.1 <-> PH11.3 <-> PH11.5 <-> PH16 <-> PH2.12 <-> PH2.13 <-> PH2.2 <-> PH2.7 <-> PH3.2 <-> PH4.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH8.1 <-> PH9.3 <-> PH9.5
 	PH1.15 <-> PH2.15
-	PH1.4 <-> PH1.8 <-> PH10.2 <-> PH13.1 <-> PH13.2 <-> PH2.4 <-> PH2.8 <-> PH3.4 <-> PH4.4 <-> PH5.1 <-> PH8.2
-	PH1.5 <-> PH2.5
+	PH1.5 <-> PH11.6 <-> PH2.5 <-> PH9.6
 	PH1.6 <-> PH2.6
 	PH11.1 <-> PH9.1
-	PH11.6 <-> PH9.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/392_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/392_incl_switches.txt
index 120ef996..be65c362 100644
--- a/diylc-regression-data/input/cloud/netlist/392_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/392_incl_switches.txt
@@ -1,13 +1,10 @@
 Switch setup: [Default]
 
-	PH1.1 <-> PH1.14 <-> PH1.3 <-> PH1.9 <-> PH10.3 <-> PH11.2 <-> PH11.4 <-> PH12 <-> PH15 <-> PH2.1 <-> PH2.14 <-> PH2.3 <-> PH2.9 <-> PH3.1 <-> PH3.3 <-> PH4.1 <-> PH4.3 <-> PH5.2 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.3 <-> PH9.2 <-> PH9.4
+	PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.4 <-> PH1.7 <-> PH1.8 <-> PH1.9 <-> PH10.1 <-> PH10.2 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH13.1 <-> PH13.2 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.4 <-> PH2.7 <-> PH2.8 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH3.4 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH4.4 <-> PH5.1 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.2 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5
 	PH1.10 <-> PH2.10
 	PH1.11 <-> PH2.11
-	PH1.12 <-> PH1.13 <-> PH1.2 <-> PH1.7 <-> PH10.1 <-> PH11.3 <-> PH11.5 <-> PH16 <-> PH2.12 <-> PH2.13 <-> PH2.2 <-> PH2.7 <-> PH3.2 <-> PH4.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH8.1 <-> PH9.3 <-> PH9.5
 	PH1.15 <-> PH2.15
-	PH1.4 <-> PH1.8 <-> PH10.2 <-> PH13.1 <-> PH13.2 <-> PH2.4 <-> PH2.8 <-> PH3.4 <-> PH4.4 <-> PH5.1 <-> PH8.2
-	PH1.5 <-> PH2.5
+	PH1.5 <-> PH11.6 <-> PH2.5 <-> PH9.6
 	PH1.6 <-> PH2.6
 	PH11.1 <-> PH9.1
-	PH11.6 <-> PH9.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/393_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/393_excl_switches.txt
index 541d4322..be65c362 100644
--- a/diylc-regression-data/input/cloud/netlist/393_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/393_excl_switches.txt
@@ -1,12 +1,10 @@
 Switch setup: [Default]
 
-	PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.7 <-> PH1.9 <-> PH10.1 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.7 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5
+	PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.4 <-> PH1.7 <-> PH1.8 <-> PH1.9 <-> PH10.1 <-> PH10.2 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH13.1 <-> PH13.2 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.4 <-> PH2.7 <-> PH2.8 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH3.4 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH4.4 <-> PH5.1 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.2 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5
 	PH1.10 <-> PH2.10
 	PH1.11 <-> PH2.11
 	PH1.15 <-> PH2.15
-	PH1.4 <-> PH1.8 <-> PH10.2 <-> PH13.1 <-> PH13.2 <-> PH2.4 <-> PH2.8 <-> PH3.4 <-> PH4.4 <-> PH5.1 <-> PH8.2
-	PH1.5 <-> PH2.5
+	PH1.5 <-> PH11.6 <-> PH2.5 <-> PH9.6
 	PH1.6 <-> PH2.6
 	PH11.1 <-> PH9.1
-	PH11.6 <-> PH9.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/393_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/393_incl_switches.txt
index 541d4322..be65c362 100644
--- a/diylc-regression-data/input/cloud/netlist/393_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/393_incl_switches.txt
@@ -1,12 +1,10 @@
 Switch setup: [Default]
 
-	PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.7 <-> PH1.9 <-> PH10.1 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.7 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5
+	PH1.1 <-> PH1.12 <-> PH1.13 <-> PH1.14 <-> PH1.2 <-> PH1.3 <-> PH1.4 <-> PH1.7 <-> PH1.8 <-> PH1.9 <-> PH10.1 <-> PH10.2 <-> PH10.3 <-> PH11.2 <-> PH11.3 <-> PH11.4 <-> PH11.5 <-> PH12 <-> PH13.1 <-> PH13.2 <-> PH15 <-> PH16 <-> PH2.1 <-> PH2.12 <-> PH2.13 <-> PH2.14 <-> PH2.2 <-> PH2.3 <-> PH2.4 <-> PH2.7 <-> PH2.8 <-> PH2.9 <-> PH3.1 <-> PH3.2 <-> PH3.3 <-> PH3.4 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH4.4 <-> PH5.1 <-> PH5.2 <-> PH6.1 <-> PH6.2 <-> PH6.3 <-> PH7.1 <-> PH7.2 <-> PH7.3 <-> PH8.1 <-> PH8.2 <-> PH8.3 <-> PH9.2 <-> PH9.3 <-> PH9.4 <-> PH9.5
 	PH1.10 <-> PH2.10
 	PH1.11 <-> PH2.11
 	PH1.15 <-> PH2.15
-	PH1.4 <-> PH1.8 <-> PH10.2 <-> PH13.1 <-> PH13.2 <-> PH2.4 <-> PH2.8 <-> PH3.4 <-> PH4.4 <-> PH5.1 <-> PH8.2
-	PH1.5 <-> PH2.5
+	PH1.5 <-> PH11.6 <-> PH2.5 <-> PH9.6
 	PH1.6 <-> PH2.6
 	PH11.1 <-> PH9.1
-	PH11.6 <-> PH9.6
 
diff --git a/diylc-regression-data/input/cloud/netlist/394_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/394_excl_switches.txt
index 131dcbb2..e182282a 100644
--- a/diylc-regression-data/input/cloud/netlist/394_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/394_excl_switches.txt
@@ -1,8 +1,5 @@
 Switch setup: [Default]
 
-	1 mohm.2 <-> 10 kohm.2 <-> PH2.1 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.1 <-> PH7.1
-	10 kohm.1 <-> PH8.2
-	220 ohm.1 <-> 220 ohm.2 <-> PH2.4 <-> PH4.1 <-> PH5.3 <-> PH7.3 <-> PH8.1
-	220 ohm.2 <-> PH4.15
-	PH4.3 <-> PH5.2
+	1 mohm.1 <-> 10 kohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> PH4.3 <-> PH5.2 <-> PH7.2 <-> PH8.2
+	1 mohm.2 <-> 10 kohm.2 <-> 220 ohm.1 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> PH2.1 <-> PH2.2 <-> PH2.4 <-> PH4.1 <-> PH4.10 <-> PH4.15 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH4.9 <-> PH5.1 <-> PH5.3 <-> PH7.1 <-> PH7.3 <-> PH8.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/394_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/394_incl_switches.txt
index 131dcbb2..e182282a 100644
--- a/diylc-regression-data/input/cloud/netlist/394_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/394_incl_switches.txt
@@ -1,8 +1,5 @@
 Switch setup: [Default]
 
-	1 mohm.2 <-> 10 kohm.2 <-> PH2.1 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.1 <-> PH7.1
-	10 kohm.1 <-> PH8.2
-	220 ohm.1 <-> 220 ohm.2 <-> PH2.4 <-> PH4.1 <-> PH5.3 <-> PH7.3 <-> PH8.1
-	220 ohm.2 <-> PH4.15
-	PH4.3 <-> PH5.2
+	1 mohm.1 <-> 10 kohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> 220 ohm.1 <-> PH4.3 <-> PH5.2 <-> PH7.2 <-> PH8.2
+	1 mohm.2 <-> 10 kohm.2 <-> 220 ohm.1 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> 220 ohm.2 <-> PH2.1 <-> PH2.2 <-> PH2.4 <-> PH4.1 <-> PH4.10 <-> PH4.15 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH4.9 <-> PH5.1 <-> PH5.3 <-> PH7.1 <-> PH7.3 <-> PH8.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/395_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/395_excl_switches.txt
index 4a7d1e4d..d166f1e9 100644
--- a/diylc-regression-data/input/cloud/netlist/395_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/395_excl_switches.txt
@@ -1,38 +1,14 @@
 Switch setup: [Default]
 
-	1 KOhm.1 <-> 10 KOhm.1 <-> PH1.1 <-> PH13.1 <-> PH15.1 <-> PH2.1 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.2 <-> PH5.5 <-> PH6.6 <-> PH7.16 <-> PH7.2 <-> PH7.5
-	10 KOhm.2 <-> PH14.2
-	220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> PH2.2 <-> PH4.3 <-> PH5.3 <-> PH7.3
-	220 Ohm.1 <-> PH4.15 <-> PH6.5 <-> PH7.15
-	220 Ohm.2 <-> PH1.4 <-> PH13.3 <-> PH14.1 <-> PH15.4 <-> PH2.3 <-> PH4.1 <-> PH5.1 <-> PH7.1
-	220 Ohm.2 <-> PH10
-	220 Ohm.2 <-> PH11
-	220 Ohm.2 <-> PH12
-	220 Ohm.2 <-> PH9
-	PH1.1 <-> PH15.1
-	PH1.2 <-> PH15.2
-	PH1.3 <-> PH15.3
-	PH1.4 <-> PH15.4
-	PH4.1 <-> PH7.1
-	PH4.10 <-> PH7.10
-	PH4.11 <-> PH6.1 <-> PH7.11
-	PH4.11 <-> PH7.11
-	PH4.12 <-> PH6.2 <-> PH7.12
-	PH4.12 <-> PH7.12
-	PH4.13 <-> PH6.3 <-> PH7.13
-	PH4.13 <-> PH7.13
-	PH4.14 <-> PH6.4 <-> PH7.14
-	PH4.14 <-> PH7.14
-	PH4.15 <-> PH7.15
-	PH4.16 <-> PH7.16
-	PH4.2 <-> PH7.2
-	PH4.3 <-> PH7.3
+	1 KOhm.1 <-> 10 KOhm.1 <-> PH1.1 <-> PH13.1 <-> PH15.1 <-> PH2.1 <-> PH4.12 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.2 <-> PH5.5 <-> PH6.2 <-> PH6.6 <-> PH7.12 <-> PH7.16 <-> PH7.2 <-> PH7.5
+	1 KOhm.2 <-> 10 KOhm.2 <-> PH14.2
+	220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> PH13.2 <-> PH2.2 <-> PH4.3 <-> PH5.3 <-> PH7.3
+	220 Ohm.1 <-> 220 Ohm.2 <-> PH1.4 <-> PH13.3 <-> PH14.1 <-> PH15.4 <-> PH2.3 <-> PH4.1 <-> PH4.15 <-> PH5.1 <-> PH6.5 <-> PH7.1 <-> PH7.15
+	220 Ohm.2 <-> 220 Ohm.2 <-> 220 Ohm.2 <-> 220 Ohm.2 <-> PH10 <-> PH11 <-> PH12 <-> PH4.10 <-> PH4.11 <-> PH4.9 <-> PH6.1 <-> PH7.10 <-> PH7.11 <-> PH7.9 <-> PH9
+	PH1.2 <-> PH15.2 <-> PH4.13 <-> PH6.3 <-> PH7.13
+	PH1.3 <-> PH15.3 <-> PH4.14 <-> PH6.4 <-> PH7.14
 	PH4.4 <-> PH5.4 <-> PH7.4
-	PH4.4 <-> PH7.4
-	PH4.5 <-> PH7.5
 	PH4.6 <-> PH5.6 <-> PH7.6
-	PH4.6 <-> PH7.6
 	PH4.7 <-> PH7.7
 	PH4.8 <-> PH7.8
-	PH4.9 <-> PH7.9
 
diff --git a/diylc-regression-data/input/cloud/netlist/395_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/395_incl_switches.txt
index 4a7d1e4d..d166f1e9 100644
--- a/diylc-regression-data/input/cloud/netlist/395_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/395_incl_switches.txt
@@ -1,38 +1,14 @@
 Switch setup: [Default]
 
-	1 KOhm.1 <-> 10 KOhm.1 <-> PH1.1 <-> PH13.1 <-> PH15.1 <-> PH2.1 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.2 <-> PH5.5 <-> PH6.6 <-> PH7.16 <-> PH7.2 <-> PH7.5
-	10 KOhm.2 <-> PH14.2
-	220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> PH2.2 <-> PH4.3 <-> PH5.3 <-> PH7.3
-	220 Ohm.1 <-> PH4.15 <-> PH6.5 <-> PH7.15
-	220 Ohm.2 <-> PH1.4 <-> PH13.3 <-> PH14.1 <-> PH15.4 <-> PH2.3 <-> PH4.1 <-> PH5.1 <-> PH7.1
-	220 Ohm.2 <-> PH10
-	220 Ohm.2 <-> PH11
-	220 Ohm.2 <-> PH12
-	220 Ohm.2 <-> PH9
-	PH1.1 <-> PH15.1
-	PH1.2 <-> PH15.2
-	PH1.3 <-> PH15.3
-	PH1.4 <-> PH15.4
-	PH4.1 <-> PH7.1
-	PH4.10 <-> PH7.10
-	PH4.11 <-> PH6.1 <-> PH7.11
-	PH4.11 <-> PH7.11
-	PH4.12 <-> PH6.2 <-> PH7.12
-	PH4.12 <-> PH7.12
-	PH4.13 <-> PH6.3 <-> PH7.13
-	PH4.13 <-> PH7.13
-	PH4.14 <-> PH6.4 <-> PH7.14
-	PH4.14 <-> PH7.14
-	PH4.15 <-> PH7.15
-	PH4.16 <-> PH7.16
-	PH4.2 <-> PH7.2
-	PH4.3 <-> PH7.3
+	1 KOhm.1 <-> 10 KOhm.1 <-> PH1.1 <-> PH13.1 <-> PH15.1 <-> PH2.1 <-> PH4.12 <-> PH4.16 <-> PH4.2 <-> PH4.5 <-> PH5.2 <-> PH5.5 <-> PH6.2 <-> PH6.6 <-> PH7.12 <-> PH7.16 <-> PH7.2 <-> PH7.5
+	1 KOhm.2 <-> 10 KOhm.2 <-> PH14.2
+	220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> 220 Ohm.1 <-> PH13.2 <-> PH2.2 <-> PH4.3 <-> PH5.3 <-> PH7.3
+	220 Ohm.1 <-> 220 Ohm.2 <-> PH1.4 <-> PH13.3 <-> PH14.1 <-> PH15.4 <-> PH2.3 <-> PH4.1 <-> PH4.15 <-> PH5.1 <-> PH6.5 <-> PH7.1 <-> PH7.15
+	220 Ohm.2 <-> 220 Ohm.2 <-> 220 Ohm.2 <-> 220 Ohm.2 <-> PH10 <-> PH11 <-> PH12 <-> PH4.10 <-> PH4.11 <-> PH4.9 <-> PH6.1 <-> PH7.10 <-> PH7.11 <-> PH7.9 <-> PH9
+	PH1.2 <-> PH15.2 <-> PH4.13 <-> PH6.3 <-> PH7.13
+	PH1.3 <-> PH15.3 <-> PH4.14 <-> PH6.4 <-> PH7.14
 	PH4.4 <-> PH5.4 <-> PH7.4
-	PH4.4 <-> PH7.4
-	PH4.5 <-> PH7.5
 	PH4.6 <-> PH5.6 <-> PH7.6
-	PH4.6 <-> PH7.6
 	PH4.7 <-> PH7.7
 	PH4.8 <-> PH7.8
-	PH4.9 <-> PH7.9
 
diff --git a/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt
index 03cf992b..53f69ba4 100644
--- a/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/397_excl_switches.txt
@@ -4,14 +4,13 @@ Switch setup: [Default]
 	C10.2 <-> R16.1 <-> V2.1
 	C11.1 <-> R19.1 <-> V4.2
 	C11.2 <-> R17.2 <-> V2.6
-	C12.1 <-> R21.1
 	C12.1 <-> R21.1 <-> V3.3 <-> V4.3
-	C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> L5.1 <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8
+	C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8
 	C13.1 <-> V3.7
 	C13.2 <-> R22.1
-	C16/C17/C18.3 <-> L3.1 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9
-	C16/C17/C18.4 <-> C5.1 <-> L2.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1
-	C19.1 <-> L1.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2
+	C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9
+	C16/C17/C18.4 <-> C5.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1
+	C19.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2
 	C2.1 <-> R1.2 <-> V1.2
 	C2.2 <-> R2.2 <-> R3.2 <-> V1.3
 	C3.1 <-> R3.1 <-> R4.1 <-> R5.1
@@ -26,18 +25,12 @@ Switch setup: [Default]
 	Input Jack.Sleeve <-> R1A.1
 	Input Jack.Tip <-> R1.1 <-> R1A.2
 	J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1
-	L10.1 <-> L10.2 <-> L11.1 <-> L11.2 <-> L9.1
-	L4.1 <-> R14.2 <-> R28.2 <-> R29.2
-	L6.1 <-> L7.1 <-> L7.2 <-> L8.1 <-> L8.2
 	OT.1 <-> R22.2 <-> V4.7
 	PL1.1 <-> PL1.2
 	R11.1 <-> V2.3 <-> V2.8
 	R12.2 <-> R13.1 <-> R14.1
+	R14.2 <-> R28.2 <-> R29.2
 	R7.1 <-> V1.8
-	T1.1 <-> T1.2
-	T2.1 <-> T2.2
-	T3.1 <-> T3.2
-	T4.1 <-> T4.2
 	Tone.1 <-> TSR1.2
 	Tone.2 <-> TS C1.2
 	TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.1
diff --git a/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt
index 03cf992b..53f69ba4 100644
--- a/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/397_incl_switches.txt
@@ -4,14 +4,13 @@ Switch setup: [Default]
 	C10.2 <-> R16.1 <-> V2.1
 	C11.1 <-> R19.1 <-> V4.2
 	C11.2 <-> R17.2 <-> V2.6
-	C12.1 <-> R21.1
 	C12.1 <-> R21.1 <-> V3.3 <-> V4.3
-	C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> L5.1 <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8
+	C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8
 	C13.1 <-> V3.7
 	C13.2 <-> R22.1
-	C16/C17/C18.3 <-> L3.1 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9
-	C16/C17/C18.4 <-> C5.1 <-> L2.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1
-	C19.1 <-> L1.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2
+	C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9
+	C16/C17/C18.4 <-> C5.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1
+	C19.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2
 	C2.1 <-> R1.2 <-> V1.2
 	C2.2 <-> R2.2 <-> R3.2 <-> V1.3
 	C3.1 <-> R3.1 <-> R4.1 <-> R5.1
@@ -26,18 +25,12 @@ Switch setup: [Default]
 	Input Jack.Sleeve <-> R1A.1
 	Input Jack.Tip <-> R1.1 <-> R1A.2
 	J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1
-	L10.1 <-> L10.2 <-> L11.1 <-> L11.2 <-> L9.1
-	L4.1 <-> R14.2 <-> R28.2 <-> R29.2
-	L6.1 <-> L7.1 <-> L7.2 <-> L8.1 <-> L8.2
 	OT.1 <-> R22.2 <-> V4.7
 	PL1.1 <-> PL1.2
 	R11.1 <-> V2.3 <-> V2.8
 	R12.2 <-> R13.1 <-> R14.1
+	R14.2 <-> R28.2 <-> R29.2
 	R7.1 <-> V1.8
-	T1.1 <-> T1.2
-	T2.1 <-> T2.2
-	T3.1 <-> T3.2
-	T4.1 <-> T4.2
 	Tone.1 <-> TSR1.2
 	Tone.2 <-> TS C1.2
 	TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.1
diff --git a/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt
index fece9478..d34af015 100644
--- a/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/403_excl_switches.txt
@@ -1,6 +1,6 @@
 Switch setup: [Default]
 
-	1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> GND <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> SW1.6 <-> V2.5 <-> V2.7 <-> VR1.1
+	1N4007.1 <-> 1N4007.1 <-> 5W.1 <-> C1.2 <-> C3.2 <-> C3.2 <-> C3.2 <-> GND <-> J1.1 <-> J1.3 <-> J1.4 <-> R4.1 <-> R4.1 <-> R5.1 <-> R8.2 <-> SW1.3 <-> SW1.6 <-> V2.5 <-> V2.7 <-> VR1.1
 	1N4007.2 <-> V2.4
 	1N4007.2 <-> V2.6
 	2W.1 <-> 2W.2 <-> 5W.2 <-> C3.1 <-> V2.6
@@ -8,7 +8,6 @@ Switch setup: [Default]
 	2W.2 <-> C1.1 <-> R1.1 <-> R2.2
 	5W.1 <-> V2.4
 	5W.2 <-> C3.1 <-> V2.8
-	5W.2 <-> V2.6
 	C4.1 <-> VR1.3
 	C4.2 <-> R1.2 <-> V1.6
 	C5.1 <-> R2.1 <-> V1.1
@@ -17,7 +16,6 @@ Switch setup: [Default]
 	FH1.2 <-> IEC1.2
 	J1.1 <-> J1.2 <-> J1.3 <-> J1.4 <-> R11.1
 	J1.2 <-> R4.2 <-> R7.2
-	J1.4 <-> R4.1
 	PL1.1 <-> R10.2
 	PL1.4 <-> R6.2
 	R10.1 <-> R6.1
diff --git a/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt
index 4e139dae..0ade845f 100644
--- a/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/403_incl_switches.txt
@@ -8,7 +8,6 @@ Switch setup: [SW1.ON1]
 	2W.2 <-> C1.1 <-> R1.1 <-> R2.2
 	5W.1 <-> V2.4
 	5W.2 <-> C3.1 <-> V2.8
-	5W.2 <-> V2.6
 	C4.1 <-> VR1.3
 	C4.2 <-> R1.2 <-> V1.6
 	C5.1 <-> R2.1 <-> V1.1
@@ -17,7 +16,6 @@ Switch setup: [SW1.ON1]
 	FH1.2 <-> IEC1.2
 	J1.1 <-> J1.2 <-> J1.3 <-> J1.4 <-> R11.1
 	J1.2 <-> R4.2 <-> R7.2
-	J1.4 <-> R4.1
 	PL1.1 <-> R10.2
 	PL1.4 <-> R6.2
 	R10.1 <-> R6.1
@@ -38,7 +36,6 @@ Switch setup: [SW1.ON2]
 	2W.2 <-> C1.1 <-> R1.1 <-> R2.2
 	5W.1 <-> V2.4
 	5W.2 <-> C3.1 <-> V2.8
-	5W.2 <-> V2.6
 	C4.1 <-> VR1.3
 	C4.2 <-> R1.2 <-> V1.6
 	C5.1 <-> R2.1 <-> V1.1
@@ -46,7 +43,6 @@ Switch setup: [SW1.ON2]
 	FH1.2 <-> IEC1.2
 	J1.1 <-> J1.2 <-> J1.3 <-> J1.4 <-> R11.1
 	J1.2 <-> R4.2 <-> R7.2
-	J1.4 <-> R4.1
 	PL1.1 <-> R10.2
 	PL1.4 <-> R6.2
 	R10.1 <-> R6.1
diff --git a/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt
index 03cf992b..53f69ba4 100644
--- a/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/405_excl_switches.txt
@@ -4,14 +4,13 @@ Switch setup: [Default]
 	C10.2 <-> R16.1 <-> V2.1
 	C11.1 <-> R19.1 <-> V4.2
 	C11.2 <-> R17.2 <-> V2.6
-	C12.1 <-> R21.1
 	C12.1 <-> R21.1 <-> V3.3 <-> V4.3
-	C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> L5.1 <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8
+	C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8
 	C13.1 <-> V3.7
 	C13.2 <-> R22.1
-	C16/C17/C18.3 <-> L3.1 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9
-	C16/C17/C18.4 <-> C5.1 <-> L2.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1
-	C19.1 <-> L1.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2
+	C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9
+	C16/C17/C18.4 <-> C5.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1
+	C19.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2
 	C2.1 <-> R1.2 <-> V1.2
 	C2.2 <-> R2.2 <-> R3.2 <-> V1.3
 	C3.1 <-> R3.1 <-> R4.1 <-> R5.1
@@ -26,18 +25,12 @@ Switch setup: [Default]
 	Input Jack.Sleeve <-> R1A.1
 	Input Jack.Tip <-> R1.1 <-> R1A.2
 	J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1
-	L10.1 <-> L10.2 <-> L11.1 <-> L11.2 <-> L9.1
-	L4.1 <-> R14.2 <-> R28.2 <-> R29.2
-	L6.1 <-> L7.1 <-> L7.2 <-> L8.1 <-> L8.2
 	OT.1 <-> R22.2 <-> V4.7
 	PL1.1 <-> PL1.2
 	R11.1 <-> V2.3 <-> V2.8
 	R12.2 <-> R13.1 <-> R14.1
+	R14.2 <-> R28.2 <-> R29.2
 	R7.1 <-> V1.8
-	T1.1 <-> T1.2
-	T2.1 <-> T2.2
-	T3.1 <-> T3.2
-	T4.1 <-> T4.2
 	Tone.1 <-> TSR1.2
 	Tone.2 <-> TS C1.2
 	TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.1
diff --git a/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt
index 03cf992b..53f69ba4 100644
--- a/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/405_incl_switches.txt
@@ -4,14 +4,13 @@ Switch setup: [Default]
 	C10.2 <-> R16.1 <-> V2.1
 	C11.1 <-> R19.1 <-> V4.2
 	C11.2 <-> R17.2 <-> V2.6
-	C12.1 <-> R21.1
 	C12.1 <-> R21.1 <-> V3.3 <-> V4.3
-	C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> L5.1 <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8
+	C12.2 <-> C16/C17/C18.1 <-> C16/C17/C18.2 <-> C19.2 <-> C9.2 <-> GND <-> OT.2 <-> R13.2 <-> R19.2 <-> R21.2 <-> R27.2 <-> R29.1 <-> R32.2 <-> R7.2 <-> V5.4 <-> V5.6 <-> V5.8
 	C13.1 <-> V3.7
 	C13.2 <-> R22.1
-	C16/C17/C18.3 <-> L3.1 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9
-	C16/C17/C18.4 <-> C5.1 <-> L2.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1
-	C19.1 <-> L1.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2
+	C16/C17/C18.3 <-> R16.2 <-> R17.1 <-> R27.1 <-> R28.1 <-> R30.2 <-> V3.9 <-> V4.9
+	C16/C17/C18.4 <-> C5.1 <-> R30.1 <-> R31.2 <-> R5.2 <-> R8.1
+	C19.1 <-> R10.1 <-> R31.1 <-> R32.1 <-> V2.2
 	C2.1 <-> R1.2 <-> V1.2
 	C2.2 <-> R2.2 <-> R3.2 <-> V1.3
 	C3.1 <-> R3.1 <-> R4.1 <-> R5.1
@@ -26,18 +25,12 @@ Switch setup: [Default]
 	Input Jack.Sleeve <-> R1A.1
 	Input Jack.Tip <-> R1.1 <-> R1A.2
 	J1.Sleeve <-> J1.Tip <-> OT.5 <-> R15.1
-	L10.1 <-> L10.2 <-> L11.1 <-> L11.2 <-> L9.1
-	L4.1 <-> R14.2 <-> R28.2 <-> R29.2
-	L6.1 <-> L7.1 <-> L7.2 <-> L8.1 <-> L8.2
 	OT.1 <-> R22.2 <-> V4.7
 	PL1.1 <-> PL1.2
 	R11.1 <-> V2.3 <-> V2.8
 	R12.2 <-> R13.1 <-> R14.1
+	R14.2 <-> R28.2 <-> R29.2
 	R7.1 <-> V1.8
-	T1.1 <-> T1.2
-	T2.1 <-> T2.2
-	T3.1 <-> T3.2
-	T4.1 <-> T4.2
 	Tone.1 <-> TSR1.2
 	Tone.2 <-> TS C1.2
 	TS C1.1 <-> TS R3.2 <-> TSR2.1 <-> Volume.1
diff --git a/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt
index f90553cc..5b320680 100644
--- a/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/406_excl_switches.txt
@@ -22,18 +22,11 @@ Switch setup: [Default]
 	C8.2 <-> R15.2 <-> R9.2
 	C9.1 <-> R11.2 <-> R12.1
 	Input Jack.Tip <-> R1.2 <-> R1A.1
-	L10.1 <-> L11.1 <-> L9.1
-	L17.1 <-> L17.2 <-> L6.1 <-> L6.2 <-> L7.1 <-> L7.2
-	R10.1 <-> V2.2
 	R11.1 <-> V2.3 <-> V2.8
 	R12.2 <-> R13.2 <-> R14.2
 	R14.1 <-> R28.1 <-> R29.2
 	R22.2 <-> V4.7
 	R7.2 <-> V1.8
-	T1.1 <-> T1.2
-	T2.1 <-> T2.2
-	T3.1 <-> T3.2
-	T4.1 <-> T4.2
 	Tone.1 <-> TSR1.2
 	Tone.2 <-> TS C1.2
 	TS C1.1 <-> TS R3.1 <-> TSR2.1 <-> Volume.1
diff --git a/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt
index f90553cc..5b320680 100644
--- a/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/406_incl_switches.txt
@@ -22,18 +22,11 @@ Switch setup: [Default]
 	C8.2 <-> R15.2 <-> R9.2
 	C9.1 <-> R11.2 <-> R12.1
 	Input Jack.Tip <-> R1.2 <-> R1A.1
-	L10.1 <-> L11.1 <-> L9.1
-	L17.1 <-> L17.2 <-> L6.1 <-> L6.2 <-> L7.1 <-> L7.2
-	R10.1 <-> V2.2
 	R11.1 <-> V2.3 <-> V2.8
 	R12.2 <-> R13.2 <-> R14.2
 	R14.1 <-> R28.1 <-> R29.2
 	R22.2 <-> V4.7
 	R7.2 <-> V1.8
-	T1.1 <-> T1.2
-	T2.1 <-> T2.2
-	T3.1 <-> T3.2
-	T4.1 <-> T4.2
 	Tone.1 <-> TSR1.2
 	Tone.2 <-> TS C1.2
 	TS C1.1 <-> TS R3.1 <-> TSR2.1 <-> Volume.1
diff --git a/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt
index b2a5d7ad..553cca89 100644
--- a/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/407_excl_switches.txt
@@ -1,10 +1,11 @@
 Switch setup: [Default]
 
-	0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> LesPaul 3 Pos Switch.1 <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> Push Pull.3 <-> VOL1.1 <-> VOL1.3 <-> VOL2.3
+	0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> LesPaul 3 Pos Switch.1 <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> Push Pull.3 <-> VOL1.3 <-> VOL2.3
 	0.47 uF.2 <-> TONE.3
 	JAZZ BASS BRIDGE PU.South Start <-> VOL2.1
 	LesPaul 3 Pos Switch.2 <-> VOL2.2
 	LesPaul 3 Pos Switch.3 <-> Presa Jack.Tip <-> TONE.2
 	LesPaul 3 Pos Switch.4 <-> VOL1.2
 	Push Pull.1 <-> Push Pull.4
+	Push Pull.6 <-> VOL1.1
 
diff --git a/diylc-regression-data/input/cloud/netlist/407_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/407_incl_switches.txt
index a333c067..a2d076c2 100644
--- a/diylc-regression-data/input/cloud/netlist/407_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/407_incl_switches.txt
@@ -1,20 +1,20 @@
 Switch setup: [LesPaul 3 Pos Switch.Middle:Push Pull.ON1, LesPaul 3 Pos Switch.Middle:Push Pull.ON2]
 
-	0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.1 <-> VOL1.3 <-> VOL2.3
+	0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.3 <-> VOL2.3
 	0.47 uF.2 <-> TONE.3
 	JAZZ BASS BRIDGE PU.South Start <-> VOL2.1
 	Presa Jack.Tip <-> TONE.2 <-> VOL1.2 <-> VOL2.2
 
 Switch setup: [LesPaul 3 Pos Switch.Rhythm:Push Pull.ON1, LesPaul 3 Pos Switch.Rhythm:Push Pull.ON2]
 
-	0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.1 <-> VOL1.3 <-> VOL2.3
+	0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.3 <-> VOL2.3
 	0.47 uF.2 <-> TONE.3
 	JAZZ BASS BRIDGE PU.South Start <-> VOL2.1
 	Presa Jack.Tip <-> TONE.2 <-> VOL1.2
 
 Switch setup: [LesPaul 3 Pos Switch.Treble:Push Pull.ON1, LesPaul 3 Pos Switch.Treble:Push Pull.ON2]
 
-	0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.1 <-> VOL1.3 <-> VOL2.3
+	0.47 uF.1 <-> JAZZ BASS BRIDGE PU.South Finish <-> PRECISION COIL S.South Finish <-> Presa Jack.Sleeve <-> VOL1.3 <-> VOL2.3
 	0.47 uF.2 <-> TONE.3
 	JAZZ BASS BRIDGE PU.South Start <-> VOL2.1
 	Presa Jack.Tip <-> TONE.2 <-> VOL2.2
diff --git a/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt b/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt
index 22ecfe8d..b8782139 100644
--- a/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/419_excl_switches.txt
@@ -1,6 +1,7 @@
 Switch setup: [Default]
 
-	+12V.+12V.+ <-> +12V.+12V.- <-> Arduino Nano.10 <-> Arduino Nano.11 <-> Arduino Nano.12 <-> Arduino Nano.13 <-> Arduino Nano.14 <-> Arduino Nano.15 <-> Arduino Nano.25 <-> Arduino Nano.26 <-> Arduino Nano.27 <-> Arduino Nano.28 <-> Arduino Nano.29 <-> Arduino Nano.30 <-> Arduino Nano.4 <-> Arduino Nano.5 <-> Arduino Nano.6 <-> Arduino Nano.7 <-> Arduino Nano.8 <-> Arduino Nano.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> LM2902.1 <-> LM2902.1 <-> LM2902.10 <-> LM2902.10 <-> LM2902.11 <-> LM2902.11 <-> LM2902.12 <-> LM2902.12 <-> LM2902.13 <-> LM2902.13 <-> LM2902.14 <-> LM2902.14 <-> LM2902.2 <-> LM2902.2 <-> LM2902.3 <-> LM2902.3 <-> LM2902.4 <-> LM2902.4 <-> LM2902.5 <-> LM2902.5 <-> LM2902.6 <-> LM2902.6 <-> LM2902.7 <-> LM2902.7 <-> LM2902.8 <-> LM2902.8 <-> LM2902.9 <-> LM2902.9 <-> MPSA05.1 <-> MPSA05.1 <-> MPSA05.2 <-> MPSA05.2 <-> MPSA05.3 <-> MPSA05.3 <-> PH1.1 <-> PH1.2 <-> PH1.3 <-> PH2.1 <-> PH2.2 <-> PH2.3 <-> PH3.1 <-> PH3.2 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.1 <-> PH5.2 <-> PH5.3 <-> PH6 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R10.1 <-> R10.1 <-> R10.2 <-> R10.2 <-> R11.1 <-> R11.1 <-> R11.2 <-> R11.2 <-> R12.1 <-> R12.1 <-> R12.2 <-> R12.2 <-> R3.1 <-> R3.1 <-> R3.2 <-> R3.2 <-> R4.1 <-> R4.1 <-> R4.2 <-> R4.2 <-> R5.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R6.2 <-> R8.1 <-> R8.1 <-> R8.2 <-> R8.2 <-> R9.1 <-> R9.1 <-> R9.2 <-> R9.2 <-> VR1.1 <-> VR1.2 <-> VR1.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.1 <-> VR4.2 <-> VR4.3
-	+12V.+12V.+ <-> PH3.1
-	+12V.+12V.- <-> PH3.2
+	+12V.+12V.+ <-> +12V.+12V.- <-> Arduino Nano.10 <-> Arduino Nano.11 <-> Arduino Nano.12 <-> Arduino Nano.13 <-> Arduino Nano.14 <-> Arduino Nano.15 <-> Arduino Nano.19 <-> Arduino Nano.20 <-> Arduino Nano.21 <-> Arduino Nano.22 <-> Arduino Nano.23 <-> Arduino Nano.24 <-> Arduino Nano.25 <-> Arduino Nano.26 <-> Arduino Nano.27 <-> Arduino Nano.28 <-> Arduino Nano.29 <-> Arduino Nano.30 <-> Arduino Nano.4 <-> Arduino Nano.5 <-> Arduino Nano.6 <-> Arduino Nano.7 <-> Arduino Nano.8 <-> Arduino Nano.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> LM2902.1 <-> LM2902.1 <-> LM2902.10 <-> LM2902.10 <-> LM2902.11 <-> LM2902.11 <-> LM2902.12 <-> LM2902.12 <-> LM2902.13 <-> LM2902.13 <-> LM2902.14 <-> LM2902.14 <-> LM2902.2 <-> LM2902.2 <-> LM2902.3 <-> LM2902.3 <-> LM2902.4 <-> LM2902.4 <-> LM2902.5 <-> LM2902.5 <-> LM2902.6 <-> LM2902.6 <-> LM2902.7 <-> LM2902.7 <-> LM2902.8 <-> LM2902.8 <-> LM2902.9 <-> LM2902.9 <-> MPSA05.1 <-> MPSA05.1 <-> MPSA05.2 <-> MPSA05.2 <-> MPSA05.3 <-> MPSA05.3 <-> PH1.1 <-> PH1.2 <-> PH1.3 <-> PH2.1 <-> PH2.2 <-> PH2.3 <-> PH3.1 <-> PH3.2 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.1 <-> PH5.2 <-> PH5.3 <-> PH6 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R10.1 <-> R10.1 <-> R10.2 <-> R10.2 <-> R11.1 <-> R11.1 <-> R11.2 <-> R11.2 <-> R12.1 <-> R12.1 <-> R12.2 <-> R12.2 <-> R3.1 <-> R3.1 <-> R3.2 <-> R3.2 <-> R4.1 <-> R4.1 <-> R4.2 <-> R4.2 <-> R5.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R6.2 <-> R8.1 <-> R8.1 <-> R8.2 <-> R8.2 <-> R9.1 <-> R9.1 <-> R9.2 <-> R9.2 <-> VR1.1 <-> VR1.2 <-> VR1.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.1 <-> VR4.2 <-> VR4.3
+	Arduino Nano.1 <-> Arduino Nano.16
+	Arduino Nano.17 <-> Arduino Nano.2
+	Arduino Nano.18 <-> Arduino Nano.3
 
diff --git a/diylc-regression-data/input/cloud/netlist/419_incl_switches.txt b/diylc-regression-data/input/cloud/netlist/419_incl_switches.txt
index 22ecfe8d..b8782139 100644
--- a/diylc-regression-data/input/cloud/netlist/419_incl_switches.txt
+++ b/diylc-regression-data/input/cloud/netlist/419_incl_switches.txt
@@ -1,6 +1,7 @@
 Switch setup: [Default]
 
-	+12V.+12V.+ <-> +12V.+12V.- <-> Arduino Nano.10 <-> Arduino Nano.11 <-> Arduino Nano.12 <-> Arduino Nano.13 <-> Arduino Nano.14 <-> Arduino Nano.15 <-> Arduino Nano.25 <-> Arduino Nano.26 <-> Arduino Nano.27 <-> Arduino Nano.28 <-> Arduino Nano.29 <-> Arduino Nano.30 <-> Arduino Nano.4 <-> Arduino Nano.5 <-> Arduino Nano.6 <-> Arduino Nano.7 <-> Arduino Nano.8 <-> Arduino Nano.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> LM2902.1 <-> LM2902.1 <-> LM2902.10 <-> LM2902.10 <-> LM2902.11 <-> LM2902.11 <-> LM2902.12 <-> LM2902.12 <-> LM2902.13 <-> LM2902.13 <-> LM2902.14 <-> LM2902.14 <-> LM2902.2 <-> LM2902.2 <-> LM2902.3 <-> LM2902.3 <-> LM2902.4 <-> LM2902.4 <-> LM2902.5 <-> LM2902.5 <-> LM2902.6 <-> LM2902.6 <-> LM2902.7 <-> LM2902.7 <-> LM2902.8 <-> LM2902.8 <-> LM2902.9 <-> LM2902.9 <-> MPSA05.1 <-> MPSA05.1 <-> MPSA05.2 <-> MPSA05.2 <-> MPSA05.3 <-> MPSA05.3 <-> PH1.1 <-> PH1.2 <-> PH1.3 <-> PH2.1 <-> PH2.2 <-> PH2.3 <-> PH3.1 <-> PH3.2 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.1 <-> PH5.2 <-> PH5.3 <-> PH6 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R10.1 <-> R10.1 <-> R10.2 <-> R10.2 <-> R11.1 <-> R11.1 <-> R11.2 <-> R11.2 <-> R12.1 <-> R12.1 <-> R12.2 <-> R12.2 <-> R3.1 <-> R3.1 <-> R3.2 <-> R3.2 <-> R4.1 <-> R4.1 <-> R4.2 <-> R4.2 <-> R5.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R6.2 <-> R8.1 <-> R8.1 <-> R8.2 <-> R8.2 <-> R9.1 <-> R9.1 <-> R9.2 <-> R9.2 <-> VR1.1 <-> VR1.2 <-> VR1.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.1 <-> VR4.2 <-> VR4.3
-	+12V.+12V.+ <-> PH3.1
-	+12V.+12V.- <-> PH3.2
+	+12V.+12V.+ <-> +12V.+12V.- <-> Arduino Nano.10 <-> Arduino Nano.11 <-> Arduino Nano.12 <-> Arduino Nano.13 <-> Arduino Nano.14 <-> Arduino Nano.15 <-> Arduino Nano.19 <-> Arduino Nano.20 <-> Arduino Nano.21 <-> Arduino Nano.22 <-> Arduino Nano.23 <-> Arduino Nano.24 <-> Arduino Nano.25 <-> Arduino Nano.26 <-> Arduino Nano.27 <-> Arduino Nano.28 <-> Arduino Nano.29 <-> Arduino Nano.30 <-> Arduino Nano.4 <-> Arduino Nano.5 <-> Arduino Nano.6 <-> Arduino Nano.7 <-> Arduino Nano.8 <-> Arduino Nano.9 <-> C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> LM2902.1 <-> LM2902.1 <-> LM2902.10 <-> LM2902.10 <-> LM2902.11 <-> LM2902.11 <-> LM2902.12 <-> LM2902.12 <-> LM2902.13 <-> LM2902.13 <-> LM2902.14 <-> LM2902.14 <-> LM2902.2 <-> LM2902.2 <-> LM2902.3 <-> LM2902.3 <-> LM2902.4 <-> LM2902.4 <-> LM2902.5 <-> LM2902.5 <-> LM2902.6 <-> LM2902.6 <-> LM2902.7 <-> LM2902.7 <-> LM2902.8 <-> LM2902.8 <-> LM2902.9 <-> LM2902.9 <-> MPSA05.1 <-> MPSA05.1 <-> MPSA05.2 <-> MPSA05.2 <-> MPSA05.3 <-> MPSA05.3 <-> PH1.1 <-> PH1.2 <-> PH1.3 <-> PH2.1 <-> PH2.2 <-> PH2.3 <-> PH3.1 <-> PH3.2 <-> PH4.1 <-> PH4.2 <-> PH4.3 <-> PH5.1 <-> PH5.2 <-> PH5.3 <-> PH6 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R1.1 <-> R1.2 <-> R1.2 <-> R10.1 <-> R10.1 <-> R10.2 <-> R10.2 <-> R11.1 <-> R11.1 <-> R11.2 <-> R11.2 <-> R12.1 <-> R12.1 <-> R12.2 <-> R12.2 <-> R3.1 <-> R3.1 <-> R3.2 <-> R3.2 <-> R4.1 <-> R4.1 <-> R4.2 <-> R4.2 <-> R5.1 <-> R5.1 <-> R5.2 <-> R5.2 <-> R6.1 <-> R6.1 <-> R6.2 <-> R6.2 <-> R8.1 <-> R8.1 <-> R8.2 <-> R8.2 <-> R9.1 <-> R9.1 <-> R9.2 <-> R9.2 <-> VR1.1 <-> VR1.2 <-> VR1.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.1 <-> VR4.2 <-> VR4.3
+	Arduino Nano.1 <-> Arduino Nano.16
+	Arduino Nano.17 <-> Arduino Nano.2
+	Arduino Nano.18 <-> Arduino Nano.3
 
diff --git a/diylc-regression-data/input/cloud/png/201.png b/diylc-regression-data/input/cloud/png/201.png
index 9b31acd1..1470e215 100644
Binary files a/diylc-regression-data/input/cloud/png/201.png and b/diylc-regression-data/input/cloud/png/201.png differ
diff --git a/diylc-regression-data/input/cloud/png/212.png b/diylc-regression-data/input/cloud/png/212.png
index 99765607..10b1a791 100644
Binary files a/diylc-regression-data/input/cloud/png/212.png and b/diylc-regression-data/input/cloud/png/212.png differ
diff --git a/diylc-regression-data/input/cloud/png/221.png b/diylc-regression-data/input/cloud/png/221.png
index ebdf34e6..1ad9ed60 100644
Binary files a/diylc-regression-data/input/cloud/png/221.png and b/diylc-regression-data/input/cloud/png/221.png differ
diff --git a/diylc-regression-data/input/cloud/png/229.png b/diylc-regression-data/input/cloud/png/229.png
index f86a80f5..21e271fc 100644
Binary files a/diylc-regression-data/input/cloud/png/229.png and b/diylc-regression-data/input/cloud/png/229.png differ
diff --git a/diylc-regression-data/input/cloud/png/231.png b/diylc-regression-data/input/cloud/png/231.png
index b1c8cbe6..3f149915 100644
Binary files a/diylc-regression-data/input/cloud/png/231.png and b/diylc-regression-data/input/cloud/png/231.png differ
diff --git a/diylc-regression-data/input/cloud/png/232.png b/diylc-regression-data/input/cloud/png/232.png
index 27552965..5bdacc1b 100644
Binary files a/diylc-regression-data/input/cloud/png/232.png and b/diylc-regression-data/input/cloud/png/232.png differ
diff --git a/diylc-regression-data/input/cloud/png/233.png b/diylc-regression-data/input/cloud/png/233.png
index 27552965..5bdacc1b 100644
Binary files a/diylc-regression-data/input/cloud/png/233.png and b/diylc-regression-data/input/cloud/png/233.png differ
diff --git a/diylc-regression-data/input/cloud/png/234.png b/diylc-regression-data/input/cloud/png/234.png
index 29379da4..5c4abd7a 100644
Binary files a/diylc-regression-data/input/cloud/png/234.png and b/diylc-regression-data/input/cloud/png/234.png differ
diff --git a/diylc-regression-data/input/cloud/png/236.png b/diylc-regression-data/input/cloud/png/236.png
index 6faa937d..d474c21b 100644
Binary files a/diylc-regression-data/input/cloud/png/236.png and b/diylc-regression-data/input/cloud/png/236.png differ
diff --git a/diylc-regression-data/input/cloud/png/239.png b/diylc-regression-data/input/cloud/png/239.png
index 4af2ba5d..be3eeb39 100644
Binary files a/diylc-regression-data/input/cloud/png/239.png and b/diylc-regression-data/input/cloud/png/239.png differ
diff --git a/diylc-regression-data/input/cloud/png/244.png b/diylc-regression-data/input/cloud/png/244.png
index b43cb516..0cdc81ea 100644
Binary files a/diylc-regression-data/input/cloud/png/244.png and b/diylc-regression-data/input/cloud/png/244.png differ
diff --git a/diylc-regression-data/input/cloud/png/245.png b/diylc-regression-data/input/cloud/png/245.png
index db0bc9d5..8ee7cbe9 100644
Binary files a/diylc-regression-data/input/cloud/png/245.png and b/diylc-regression-data/input/cloud/png/245.png differ
diff --git a/diylc-regression-data/input/cloud/png/249.png b/diylc-regression-data/input/cloud/png/249.png
index 293d2ddf..a961ecf3 100644
Binary files a/diylc-regression-data/input/cloud/png/249.png and b/diylc-regression-data/input/cloud/png/249.png differ
diff --git a/diylc-regression-data/input/cloud/png/255.png b/diylc-regression-data/input/cloud/png/255.png
index 640de6d6..14a7514e 100644
Binary files a/diylc-regression-data/input/cloud/png/255.png and b/diylc-regression-data/input/cloud/png/255.png differ
diff --git a/diylc-regression-data/input/cloud/png/256.png b/diylc-regression-data/input/cloud/png/256.png
index 42c63f81..1e9df383 100644
Binary files a/diylc-regression-data/input/cloud/png/256.png and b/diylc-regression-data/input/cloud/png/256.png differ
diff --git a/diylc-regression-data/input/cloud/png/259.png b/diylc-regression-data/input/cloud/png/259.png
index 79cc875e..41945036 100644
Binary files a/diylc-regression-data/input/cloud/png/259.png and b/diylc-regression-data/input/cloud/png/259.png differ
diff --git a/diylc-regression-data/input/cloud/png/265.png b/diylc-regression-data/input/cloud/png/265.png
index 10d5e4b0..41eb8fbc 100644
Binary files a/diylc-regression-data/input/cloud/png/265.png and b/diylc-regression-data/input/cloud/png/265.png differ
diff --git a/diylc-regression-data/input/cloud/png/266.png b/diylc-regression-data/input/cloud/png/266.png
index 277bafb2..a7219e49 100644
Binary files a/diylc-regression-data/input/cloud/png/266.png and b/diylc-regression-data/input/cloud/png/266.png differ
diff --git a/diylc-regression-data/input/cloud/png/267.png b/diylc-regression-data/input/cloud/png/267.png
index 7ece4f05..f1722dca 100644
Binary files a/diylc-regression-data/input/cloud/png/267.png and b/diylc-regression-data/input/cloud/png/267.png differ
diff --git a/diylc-regression-data/input/cloud/png/269.png b/diylc-regression-data/input/cloud/png/269.png
index 0b16485f..36451621 100644
Binary files a/diylc-regression-data/input/cloud/png/269.png and b/diylc-regression-data/input/cloud/png/269.png differ
diff --git a/diylc-regression-data/input/cloud/png/270.png b/diylc-regression-data/input/cloud/png/270.png
index 0b16485f..36451621 100644
Binary files a/diylc-regression-data/input/cloud/png/270.png and b/diylc-regression-data/input/cloud/png/270.png differ
diff --git a/diylc-regression-data/input/cloud/png/271.png b/diylc-regression-data/input/cloud/png/271.png
index 13eee109..fecc7717 100644
Binary files a/diylc-regression-data/input/cloud/png/271.png and b/diylc-regression-data/input/cloud/png/271.png differ
diff --git a/diylc-regression-data/input/cloud/png/273.png b/diylc-regression-data/input/cloud/png/273.png
index a5e22f49..1a427bba 100644
Binary files a/diylc-regression-data/input/cloud/png/273.png and b/diylc-regression-data/input/cloud/png/273.png differ
diff --git a/diylc-regression-data/input/cloud/png/274.png b/diylc-regression-data/input/cloud/png/274.png
index e02fc236..7c18e69d 100644
Binary files a/diylc-regression-data/input/cloud/png/274.png and b/diylc-regression-data/input/cloud/png/274.png differ
diff --git a/diylc-regression-data/input/cloud/png/277.png b/diylc-regression-data/input/cloud/png/277.png
index 6ec363d9..a612f574 100644
Binary files a/diylc-regression-data/input/cloud/png/277.png and b/diylc-regression-data/input/cloud/png/277.png differ
diff --git a/diylc-regression-data/input/cloud/png/278.png b/diylc-regression-data/input/cloud/png/278.png
index 1a3d47ee..51846f3b 100644
Binary files a/diylc-regression-data/input/cloud/png/278.png and b/diylc-regression-data/input/cloud/png/278.png differ
diff --git a/diylc-regression-data/input/cloud/png/279.png b/diylc-regression-data/input/cloud/png/279.png
index b9c428db..63b7a307 100644
Binary files a/diylc-regression-data/input/cloud/png/279.png and b/diylc-regression-data/input/cloud/png/279.png differ
diff --git a/diylc-regression-data/input/cloud/png/281.png b/diylc-regression-data/input/cloud/png/281.png
index 32137542..24adaadc 100644
Binary files a/diylc-regression-data/input/cloud/png/281.png and b/diylc-regression-data/input/cloud/png/281.png differ
diff --git a/diylc-regression-data/input/cloud/png/283.png b/diylc-regression-data/input/cloud/png/283.png
index 64b23b91..8d13e77c 100644
Binary files a/diylc-regression-data/input/cloud/png/283.png and b/diylc-regression-data/input/cloud/png/283.png differ
diff --git a/diylc-regression-data/input/cloud/png/287.png b/diylc-regression-data/input/cloud/png/287.png
index 3134110b..af08ae2c 100644
Binary files a/diylc-regression-data/input/cloud/png/287.png and b/diylc-regression-data/input/cloud/png/287.png differ
diff --git a/diylc-regression-data/input/cloud/png/292.png b/diylc-regression-data/input/cloud/png/292.png
index 63ee0593..58f14a99 100644
Binary files a/diylc-regression-data/input/cloud/png/292.png and b/diylc-regression-data/input/cloud/png/292.png differ
diff --git a/diylc-regression-data/input/cloud/png/298.png b/diylc-regression-data/input/cloud/png/298.png
index d1be5e26..0eb081ef 100644
Binary files a/diylc-regression-data/input/cloud/png/298.png and b/diylc-regression-data/input/cloud/png/298.png differ
diff --git a/diylc-regression-data/input/cloud/png/302.png b/diylc-regression-data/input/cloud/png/302.png
index d6ec779d..b99d0dbd 100644
Binary files a/diylc-regression-data/input/cloud/png/302.png and b/diylc-regression-data/input/cloud/png/302.png differ
diff --git a/diylc-regression-data/input/cloud/png/307.png b/diylc-regression-data/input/cloud/png/307.png
index 67870fdc..a8b73d84 100644
Binary files a/diylc-regression-data/input/cloud/png/307.png and b/diylc-regression-data/input/cloud/png/307.png differ
diff --git a/diylc-regression-data/input/cloud/png/332.png b/diylc-regression-data/input/cloud/png/332.png
index 6acb696c..96daa31d 100644
Binary files a/diylc-regression-data/input/cloud/png/332.png and b/diylc-regression-data/input/cloud/png/332.png differ
diff --git a/diylc-regression-data/input/cloud/png/333.png b/diylc-regression-data/input/cloud/png/333.png
index b38cffd0..72583398 100644
Binary files a/diylc-regression-data/input/cloud/png/333.png and b/diylc-regression-data/input/cloud/png/333.png differ
diff --git a/diylc-regression-data/input/cloud/png/334.png b/diylc-regression-data/input/cloud/png/334.png
index a2ad22b0..3b119bd0 100644
Binary files a/diylc-regression-data/input/cloud/png/334.png and b/diylc-regression-data/input/cloud/png/334.png differ
diff --git a/diylc-regression-data/input/cloud/png/342.png b/diylc-regression-data/input/cloud/png/342.png
index 32597739..fe2f0617 100644
Binary files a/diylc-regression-data/input/cloud/png/342.png and b/diylc-regression-data/input/cloud/png/342.png differ
diff --git a/diylc-regression-data/input/cloud/png/345.png b/diylc-regression-data/input/cloud/png/345.png
index b1d6f6c2..1ad44101 100644
Binary files a/diylc-regression-data/input/cloud/png/345.png and b/diylc-regression-data/input/cloud/png/345.png differ
diff --git a/diylc-regression-data/input/cloud/png/352.png b/diylc-regression-data/input/cloud/png/352.png
index 55ac92fd..bd3585a0 100644
Binary files a/diylc-regression-data/input/cloud/png/352.png and b/diylc-regression-data/input/cloud/png/352.png differ
diff --git a/diylc-regression-data/input/cloud/png/356.png b/diylc-regression-data/input/cloud/png/356.png
index d76432db..784c6530 100644
Binary files a/diylc-regression-data/input/cloud/png/356.png and b/diylc-regression-data/input/cloud/png/356.png differ
diff --git a/diylc-regression-data/input/cloud/png/357.png b/diylc-regression-data/input/cloud/png/357.png
index d8d4ee9a..d899252f 100644
Binary files a/diylc-regression-data/input/cloud/png/357.png and b/diylc-regression-data/input/cloud/png/357.png differ
diff --git a/diylc-regression-data/input/cloud/png/358.png b/diylc-regression-data/input/cloud/png/358.png
index 210e7fca..c4791b5f 100644
Binary files a/diylc-regression-data/input/cloud/png/358.png and b/diylc-regression-data/input/cloud/png/358.png differ
diff --git a/diylc-regression-data/input/cloud/png/359.png b/diylc-regression-data/input/cloud/png/359.png
index 870cb80d..35554eb7 100644
Binary files a/diylc-regression-data/input/cloud/png/359.png and b/diylc-regression-data/input/cloud/png/359.png differ
diff --git a/diylc-regression-data/input/cloud/png/369.png b/diylc-regression-data/input/cloud/png/369.png
index cba2acdc..2b91cf08 100644
Binary files a/diylc-regression-data/input/cloud/png/369.png and b/diylc-regression-data/input/cloud/png/369.png differ
diff --git a/diylc-regression-data/input/cloud/png/372.png b/diylc-regression-data/input/cloud/png/372.png
index 0a5210fa..e52770dd 100644
Binary files a/diylc-regression-data/input/cloud/png/372.png and b/diylc-regression-data/input/cloud/png/372.png differ
diff --git a/diylc-regression-data/input/cloud/png/373.png b/diylc-regression-data/input/cloud/png/373.png
index 02008cd7..08958b79 100644
Binary files a/diylc-regression-data/input/cloud/png/373.png and b/diylc-regression-data/input/cloud/png/373.png differ
diff --git a/diylc-regression-data/input/cloud/png/374.png b/diylc-regression-data/input/cloud/png/374.png
index 32554674..d3c0b79f 100644
Binary files a/diylc-regression-data/input/cloud/png/374.png and b/diylc-regression-data/input/cloud/png/374.png differ
diff --git a/diylc-regression-data/input/cloud/png/376.png b/diylc-regression-data/input/cloud/png/376.png
index a894d418..a9e2a438 100644
Binary files a/diylc-regression-data/input/cloud/png/376.png and b/diylc-regression-data/input/cloud/png/376.png differ
diff --git a/diylc-regression-data/input/cloud/png/380.png b/diylc-regression-data/input/cloud/png/380.png
index 13a30e21..d100c0f7 100644
Binary files a/diylc-regression-data/input/cloud/png/380.png and b/diylc-regression-data/input/cloud/png/380.png differ
diff --git a/diylc-regression-data/input/cloud/png/384.png b/diylc-regression-data/input/cloud/png/384.png
index de21cdcb..6e719dfa 100644
Binary files a/diylc-regression-data/input/cloud/png/384.png and b/diylc-regression-data/input/cloud/png/384.png differ
diff --git a/diylc-regression-data/input/cloud/png/386.png b/diylc-regression-data/input/cloud/png/386.png
index 96f4ef6a..67d994be 100644
Binary files a/diylc-regression-data/input/cloud/png/386.png and b/diylc-regression-data/input/cloud/png/386.png differ
diff --git a/diylc-regression-data/input/cloud/png/388.png b/diylc-regression-data/input/cloud/png/388.png
index 2e491e77..ccee2f12 100644
Binary files a/diylc-regression-data/input/cloud/png/388.png and b/diylc-regression-data/input/cloud/png/388.png differ
diff --git a/diylc-regression-data/input/cloud/png/389.png b/diylc-regression-data/input/cloud/png/389.png
index 0b32829d..57a8b03e 100644
Binary files a/diylc-regression-data/input/cloud/png/389.png and b/diylc-regression-data/input/cloud/png/389.png differ
diff --git a/diylc-regression-data/input/cloud/png/390.png b/diylc-regression-data/input/cloud/png/390.png
index c822ba64..ca048640 100644
Binary files a/diylc-regression-data/input/cloud/png/390.png and b/diylc-regression-data/input/cloud/png/390.png differ
diff --git a/diylc-regression-data/input/cloud/png/397.png b/diylc-regression-data/input/cloud/png/397.png
index 91b10475..46b4a977 100644
Binary files a/diylc-regression-data/input/cloud/png/397.png and b/diylc-regression-data/input/cloud/png/397.png differ
diff --git a/diylc-regression-data/input/cloud/png/401.png b/diylc-regression-data/input/cloud/png/401.png
index 97aac21c..c5664319 100644
Binary files a/diylc-regression-data/input/cloud/png/401.png and b/diylc-regression-data/input/cloud/png/401.png differ
diff --git a/diylc-regression-data/input/cloud/png/403.png b/diylc-regression-data/input/cloud/png/403.png
index 83f2a0fc..b9849f6a 100644
Binary files a/diylc-regression-data/input/cloud/png/403.png and b/diylc-regression-data/input/cloud/png/403.png differ
diff --git a/diylc-regression-data/input/cloud/png/404.png b/diylc-regression-data/input/cloud/png/404.png
index 97aac21c..c5664319 100644
Binary files a/diylc-regression-data/input/cloud/png/404.png and b/diylc-regression-data/input/cloud/png/404.png differ
diff --git a/diylc-regression-data/input/cloud/png/405.png b/diylc-regression-data/input/cloud/png/405.png
index f13cfbaf..ad300fc5 100644
Binary files a/diylc-regression-data/input/cloud/png/405.png and b/diylc-regression-data/input/cloud/png/405.png differ
diff --git a/diylc-regression-data/input/cloud/png/406.png b/diylc-regression-data/input/cloud/png/406.png
index ae70fc97..91ad04d8 100644
Binary files a/diylc-regression-data/input/cloud/png/406.png and b/diylc-regression-data/input/cloud/png/406.png differ
diff --git a/diylc-regression-data/input/diy-fever/netlist/timmy7_excl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/timmy7_excl_switches.txt
index 1b0f172d..009d4b4c 100644
--- a/diylc-regression-data/input/diy-fever/netlist/timmy7_excl_switches.txt
+++ b/diylc-regression-data/input/diy-fever/netlist/timmy7_excl_switches.txt
@@ -12,49 +12,21 @@ Switch setup: [Default]
 	C5.2 <-> R8.2
 	C6.1 <-> VR3.1
 	C7.1 <-> D16.2 <-> IC3.5 <-> R9.2
-	D1.1 <-> IC1.15
 	D1.1 <-> IC1.15 <-> IC1.16
 	D1.2 <-> D2.1 <-> IC1.6 <-> IC1.7
-	D1.2 <-> IC1.7
 	D10.1 <-> D11.2 <-> IC2.12 <-> IC2.13
-	D10.1 <-> IC2.13
 	D10.2 <-> D9.1 <-> IC2.5 <-> IC2.6
-	D10.2 <-> IC2.5
 	D11.1 <-> D12.2 <-> IC2.3 <-> IC2.4
-	D11.1 <-> IC2.4
-	D11.2 <-> IC2.12
 	D12.1 <-> D13.2 <-> IC2.10 <-> IC2.11
-	D12.1 <-> IC2.11
-	D12.2 <-> IC2.3
 	D13.1 <-> D14.2 <-> IC2.1 <-> IC2.2
-	D13.1 <-> IC2.2
-	D13.2 <-> IC2.10
-	D14.1 <-> IC2.9
-	D14.2 <-> IC2.1
 	D15.2 <-> Q1.1
-	D2.1 <-> IC1.6
 	D2.2 <-> D3.1 <-> IC1.13 <-> IC1.14
-	D2.2 <-> IC1.14
-	D3.1 <-> IC1.13
 	D3.2 <-> D4.1 <-> IC1.4 <-> IC1.5
-	D3.2 <-> IC1.5
-	D4.1 <-> IC1.4
 	D4.2 <-> D5.1 <-> IC1.11 <-> IC1.12
-	D4.2 <-> IC1.12
-	D5.1 <-> IC1.11
 	D5.2 <-> D6.1 <-> IC1.2 <-> IC1.3
-	D5.2 <-> IC1.3
-	D6.1 <-> IC1.2
 	D6.2 <-> D7.1 <-> IC1.10 <-> IC1.9
-	D6.2 <-> IC1.10
-	D7.1 <-> IC1.9
-	D7.2 <-> IC1.1
 	D8.1 <-> D9.2 <-> IC2.14 <-> IC2.15
-	D8.1 <-> IC2.15
-	D8.2 <-> IC2.7
 	D8.2 <-> IC2.7 <-> IC2.8
-	D9.1 <-> IC2.6
-	D9.2 <-> IC2.14
 	IC3.7 <-> R2.1 <-> R5.1
 	Q1.2 <-> Q1.3
 	R1.1 <-> VR1.2
diff --git a/diylc-regression-data/input/diy-fever/netlist/timmy7_incl_switches.txt b/diylc-regression-data/input/diy-fever/netlist/timmy7_incl_switches.txt
index 19611936..acf2a0dc 100644
--- a/diylc-regression-data/input/diy-fever/netlist/timmy7_incl_switches.txt
+++ b/diylc-regression-data/input/diy-fever/netlist/timmy7_incl_switches.txt
@@ -12,49 +12,21 @@ Switch setup: [SW1.ON1, SW1.ON2]
 	C5.2 <-> R8.2
 	C6.1 <-> VR3.1
 	C7.1 <-> D16.2 <-> IC3.5 <-> R9.2
-	D1.1 <-> IC1.15
 	D1.1 <-> IC1.15 <-> IC1.16
 	D1.2 <-> D2.1 <-> IC1.6 <-> IC1.7
-	D1.2 <-> IC1.7
 	D10.1 <-> D11.2 <-> IC2.12 <-> IC2.13
-	D10.1 <-> IC2.13
 	D10.2 <-> D9.1 <-> IC2.5 <-> IC2.6
-	D10.2 <-> IC2.5
 	D11.1 <-> D12.2 <-> IC2.3 <-> IC2.4
-	D11.1 <-> IC2.4
-	D11.2 <-> IC2.12
 	D12.1 <-> D13.2 <-> IC2.10 <-> IC2.11
-	D12.1 <-> IC2.11
-	D12.2 <-> IC2.3
 	D13.1 <-> D14.2 <-> IC2.1 <-> IC2.2
-	D13.1 <-> IC2.2
-	D13.2 <-> IC2.10
-	D14.1 <-> IC2.9
-	D14.2 <-> IC2.1
 	D15.2 <-> Q1.1
-	D2.1 <-> IC1.6
 	D2.2 <-> D3.1 <-> IC1.13 <-> IC1.14
-	D2.2 <-> IC1.14
-	D3.1 <-> IC1.13
 	D3.2 <-> D4.1 <-> IC1.4 <-> IC1.5
-	D3.2 <-> IC1.5
-	D4.1 <-> IC1.4
 	D4.2 <-> D5.1 <-> IC1.11 <-> IC1.12
-	D4.2 <-> IC1.12
-	D5.1 <-> IC1.11
 	D5.2 <-> D6.1 <-> IC1.2 <-> IC1.3
-	D5.2 <-> IC1.3
-	D6.1 <-> IC1.2
 	D6.2 <-> D7.1 <-> IC1.10 <-> IC1.9
-	D6.2 <-> IC1.10
-	D7.1 <-> IC1.9
-	D7.2 <-> IC1.1
 	D8.1 <-> D9.2 <-> IC2.14 <-> IC2.15
-	D8.1 <-> IC2.15
-	D8.2 <-> IC2.7
 	D8.2 <-> IC2.7 <-> IC2.8
-	D9.1 <-> IC2.6
-	D9.2 <-> IC2.14
 	IC3.7 <-> R2.1 <-> R5.1
 	Q1.2 <-> Q1.3
 	R1.1 <-> VR1.2
diff --git a/diylc-regression-data/input/diy-fever/png/IIc+.png b/diylc-regression-data/input/diy-fever/png/IIc+.png
index d3b072dd..24bb4be2 100644
Binary files a/diylc-regression-data/input/diy-fever/png/IIc+.png and b/diylc-regression-data/input/diy-fever/png/IIc+.png differ
diff --git a/diylc-regression-data/input/diy-fever/png/deacy.png b/diylc-regression-data/input/diy-fever/png/deacy.png
index 42480bbc..4ed32592 100644
Binary files a/diylc-regression-data/input/diy-fever/png/deacy.png and b/diylc-regression-data/input/diy-fever/png/deacy.png differ
diff --git a/diylc-regression-data/input/diy-fever/png/rangemaster.png b/diylc-regression-data/input/diy-fever/png/rangemaster.png
index 6c9b47c2..d67a17a1 100644
Binary files a/diylc-regression-data/input/diy-fever/png/rangemaster.png and b/diylc-regression-data/input/diy-fever/png/rangemaster.png differ
diff --git a/diylc-regression-data/input/diy-fever/png/ruby.png b/diylc-regression-data/input/diy-fever/png/ruby.png
index 21a25a36..b917dfa7 100644
Binary files a/diylc-regression-data/input/diy-fever/png/ruby.png and b/diylc-regression-data/input/diy-fever/png/ruby.png differ
diff --git a/diylc-regression-data/input/diy-fever/png/slo2.png b/diylc-regression-data/input/diy-fever/png/slo2.png
index 167dff48..49385b2b 100644
Binary files a/diylc-regression-data/input/diy-fever/png/slo2.png and b/diylc-regression-data/input/diy-fever/png/slo2.png differ
diff --git a/diylc-regression-data/input/diy-fever/png/tda1521a-2.png b/diylc-regression-data/input/diy-fever/png/tda1521a-2.png
index 326c905f..1827567c 100644
Binary files a/diylc-regression-data/input/diy-fever/png/tda1521a-2.png and b/diylc-regression-data/input/diy-fever/png/tda1521a-2.png differ
diff --git a/diylc-regression-data/input/diy-fever/png/timmy7.png b/diylc-regression-data/input/diy-fever/png/timmy7.png
index 4562d98e..aec4a3e7 100644
Binary files a/diylc-regression-data/input/diy-fever/png/timmy7.png and b/diylc-regression-data/input/diy-fever/png/timmy7.png differ
diff --git a/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt
index b50e4d4e..1574102e 100644
--- a/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/2555X BOARD LAYOUT RESaddTSRELAYnew_excl_switches.txt	
@@ -23,12 +23,10 @@ Switch setup: [Default]
 	C14.1 <-> MIDDLE-LEAD.2
 	C15.2 <-> DUAL BASS-CLEAN.3
 	C16.1 <-> C19.2 <-> R26.2
-	C16.1 <-> R26.2
 	C16.2 <-> R25.2
 	C17.1 <-> C18.1 <-> DUAL BASS-CLEAN.2 <-> R26.1
 	C18.2 <-> C23.1 <-> TREBLE-CLEAN.3
 	C19.1 <-> MIDDLE--CLEAN.2
-	C2.2 <-> R4.1
 	C21.2 <-> MIDDLE-LEAD.3
 	C22.1 <-> R25.1 <-> R29.1 <-> TREBLE-CLEAN.1
 	C23.2 <-> MIDDLE--CLEAN.3
@@ -50,7 +48,6 @@ Switch setup: [Default]
 	C32.2 <-> R34.2 <-> R35.2 <-> R40.2 <-> R41.2
 	C34.2 <-> C5.2 <-> R6.1
 	C4.1 <-> C7.3 <-> R10.1 <-> R10.2 <-> R18.2 <-> R19.2 <-> R4.2 <-> R40.1 <-> R5.1 <-> R6.2 <-> R7.2 <-> V1.7
-	C6.2 <-> D2.2 <-> D3.1
 	C7.1 <-> J59.J59Sleeve
 	C9.1 <-> R18.1
 	C9.2 <-> R17.1 <-> R20.1 <-> V2.7
@@ -82,7 +79,6 @@ Switch setup: [Default]
 	R51.1 <-> V4.5
 	R52.1 <-> V6.5
 	R52.2 <-> R53.2
-	R6.2 <-> R7.2
 	V4.3 <-> V5.3
 	V6.3 <-> V7.3
 
diff --git a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt
index 5b302fb3..fcfffaaf 100644
--- a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_excl_switches.txt	
@@ -51,12 +51,9 @@ Switch setup: [Default]
 	R26.2 <-> R27.1
 	R29.2 <-> V2.1 <-> V2.1 <-> V2.8 <-> V2.8
 	R6.2 <-> V1.3
-	V2.1 <-> V2.1
 	V2.2 <-> V2.2
-	V2.3 <-> V2.3
 	V2.4 <-> V2.4
 	V2.5 <-> V2.5
 	V2.6 <-> V2.6
 	V2.7 <-> V2.7
-	V2.8 <-> V2.8
 
diff --git a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt
index 110debfb..f94c29ec 100644
--- a/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/6Y6 Express 2_incl_switches.txt	
@@ -47,14 +47,11 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2]
 	R26.2 <-> R27.1
 	R29.2 <-> V2.1 <-> V2.1 <-> V2.8 <-> V2.8
 	R6.2 <-> V1.3
-	V2.1 <-> V2.1
 	V2.2 <-> V2.2
-	V2.3 <-> V2.3
 	V2.4 <-> V2.4
 	V2.5 <-> V2.5
 	V2.6 <-> V2.6
 	V2.7 <-> V2.7
-	V2.8 <-> V2.8
 
 Switch setup: [.ON2:.ON1, .ON2:.ON2]
 
@@ -105,12 +102,9 @@ Switch setup: [.ON2:.ON1, .ON2:.ON2]
 	R26.2 <-> R27.1
 	R29.2 <-> V2.1 <-> V2.1 <-> V2.8 <-> V2.8
 	R6.2 <-> V1.3
-	V2.1 <-> V2.1
 	V2.2 <-> V2.2
-	V2.3 <-> V2.3
 	V2.4 <-> V2.4
 	V2.5 <-> V2.5
 	V2.6 <-> V2.6
 	V2.7 <-> V2.7
-	V2.8 <-> V2.8
 
diff --git a/diylc-regression-data/input/user-files/netlist/ALU board with interface_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/ALU board with interface_excl_switches.txt
index ebe5acf8..1fe35ca7 100644
--- a/diylc-regression-data/input/user-files/netlist/ALU board with interface_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/ALU board with interface_excl_switches.txt	
@@ -1,4 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
+	C1.1 <-> C1.2 <-> R1.1 <-> R1.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/ALU board with interface_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/ALU board with interface_incl_switches.txt
index ebe5acf8..1fe35ca7 100644
--- a/diylc-regression-data/input/user-files/netlist/ALU board with interface_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/ALU board with interface_incl_switches.txt	
@@ -1,4 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
+	C1.1 <-> C1.2 <-> R1.1 <-> R1.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt
index 60f26e71..3888eab0 100644
--- a/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/AllTube Schem_excl_switches.txt	
@@ -7,59 +7,40 @@ Switch setup: [Default]
 	0,6W.1 <-> C19.1 <-> R32.2
 	0,6W.2 <-> C22.1
 	2W.1 <-> C45.1 <-> VR4.1 <-> VR4.3
-	C1.1 <-> R11.2
 	C1.1 <-> R11.2 <-> V9.2
-	C1.2 <-> C1.2 <-> C29.2 <-> C39.1 <-> C42.2 <-> C48.2 <-> C49.1 <-> C5.2 <-> C50.1 <-> C50.2 <-> C51.2 <-> C54.1 <-> C55.1 <-> C55.2 <-> C56.1 <-> C57.1 <-> C58.2 <-> C59.1 <-> L105.2 <-> L109.1 <-> L117.1 <-> L117.2 <-> L128.1 <-> L128.2 <-> L130.1 <-> L195.1 <-> R100.2 <-> R101.1 <-> R102.1 <-> R103.1 <-> R107.2 <-> R108.1 <-> R109.2 <-> R110.1 <-> R13.1 <-> R14.2 <-> R24.2 <-> R30.1 <-> R36.1 <-> R41.2 <-> R63.2 <-> R64.2 <-> R67.2 <-> R75.1 <-> R77.2 <-> R78.1 <-> R79.1 <-> R80.2 <-> R83.2 <-> R87.2 <-> R88.1 <-> R90.1 <-> R92.2 <-> R93.2 <-> R95.2 <-> R96.1 <-> R97.2 <-> V14.1 <-> V17.2 <-> V18.2 <-> V19.2 <-> V19.3 <-> V20.1 <-> V20.2 <-> V20.3 <-> VR10.3 <-> VR11.3 <-> VR13.2 <-> VR13.3 <-> VR14.2 <-> VR14.3 <-> VR18.1 <-> VR18.3 <-> VR19.3 <-> VR20.3 <-> VR21.3 <-> VR6.2 <-> VR8.3
+	C1.2 <-> C1.2 <-> C29.2 <-> C39.1 <-> C42.2 <-> C48.2 <-> C49.1 <-> C5.2 <-> C50.1 <-> C50.2 <-> C51.2 <-> C54.1 <-> C55.1 <-> C55.2 <-> C56.1 <-> C57.1 <-> C58.2 <-> C59.1 <-> L105.2 <-> L109.1 <-> L117.1 <-> L117.2 <-> L128.1 <-> L128.2 <-> L130.1 <-> L195.1 <-> R100.2 <-> R101.1 <-> R102.1 <-> R103.1 <-> R107.2 <-> R108.1 <-> R109.2 <-> R110.1 <-> R13.1 <-> R14.2 <-> R24.2 <-> R30.1 <-> R36.1 <-> R41.2 <-> R63.2 <-> R64.2 <-> R67.2 <-> R75.1 <-> R77.2 <-> R78.1 <-> R79.1 <-> R80.2 <-> R83.2 <-> R87.2 <-> R88.1 <-> R90.1 <-> R92.2 <-> R93.2 <-> R95.2 <-> R96.1 <-> R97.2 <-> V17.2 <-> V18.2 <-> V19.2 <-> V19.3 <-> V20.1 <-> V20.2 <-> V20.3 <-> VR10.3 <-> VR11.3 <-> VR13.2 <-> VR13.3 <-> VR14.2 <-> VR14.3 <-> VR18.1 <-> VR18.3 <-> VR19.3 <-> VR20.3 <-> VR21.3 <-> VR6.2 <-> VR8.3
 	C10.1 <-> C11.1 <-> R31.2
-	C10.1 <-> R31.2
 	C10.2 <-> VR1.3 <-> VR7.2
 	C11.2 <-> VR8.1
-	C12.1 <-> R19.1
 	C12.2 <-> C17.2 <-> C18.2 <-> C19.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C44.2 <-> C46.1 <-> C56.2 <-> C57.2 <-> C59.2 <-> C6.1 <-> C61.2 <-> C8.2 <-> D7.1 <-> D9.1 <-> GND <-> R34.2 <-> R38.1 <-> R76.2
 	C13.1 <-> R9.2
 	C13.2 <-> VR2.2
-	C14.1 <-> R21.2
 	C14.1 <-> R21.2 <-> R8.2
 	C14.2 <-> V5.1
 	C16.1 <-> R28.2 <-> R29.1 <-> V6.2
-	C16.1 <-> R29.1
 	C16.2 <-> VR3.2
 	C17.1 <-> R26.1 <-> R28.1
-	C17.1 <-> R28.1
 	C18.1 <-> D3.2 <-> D8.2 <-> R32.1
-	C18.1 <-> R32.1
-	C19.1 <-> R32.2
 	C2.1 <-> R1.2 <-> V1.2
 	C20.1 <-> R33.1
 	C21.1 <-> R35.1
 	C23.2 <-> VR5.1
 	C24.1 <-> R29.2
 	C24.2 <-> VR15.2
-	C25.1 <-> R46.1
 	C25.1 <-> R46.1 <-> V2.1
-	C26.1 <-> R47.2
 	C26.1 <-> R47.2 <-> V3.1
 	C26.2 <-> R12.1 <-> R23.1 <-> R48.1
-	C26.2 <-> R23.1
-	C27.1 <-> R52.1 <-> R53.1 <-> R56.1 <-> R59.1 <-> R7.1 <-> V11.3 <-> V11.4 <-> V11.6 <-> V11.7
-	C27.1 <-> R53.1
+	C27.1 <-> R52.1 <-> R53.1 <-> R56.1 <-> R59.1 <-> R7.1 <-> V11.3 <-> V11.4
 	C27.2 <-> R49.1 <-> R6.2
-	C27.2 <-> R6.2
-	C28.1 <-> R15.2 <-> R51.1 <-> R54.1 <-> R57.2 <-> R58.1 <-> V13.3 <-> V13.4 <-> V13.6 <-> V13.7
-	C28.1 <-> R54.1
-	C28.2 <-> R17.2
+	C28.1 <-> R15.2 <-> R51.1 <-> R54.1 <-> R57.2 <-> R58.1 <-> V13.3 <-> V13.4
 	C28.2 <-> R17.2 <-> R50.2
-	C29.1 <-> R2.1
 	C29.1 <-> R2.1 <-> V14.3
 	C3.1 <-> R18.1 <-> V5.3
 	C30.1 <-> R84.1 <-> R85.1 <-> VR12.3 <-> VR4.2 <-> VR9.3
 	C31.1 <-> R89.2 <-> V27.2
 	C31.2 <-> C51.1 <-> R63.1
-	C31.2 <-> R63.1
 	C32.1 <-> C46.2 <-> R38.2 <-> VR16.2
-	C32.1 <-> VR16.2
 	C32.2 <-> R37.1 <-> VR16.1
-	C33.1 <-> R105.2
 	C33.1 <-> R105.2 <-> V26.2
 	C33.2 <-> R107.1 <-> V24.1
 	C34.1 <-> R37.2 <-> V7.1
@@ -67,76 +48,51 @@ Switch setup: [Default]
 	C36.2 <-> R70.1
 	C37.1 <-> C6.2 <-> R10.2 <-> R69.1 <-> R73.1
 	C37.2 <-> C38.1 <-> R73.2 <-> V8.2
-	C38.1 <-> R73.2 <-> V8.2
 	C38.2 <-> C41.2 <-> Cl Gain.3 <-> R36.2 <-> R65.2 <-> VR15.1 <-> VR16.3
 	C39.2 <-> R90.2 <-> VR10.2
-	C4.1 <-> R19.2
 	C40.1 <-> R17.1 <-> V3.2
 	C40.2 <-> R6.1
 	C42.1 <-> R66.2 <-> V10.2
 	C43.1 <-> Cl Gain.2
 	C43.2 <-> Cl Gain.1 <-> V10.1
 	C44.1 <-> R11.1 <-> R89.1 <-> R91.1
-	C45.1 <-> VR4.3
 	C47.1 <-> R78.2 <-> V16.2
 	C47.2 <-> VR18.2
-	C49.2 <-> R86.1
 	C49.2 <-> R86.1 <-> V19.1
-	C50.2 <-> R87.2
-	C54.2 <-> R40.2
 	C54.2 <-> R40.2 <-> V23.3
-	C56.1 <-> R102.1
-	C57.1 <-> R103.1
-	C59.1 <-> R96.1
-	C6.2 <-> R73.1
 	C60.1 <-> R104.2 <-> R106.2 <-> R41.1
 	C60.2 <-> R108.2 <-> V25.1
 	C61.1 <-> C62.1 <-> L193.1 <-> L193.2 <-> L194.1 <-> R105.1 <-> R111.1 <-> R112.2 <-> V24.2
-	C61.1 <-> R111.1
 	C62.2 <-> L195.2 <-> R110.2 <-> VR21.2
 	C7.1 <-> R27.2 <-> V15.2
-	C8.1 <-> R22.1
 	C8.1 <-> R22.1 <-> R5.1 <-> V22.2
-	C9.1 <-> R25.2 <-> R92.1 <-> V22.4 <-> V22.5
-	Cl Gain.1 <-> V10.1
+	C9.1 <-> R25.2 <-> R92.1
 	D3.1 <-> D7.2
 	D4.1 <-> R43.2
 	D8.1 <-> D9.2
-	F1.2 <-> L29.1
 	F1.2 <-> L29.1 <-> L29.2
-	L109.1 <-> L117.2
 	L109.2 <-> VR11.2
 	L129.1 <-> L130.2
 	L129.2 <-> VR19.2
-	L193.2 <-> L194.1
 	L194.2 <-> V25.2
-	L195.1 <-> R110.1
-	L195.2 <-> R110.2
 	L3.1 <-> V11.2 <-> V12.2
 	L3.2 <-> V13.2 <-> V4.2
 	L71.1 <-> L71.2 <-> L72.2 <-> R12.2
-	L71.1 <-> L72.2
-	R1.1 <-> R3.1
-	R10.2 <-> R69.1
 	R100.1 <-> R99.2
 	R101.2 <-> VR6.3
 	R104.1 <-> V26.3
-	R104.2 <-> R41.1
 	R106.1 <-> R112.1 <-> V26.1
 	R109.1 <-> V24.3 <-> V25.3
 	R13.2 <-> V21.1
 	R14.1 <-> V21.3
 	R15.1 <-> R7.2
 	R16.1 <-> V6.3
-	R2.2 <-> R40.1
 	R2.2 <-> R40.1 <-> VR6.1
 	R22.2 <-> V21.2
 	R25.1 <-> V22.3
-	R25.2 <-> R92.1
 	R30.2 <-> V9.3
 	R33.2 <-> R34.1
 	R35.2 <-> R76.1
-	R39.2 <-> R67.1
 	R39.2 <-> R67.1 <-> VR20.2
 	R4.1 <-> V1.3
 	R45.1 <-> R46.2 <-> R47.1 <-> R48.2
@@ -165,18 +121,14 @@ Switch setup: [Default]
 	R80.1 <-> R82.2
 	R81.1 <-> VR12.2
 	R82.1 <-> V16.1
-	R84.2 <-> VR9.1
 	R86.2 <-> R87.1 <-> R88.2
-	R90.2 <-> VR10.2
 	R93.1 <-> V9.1
 	R95.1 <-> V17.3 <-> V18.3
 	R97.1 <-> R98.2
-	R98.1 <-> R99.1
 	R98.1 <-> R99.1 <-> V14.2 <-> V23.2
 	V17.1 <-> VR11.1
 	V18.1 <-> VR13.1
 	V27.1 <-> VR10.1
-	VR11.3 <-> VR13.2
 	VR3.3 <-> VR5.2
 	VR7.1 <-> VR8.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt
index 60f26e71..3888eab0 100644
--- a/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/AllTube Schem_incl_switches.txt	
@@ -7,59 +7,40 @@ Switch setup: [Default]
 	0,6W.1 <-> C19.1 <-> R32.2
 	0,6W.2 <-> C22.1
 	2W.1 <-> C45.1 <-> VR4.1 <-> VR4.3
-	C1.1 <-> R11.2
 	C1.1 <-> R11.2 <-> V9.2
-	C1.2 <-> C1.2 <-> C29.2 <-> C39.1 <-> C42.2 <-> C48.2 <-> C49.1 <-> C5.2 <-> C50.1 <-> C50.2 <-> C51.2 <-> C54.1 <-> C55.1 <-> C55.2 <-> C56.1 <-> C57.1 <-> C58.2 <-> C59.1 <-> L105.2 <-> L109.1 <-> L117.1 <-> L117.2 <-> L128.1 <-> L128.2 <-> L130.1 <-> L195.1 <-> R100.2 <-> R101.1 <-> R102.1 <-> R103.1 <-> R107.2 <-> R108.1 <-> R109.2 <-> R110.1 <-> R13.1 <-> R14.2 <-> R24.2 <-> R30.1 <-> R36.1 <-> R41.2 <-> R63.2 <-> R64.2 <-> R67.2 <-> R75.1 <-> R77.2 <-> R78.1 <-> R79.1 <-> R80.2 <-> R83.2 <-> R87.2 <-> R88.1 <-> R90.1 <-> R92.2 <-> R93.2 <-> R95.2 <-> R96.1 <-> R97.2 <-> V14.1 <-> V17.2 <-> V18.2 <-> V19.2 <-> V19.3 <-> V20.1 <-> V20.2 <-> V20.3 <-> VR10.3 <-> VR11.3 <-> VR13.2 <-> VR13.3 <-> VR14.2 <-> VR14.3 <-> VR18.1 <-> VR18.3 <-> VR19.3 <-> VR20.3 <-> VR21.3 <-> VR6.2 <-> VR8.3
+	C1.2 <-> C1.2 <-> C29.2 <-> C39.1 <-> C42.2 <-> C48.2 <-> C49.1 <-> C5.2 <-> C50.1 <-> C50.2 <-> C51.2 <-> C54.1 <-> C55.1 <-> C55.2 <-> C56.1 <-> C57.1 <-> C58.2 <-> C59.1 <-> L105.2 <-> L109.1 <-> L117.1 <-> L117.2 <-> L128.1 <-> L128.2 <-> L130.1 <-> L195.1 <-> R100.2 <-> R101.1 <-> R102.1 <-> R103.1 <-> R107.2 <-> R108.1 <-> R109.2 <-> R110.1 <-> R13.1 <-> R14.2 <-> R24.2 <-> R30.1 <-> R36.1 <-> R41.2 <-> R63.2 <-> R64.2 <-> R67.2 <-> R75.1 <-> R77.2 <-> R78.1 <-> R79.1 <-> R80.2 <-> R83.2 <-> R87.2 <-> R88.1 <-> R90.1 <-> R92.2 <-> R93.2 <-> R95.2 <-> R96.1 <-> R97.2 <-> V17.2 <-> V18.2 <-> V19.2 <-> V19.3 <-> V20.1 <-> V20.2 <-> V20.3 <-> VR10.3 <-> VR11.3 <-> VR13.2 <-> VR13.3 <-> VR14.2 <-> VR14.3 <-> VR18.1 <-> VR18.3 <-> VR19.3 <-> VR20.3 <-> VR21.3 <-> VR6.2 <-> VR8.3
 	C10.1 <-> C11.1 <-> R31.2
-	C10.1 <-> R31.2
 	C10.2 <-> VR1.3 <-> VR7.2
 	C11.2 <-> VR8.1
-	C12.1 <-> R19.1
 	C12.2 <-> C17.2 <-> C18.2 <-> C19.2 <-> C20.2 <-> C21.2 <-> C22.2 <-> C44.2 <-> C46.1 <-> C56.2 <-> C57.2 <-> C59.2 <-> C6.1 <-> C61.2 <-> C8.2 <-> D7.1 <-> D9.1 <-> GND <-> R34.2 <-> R38.1 <-> R76.2
 	C13.1 <-> R9.2
 	C13.2 <-> VR2.2
-	C14.1 <-> R21.2
 	C14.1 <-> R21.2 <-> R8.2
 	C14.2 <-> V5.1
 	C16.1 <-> R28.2 <-> R29.1 <-> V6.2
-	C16.1 <-> R29.1
 	C16.2 <-> VR3.2
 	C17.1 <-> R26.1 <-> R28.1
-	C17.1 <-> R28.1
 	C18.1 <-> D3.2 <-> D8.2 <-> R32.1
-	C18.1 <-> R32.1
-	C19.1 <-> R32.2
 	C2.1 <-> R1.2 <-> V1.2
 	C20.1 <-> R33.1
 	C21.1 <-> R35.1
 	C23.2 <-> VR5.1
 	C24.1 <-> R29.2
 	C24.2 <-> VR15.2
-	C25.1 <-> R46.1
 	C25.1 <-> R46.1 <-> V2.1
-	C26.1 <-> R47.2
 	C26.1 <-> R47.2 <-> V3.1
 	C26.2 <-> R12.1 <-> R23.1 <-> R48.1
-	C26.2 <-> R23.1
-	C27.1 <-> R52.1 <-> R53.1 <-> R56.1 <-> R59.1 <-> R7.1 <-> V11.3 <-> V11.4 <-> V11.6 <-> V11.7
-	C27.1 <-> R53.1
+	C27.1 <-> R52.1 <-> R53.1 <-> R56.1 <-> R59.1 <-> R7.1 <-> V11.3 <-> V11.4
 	C27.2 <-> R49.1 <-> R6.2
-	C27.2 <-> R6.2
-	C28.1 <-> R15.2 <-> R51.1 <-> R54.1 <-> R57.2 <-> R58.1 <-> V13.3 <-> V13.4 <-> V13.6 <-> V13.7
-	C28.1 <-> R54.1
-	C28.2 <-> R17.2
+	C28.1 <-> R15.2 <-> R51.1 <-> R54.1 <-> R57.2 <-> R58.1 <-> V13.3 <-> V13.4
 	C28.2 <-> R17.2 <-> R50.2
-	C29.1 <-> R2.1
 	C29.1 <-> R2.1 <-> V14.3
 	C3.1 <-> R18.1 <-> V5.3
 	C30.1 <-> R84.1 <-> R85.1 <-> VR12.3 <-> VR4.2 <-> VR9.3
 	C31.1 <-> R89.2 <-> V27.2
 	C31.2 <-> C51.1 <-> R63.1
-	C31.2 <-> R63.1
 	C32.1 <-> C46.2 <-> R38.2 <-> VR16.2
-	C32.1 <-> VR16.2
 	C32.2 <-> R37.1 <-> VR16.1
-	C33.1 <-> R105.2
 	C33.1 <-> R105.2 <-> V26.2
 	C33.2 <-> R107.1 <-> V24.1
 	C34.1 <-> R37.2 <-> V7.1
@@ -67,76 +48,51 @@ Switch setup: [Default]
 	C36.2 <-> R70.1
 	C37.1 <-> C6.2 <-> R10.2 <-> R69.1 <-> R73.1
 	C37.2 <-> C38.1 <-> R73.2 <-> V8.2
-	C38.1 <-> R73.2 <-> V8.2
 	C38.2 <-> C41.2 <-> Cl Gain.3 <-> R36.2 <-> R65.2 <-> VR15.1 <-> VR16.3
 	C39.2 <-> R90.2 <-> VR10.2
-	C4.1 <-> R19.2
 	C40.1 <-> R17.1 <-> V3.2
 	C40.2 <-> R6.1
 	C42.1 <-> R66.2 <-> V10.2
 	C43.1 <-> Cl Gain.2
 	C43.2 <-> Cl Gain.1 <-> V10.1
 	C44.1 <-> R11.1 <-> R89.1 <-> R91.1
-	C45.1 <-> VR4.3
 	C47.1 <-> R78.2 <-> V16.2
 	C47.2 <-> VR18.2
-	C49.2 <-> R86.1
 	C49.2 <-> R86.1 <-> V19.1
-	C50.2 <-> R87.2
-	C54.2 <-> R40.2
 	C54.2 <-> R40.2 <-> V23.3
-	C56.1 <-> R102.1
-	C57.1 <-> R103.1
-	C59.1 <-> R96.1
-	C6.2 <-> R73.1
 	C60.1 <-> R104.2 <-> R106.2 <-> R41.1
 	C60.2 <-> R108.2 <-> V25.1
 	C61.1 <-> C62.1 <-> L193.1 <-> L193.2 <-> L194.1 <-> R105.1 <-> R111.1 <-> R112.2 <-> V24.2
-	C61.1 <-> R111.1
 	C62.2 <-> L195.2 <-> R110.2 <-> VR21.2
 	C7.1 <-> R27.2 <-> V15.2
-	C8.1 <-> R22.1
 	C8.1 <-> R22.1 <-> R5.1 <-> V22.2
-	C9.1 <-> R25.2 <-> R92.1 <-> V22.4 <-> V22.5
-	Cl Gain.1 <-> V10.1
+	C9.1 <-> R25.2 <-> R92.1
 	D3.1 <-> D7.2
 	D4.1 <-> R43.2
 	D8.1 <-> D9.2
-	F1.2 <-> L29.1
 	F1.2 <-> L29.1 <-> L29.2
-	L109.1 <-> L117.2
 	L109.2 <-> VR11.2
 	L129.1 <-> L130.2
 	L129.2 <-> VR19.2
-	L193.2 <-> L194.1
 	L194.2 <-> V25.2
-	L195.1 <-> R110.1
-	L195.2 <-> R110.2
 	L3.1 <-> V11.2 <-> V12.2
 	L3.2 <-> V13.2 <-> V4.2
 	L71.1 <-> L71.2 <-> L72.2 <-> R12.2
-	L71.1 <-> L72.2
-	R1.1 <-> R3.1
-	R10.2 <-> R69.1
 	R100.1 <-> R99.2
 	R101.2 <-> VR6.3
 	R104.1 <-> V26.3
-	R104.2 <-> R41.1
 	R106.1 <-> R112.1 <-> V26.1
 	R109.1 <-> V24.3 <-> V25.3
 	R13.2 <-> V21.1
 	R14.1 <-> V21.3
 	R15.1 <-> R7.2
 	R16.1 <-> V6.3
-	R2.2 <-> R40.1
 	R2.2 <-> R40.1 <-> VR6.1
 	R22.2 <-> V21.2
 	R25.1 <-> V22.3
-	R25.2 <-> R92.1
 	R30.2 <-> V9.3
 	R33.2 <-> R34.1
 	R35.2 <-> R76.1
-	R39.2 <-> R67.1
 	R39.2 <-> R67.1 <-> VR20.2
 	R4.1 <-> V1.3
 	R45.1 <-> R46.2 <-> R47.1 <-> R48.2
@@ -165,18 +121,14 @@ Switch setup: [Default]
 	R80.1 <-> R82.2
 	R81.1 <-> VR12.2
 	R82.1 <-> V16.1
-	R84.2 <-> VR9.1
 	R86.2 <-> R87.1 <-> R88.2
-	R90.2 <-> VR10.2
 	R93.1 <-> V9.1
 	R95.1 <-> V17.3 <-> V18.3
 	R97.1 <-> R98.2
-	R98.1 <-> R99.1
 	R98.1 <-> R99.1 <-> V14.2 <-> V23.2
 	V17.1 <-> VR11.1
 	V18.1 <-> VR13.1
 	V27.1 <-> VR10.1
-	VR11.3 <-> VR13.2
 	VR3.3 <-> VR5.2
 	VR7.1 <-> VR8.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Blue 7_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Blue 7_excl_switches.txt
index 2df35fc6..0d0dd9e1 100644
--- a/diylc-regression-data/input/user-files/netlist/Blue 7_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Blue 7_excl_switches.txt	
@@ -6,7 +6,6 @@ Switch setup: [Default]
 	.02.2 <-> 470K.1
 	0.1.1 <-> 820K.1
 	0.1.2 <-> 1k2.1 <-> 3u3 50v.1
-	180k.1 <-> 1k2.2
 	180k.1 <-> 1k2.2 <-> 3u3 50v.2 <-> 560R.1
 	1k5.1 <-> 22k.2 <-> 22u 450v.1 <-> 22u 450v.2 <-> 22uF 450v.2 <-> 270R.2 <-> 33k.2 <-> 33k.2 <-> 470K.2 <-> 470K.2 <-> 470R .2 <-> 470R.2 <-> 47u 50v.2 <-> 80u 450v.2 <-> D1.1 <-> D3.1
 	1k5.2 <-> 80u 450v.1 <-> D2.2 <-> D4.2
diff --git a/diylc-regression-data/input/user-files/netlist/Blue 7_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Blue 7_incl_switches.txt
index 2df35fc6..0d0dd9e1 100644
--- a/diylc-regression-data/input/user-files/netlist/Blue 7_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Blue 7_incl_switches.txt	
@@ -6,7 +6,6 @@ Switch setup: [Default]
 	.02.2 <-> 470K.1
 	0.1.1 <-> 820K.1
 	0.1.2 <-> 1k2.1 <-> 3u3 50v.1
-	180k.1 <-> 1k2.2
 	180k.1 <-> 1k2.2 <-> 3u3 50v.2 <-> 560R.1
 	1k5.1 <-> 22k.2 <-> 22u 450v.1 <-> 22u 450v.2 <-> 22uF 450v.2 <-> 270R.2 <-> 33k.2 <-> 33k.2 <-> 470K.2 <-> 470K.2 <-> 470R .2 <-> 470R.2 <-> 47u 50v.2 <-> 80u 450v.2 <-> D1.1 <-> D3.1
 	1k5.2 <-> 80u 450v.1 <-> D2.2 <-> D4.2
diff --git a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt
index 9d5c837b..44a578b0 100644
--- a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_excl_switches.txt	
@@ -1,6 +1,5 @@
 Switch setup: [Default]
 
-	.1 <-> .1
 	.1 <-> .1 <-> C1.2 <-> C17.2 <-> C18.2 <-> C20.2 <-> C23.2 <-> C24.2 <-> C27.2 <-> C31.2 <-> C32.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C42.2 <-> C44.2 <-> C5.2 <-> D1.2 <-> GND <-> Mids.3 <-> R18.2 <-> R22.2 <-> R23.2 <-> R3.2 <-> R37.2 <-> R38.2 <-> R39.2 <-> R4.2 <-> R45.2 <-> R47.2 <-> R63.2 <-> R8.2 <-> Tone.3 <-> Vol.3
 	.1 <-> .2
 	.1 <-> .2
@@ -29,7 +28,6 @@ Switch setup: [Default]
 	C3.2 <-> R9.1
 	C30.1 <-> Dwell.2
 	C30.2 <-> C6.2
-	C31.1 <-> V2A.5
 	C33.1 <-> R40.1 <-> V2B.2
 	C33.2 <-> C47.1
 	C34.1 <-> R43.2
diff --git a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt
index 9d5c837b..44a578b0 100644
--- a/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/BrownfaceReverb Schematic 2_incl_switches.txt	
@@ -1,6 +1,5 @@
 Switch setup: [Default]
 
-	.1 <-> .1
 	.1 <-> .1 <-> C1.2 <-> C17.2 <-> C18.2 <-> C20.2 <-> C23.2 <-> C24.2 <-> C27.2 <-> C31.2 <-> C32.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C42.2 <-> C44.2 <-> C5.2 <-> D1.2 <-> GND <-> Mids.3 <-> R18.2 <-> R22.2 <-> R23.2 <-> R3.2 <-> R37.2 <-> R38.2 <-> R39.2 <-> R4.2 <-> R45.2 <-> R47.2 <-> R63.2 <-> R8.2 <-> Tone.3 <-> Vol.3
 	.1 <-> .2
 	.1 <-> .2
@@ -29,7 +28,6 @@ Switch setup: [Default]
 	C3.2 <-> R9.1
 	C30.1 <-> Dwell.2
 	C30.2 <-> C6.2
-	C31.1 <-> V2A.5
 	C33.1 <-> R40.1 <-> V2B.2
 	C33.2 <-> C47.1
 	C34.1 <-> R43.2
diff --git a/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_excl_switches.txt
index 38df45ce..3d9ed562 100644
--- a/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_excl_switches.txt	
@@ -1,22 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> IC1.10 <-> IC1.11 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.28 <-> IC1.29 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.4 <-> IC2.10 <-> IC2.11 <-> IC2.20 <-> IC2.21 <-> IC2.22 <-> IC2.28 <-> IC2.29 <-> IC2.3 <-> IC2.30 <-> IC2.31 <-> IC2.33 <-> IC2.4 <-> IC3.4 <-> IC3.8 <-> IC4.8
-	C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> IC1.32 <-> IC1.42 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.32 <-> IC2.42 <-> IC2.5 <-> IC2.6 <-> IC2.8 <-> IC3.9 <-> IC4.6 <-> IC4.9
-	IC1.1 <-> IC2.1
-	IC1.12 <-> IC2.12
-	IC1.13 <-> IC2.13
-	IC1.14 <-> IC2.14
-	IC1.15 <-> IC2.15
-	IC1.16 <-> IC2.16
-	IC1.17 <-> IC2.17
-	IC1.18 <-> IC2.18
-	IC1.19 <-> IC2.19
-	IC1.2 <-> IC2.2
-	IC1.25 <-> IC2.25
-	IC1.26 <-> IC2.26
-	IC1.27 <-> IC2.27 <-> IC3.5 <-> IC4.5
-	IC3.1 <-> IC4.1
-	IC3.2 <-> IC4.2
-	IC3.3 <-> IC4.3
-	IC3.6 <-> IC4.4
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.29 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.32 <-> IC1.33 <-> IC1.34 <-> IC1.35 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.41 <-> IC1.42 <-> IC1.43 <-> IC1.44 <-> IC1.45 <-> IC1.46 <-> IC1.47 <-> IC1.48 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.20 <-> IC2.21 <-> IC2.22 <-> IC2.23 <-> IC2.24 <-> IC2.25 <-> IC2.26 <-> IC2.27 <-> IC2.28 <-> IC2.29 <-> IC2.3 <-> IC2.30 <-> IC2.31 <-> IC2.32 <-> IC2.33 <-> IC2.34 <-> IC2.35 <-> IC2.36 <-> IC2.37 <-> IC2.38 <-> IC2.39 <-> IC2.4 <-> IC2.40 <-> IC2.41 <-> IC2.42 <-> IC2.43 <-> IC2.44 <-> IC2.45 <-> IC2.46 <-> IC2.47 <-> IC2.48 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.16 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.8 <-> IC4.9
+	IC3.15 <-> IC3.7
+	IC4.15 <-> IC4.7
 
diff --git a/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_incl_switches.txt
index 38df45ce..3d9ed562 100644
--- a/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Bus decoder board (RL,Z2,Z1,Z0)_incl_switches.txt	
@@ -1,22 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> IC1.10 <-> IC1.11 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.28 <-> IC1.29 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.33 <-> IC1.4 <-> IC2.10 <-> IC2.11 <-> IC2.20 <-> IC2.21 <-> IC2.22 <-> IC2.28 <-> IC2.29 <-> IC2.3 <-> IC2.30 <-> IC2.31 <-> IC2.33 <-> IC2.4 <-> IC3.4 <-> IC3.8 <-> IC4.8
-	C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> IC1.32 <-> IC1.42 <-> IC1.5 <-> IC1.6 <-> IC1.8 <-> IC2.32 <-> IC2.42 <-> IC2.5 <-> IC2.6 <-> IC2.8 <-> IC3.9 <-> IC4.6 <-> IC4.9
-	IC1.1 <-> IC2.1
-	IC1.12 <-> IC2.12
-	IC1.13 <-> IC2.13
-	IC1.14 <-> IC2.14
-	IC1.15 <-> IC2.15
-	IC1.16 <-> IC2.16
-	IC1.17 <-> IC2.17
-	IC1.18 <-> IC2.18
-	IC1.19 <-> IC2.19
-	IC1.2 <-> IC2.2
-	IC1.25 <-> IC2.25
-	IC1.26 <-> IC2.26
-	IC1.27 <-> IC2.27 <-> IC3.5 <-> IC4.5
-	IC3.1 <-> IC4.1
-	IC3.2 <-> IC4.2
-	IC3.3 <-> IC4.3
-	IC3.6 <-> IC4.4
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.21 <-> IC1.22 <-> IC1.23 <-> IC1.24 <-> IC1.25 <-> IC1.26 <-> IC1.27 <-> IC1.28 <-> IC1.29 <-> IC1.3 <-> IC1.30 <-> IC1.31 <-> IC1.32 <-> IC1.33 <-> IC1.34 <-> IC1.35 <-> IC1.36 <-> IC1.37 <-> IC1.38 <-> IC1.39 <-> IC1.4 <-> IC1.40 <-> IC1.41 <-> IC1.42 <-> IC1.43 <-> IC1.44 <-> IC1.45 <-> IC1.46 <-> IC1.47 <-> IC1.48 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.20 <-> IC2.21 <-> IC2.22 <-> IC2.23 <-> IC2.24 <-> IC2.25 <-> IC2.26 <-> IC2.27 <-> IC2.28 <-> IC2.29 <-> IC2.3 <-> IC2.30 <-> IC2.31 <-> IC2.32 <-> IC2.33 <-> IC2.34 <-> IC2.35 <-> IC2.36 <-> IC2.37 <-> IC2.38 <-> IC2.39 <-> IC2.4 <-> IC2.40 <-> IC2.41 <-> IC2.42 <-> IC2.43 <-> IC2.44 <-> IC2.45 <-> IC2.46 <-> IC2.47 <-> IC2.48 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.16 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.8 <-> IC4.9
+	IC3.15 <-> IC3.7
+	IC4.15 <-> IC4.7
 
diff --git a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt
index 4ecf16cd..d0ea2070 100644
--- a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt
+++ b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_excl_switches.txt
@@ -2,7 +2,6 @@ Switch setup: [Default]
 
 	C1.1 <-> C2.1 <-> R2.2 <-> V7.2 <-> V7.8
 	C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C7.2 <-> C8.1 <-> C9.1
-	C10.1 <-> R13.1
 	C10.1 <-> R13.1 <-> V3.2
 	C10.2 <-> C11.2 <-> C18.2 <-> C31.1 <-> R15.1 <-> R19.2 <-> R23.2 <-> R26.2 <-> R53.1
 	C11.1 <-> V3.3
diff --git a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt
index 4ecf16cd..d0ea2070 100644
--- a/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt
+++ b/diylc-regression-data/input/user-files/netlist/DR18Tagstrip_incl_switches.txt
@@ -2,7 +2,6 @@ Switch setup: [Default]
 
 	C1.1 <-> C2.1 <-> R2.2 <-> V7.2 <-> V7.8
 	C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> C7.2 <-> C8.1 <-> C9.1
-	C10.1 <-> R13.1
 	C10.1 <-> R13.1 <-> V3.2
 	C10.2 <-> C11.2 <-> C18.2 <-> C31.1 <-> R15.1 <-> R19.2 <-> R23.2 <-> R26.2 <-> R53.1
 	C11.1 <-> V3.3
diff --git a/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_excl_switches.txt
index 826b60b9..f9a082f1 100644
--- a/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_excl_switches.txt	
@@ -1,23 +1,11 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.2 <-> R1.1
-	C1.2 <-> C3.1 <-> C7.1 <-> C8.1 <-> D3.2 <-> IC1.4 <-> R3.2
-	C10.1 <-> C9.2 <-> IC2.8
-	C10.2 <-> D5.2 <-> D6.1
-	C12.1 <-> C14.1 <-> C2.2 <-> IC2.4 <-> R4.2
-	C12.2 <-> D6.2
-	C14.2 <-> D5.1 <-> IC2.7
-	C2.1 <-> IC2.2 <-> R5.1
-	C3.2 <-> D1.1 <-> IC1.7
-	C4.1 <-> R1.2 <-> R2.2
-	C4.2 <-> C5.1 <-> C6.1 <-> IC1.8
-	C5.2 <-> D1.2 <-> D2.1
-	C6.2 <-> D3.1 <-> D4.2
-	C7.2 <-> D2.2
-	C8.2 <-> D4.1
-	C9.1 <-> R5.2 <-> R6.2
-	IC1.1 <-> IC1.5
-	IC1.3 <-> R2.1 <-> R3.1
+	C1.1 <-> C5.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> D2.2 <-> IC1.2 <-> IC1.6 <-> R1.1
+	C1.2 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> D3.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.2
+	C10.1 <-> C12.1 <-> C14.1 <-> C2.2 <-> C9.1 <-> C9.2 <-> IC2.4 <-> IC2.8 <-> R4.2 <-> R5.2 <-> R6.2
+	C10.2 <-> C12.2 <-> C2.1 <-> D5.2 <-> D6.1 <-> D6.2 <-> IC2.2 <-> IC2.6 <-> R5.1
+	C14.2 <-> D5.1 <-> IC2.3 <-> IC2.7 <-> R4.1 <-> R6.1
+	C3.2 <-> D1.1 <-> IC1.3 <-> IC1.7 <-> R2.1 <-> R3.1
+	C6.2 <-> C8.2 <-> D3.1 <-> D4.1 <-> D4.2 <-> IC1.1 <-> IC1.5
 	IC2.1 <-> IC2.5
-	IC2.3 <-> R4.1 <-> R6.1
 
diff --git a/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_incl_switches.txt
index 826b60b9..f9a082f1 100644
--- a/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/LM386 Voltage Converter_incl_switches.txt	
@@ -1,23 +1,11 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.2 <-> R1.1
-	C1.2 <-> C3.1 <-> C7.1 <-> C8.1 <-> D3.2 <-> IC1.4 <-> R3.2
-	C10.1 <-> C9.2 <-> IC2.8
-	C10.2 <-> D5.2 <-> D6.1
-	C12.1 <-> C14.1 <-> C2.2 <-> IC2.4 <-> R4.2
-	C12.2 <-> D6.2
-	C14.2 <-> D5.1 <-> IC2.7
-	C2.1 <-> IC2.2 <-> R5.1
-	C3.2 <-> D1.1 <-> IC1.7
-	C4.1 <-> R1.2 <-> R2.2
-	C4.2 <-> C5.1 <-> C6.1 <-> IC1.8
-	C5.2 <-> D1.2 <-> D2.1
-	C6.2 <-> D3.1 <-> D4.2
-	C7.2 <-> D2.2
-	C8.2 <-> D4.1
-	C9.1 <-> R5.2 <-> R6.2
-	IC1.1 <-> IC1.5
-	IC1.3 <-> R2.1 <-> R3.1
+	C1.1 <-> C5.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> D2.2 <-> IC1.2 <-> IC1.6 <-> R1.1
+	C1.2 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> D3.2 <-> IC1.4 <-> IC1.8 <-> R1.2 <-> R2.2 <-> R3.2
+	C10.1 <-> C12.1 <-> C14.1 <-> C2.2 <-> C9.1 <-> C9.2 <-> IC2.4 <-> IC2.8 <-> R4.2 <-> R5.2 <-> R6.2
+	C10.2 <-> C12.2 <-> C2.1 <-> D5.2 <-> D6.1 <-> D6.2 <-> IC2.2 <-> IC2.6 <-> R5.1
+	C14.2 <-> D5.1 <-> IC2.3 <-> IC2.7 <-> R4.1 <-> R6.1
+	C3.2 <-> D1.1 <-> IC1.3 <-> IC1.7 <-> R2.1 <-> R3.1
+	C6.2 <-> C8.2 <-> D3.1 <-> D4.1 <-> D4.2 <-> IC1.1 <-> IC1.5
 	IC2.1 <-> IC2.5
-	IC2.3 <-> R4.1 <-> R6.1
 
diff --git a/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt
index bf34f2b9..b6ed6552 100644
--- a/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt
+++ b/diylc-regression-data/input/user-files/netlist/LargeBandMaster_excl_switches.txt
@@ -261,10 +261,6 @@ Switch setup: [Default]
 	R1.1 <-> R1.1 <-> R1.1 <-> R1.2
 	R1.1 <-> R1.1 <-> R1.1 <-> R1.2
 	R1.1 <-> R1.1 <-> R1.1 <-> R1.2
-	R1.1 <-> R1.2
-	R1.1 <-> R1.2
-	R1.1 <-> R1.2
-	R1.1 <-> R1.2
 	R1.1 <-> R1.2 <-> R1.2 <-> R1.2
 	R1.1 <-> R1.2 <-> R1.2 <-> R1.2
 	R1.1 <-> R1.2 <-> R1.2 <-> R1.2
@@ -277,14 +273,6 @@ Switch setup: [Default]
 	R1.1 <-> Tremolo Speed.2 <-> Tremolo Speed.3
 	R1.1 <-> Tremolo Speed.2 <-> Tremolo Speed.3
 	R1.1 <-> Tremolo Speed.2 <-> Tremolo Speed.3
-	R1.2 <-> R1.2
-	R1.2 <-> R1.2
-	R1.2 <-> R1.2
-	R1.2 <-> R1.2
-	R1.2 <-> R1.2
-	R1.2 <-> R1.2
-	R1.2 <-> R1.2
-	R1.2 <-> R1.2
 	R1.2 <-> R1.2 <-> R1.2
 	R1.2 <-> R1.2 <-> R1.2
 	R1.2 <-> R1.2 <-> R1.2
diff --git a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt
index 0b126a2d..7e8d33c7 100644
--- a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_excl_switches.txt	
@@ -4,7 +4,6 @@ Switch setup: [Default]
 	Bass.1 <-> R61.1
 	Bass.2 <-> C3.1 <-> R7.2
 	Bass.3 <-> C4.1 <-> R60.1
-	C1.1 <-> V1a.5
 	C10.1 <-> C23.2 <-> C24.2 <-> C27.2 <-> C38.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C8.2 <-> GND <-> L3.1 <-> R23.2 <-> R3.2 <-> R36.2
 	C10.2 <-> C11.1 <-> R12.1
 	C12.1 <-> R14.2
@@ -20,7 +19,6 @@ Switch setup: [Default]
 	C2.2 <-> Vol.2
 	C20.1 <-> C25.1 <-> V2b.1
 	C21.1 <-> R23.1 <-> V2a.1
-	C22.1 <-> V2a.5
 	C23.1 <-> R26.1
 	C24.1 <-> R27.1
 	C25.2 <-> C26.1 <-> Speed.3
@@ -28,8 +26,6 @@ Switch setup: [Default]
 	C28.2 <-> C29.1
 	C29.2 <-> V5a.1
 	C30.1 <-> R36.1 <-> V4b.1
-	C31.1 <-> V4b.5
-	C32.1 <-> V5b.5
 	C33.1 <-> R40.1 <-> V5b.2
 	C33.2 <-> Reverb.2
 	C34.2 <-> R44.1
@@ -43,7 +39,6 @@ Switch setup: [Default]
 	C40.1 <-> R59.2
 	C43.1 <-> Treble.2
 	C45.1 <-> Presence.1
-	C5.1 <-> V1b.5
 	C7.1 <-> Treble.3
 	C8.1 <-> V3b.3
 	C9.2 <-> R12.2
diff --git a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt
index a21240a2..3c7db1f6 100644
--- a/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/ProTremoVerb Schematic_incl_switches.txt	
@@ -3,7 +3,6 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2]
 	Bass.1 <-> R61.1
 	Bass.2 <-> C3.1 <-> R7.2
 	Bass.3 <-> C4.1 <-> R60.1
-	C1.1 <-> V1a.5
 	C10.1 <-> C23.2 <-> C24.2 <-> C27.2 <-> C38.2 <-> C39.2 <-> C40.2 <-> C41.2 <-> C8.2 <-> GND <-> L3.1 <-> R23.2 <-> R3.2 <-> R36.2
 	C10.2 <-> C11.1 <-> R12.1
 	C12.1 <-> R14.2
@@ -19,7 +18,6 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2]
 	C2.2 <-> Vol.2
 	C20.1 <-> C25.1 <-> V2b.1
 	C21.1 <-> R23.1 <-> V2a.1
-	C22.1 <-> V2a.5
 	C23.1 <-> R26.1
 	C24.1 <-> R27.1
 	C25.2 <-> C26.1 <-> Speed.3
@@ -27,8 +25,6 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2]
 	C28.2 <-> C29.1
 	C29.2 <-> V5a.1
 	C30.1 <-> R36.1 <-> V4b.1
-	C31.1 <-> V4b.5
-	C32.1 <-> V5b.5
 	C33.1 <-> R40.1 <-> V5b.2
 	C33.2 <-> Reverb.2
 	C34.2 <-> R44.1
@@ -42,7 +38,6 @@ Switch setup: [.ON1:.ON1, .ON1:.ON2, .ON2:.ON1, .ON2:.ON2]
 	C40.1 <-> R59.2
 	C43.1 <-> Treble.2
 	C45.1 <-> Presence.1
-	C5.1 <-> V1b.5
 	C7.1 <-> Treble.3
 	C8.1 <-> V3b.3
 	C9.2 <-> R12.2
diff --git a/diylc-regression-data/input/user-files/netlist/RAM board 2_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/RAM board 2_excl_switches.txt
index 83fc702e..eacf179f 100644
--- a/diylc-regression-data/input/user-files/netlist/RAM board 2_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/RAM board 2_excl_switches.txt	
@@ -1,20 +1,5 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> C3.1 <-> IC1.10 <-> IC2.10 <-> IC5.10
-	C1.2 <-> C10.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.2 <-> IC1.11 <-> IC10.11 <-> IC10.12 <-> IC11.11 <-> IC2.11 <-> IC3.11 <-> IC4.17 <-> IC5.11 <-> IC6.12 <-> IC6.6 <-> IC6.9 <-> IC7.11 <-> IC9.11
-	C10.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.1 <-> IC10.1 <-> IC10.10 <-> IC11.1 <-> IC11.10 <-> IC3.1 <-> IC3.10 <-> IC4.16 <-> IC4.27 <-> IC6.8 <-> IC7.1 <-> IC7.10 <-> IC9.1 <-> IC9.10
-	IC1.1 <-> IC2.1 <-> IC5.1
-	IC1.2 <-> IC10.13 <-> IC11.13 <-> IC2.2 <-> IC3.20 <-> IC4.13 <-> IC4.22 <-> IC5.2 <-> IC7.19 <-> IC9.13
-	IC1.3 <-> IC10.14 <-> IC11.14 <-> IC2.3 <-> IC3.19 <-> IC4.14 <-> IC4.23 <-> IC5.3 <-> IC7.18 <-> IC9.14
-	IC1.4 <-> IC10.15 <-> IC11.15 <-> IC2.4 <-> IC3.18 <-> IC4.15 <-> IC4.26 <-> IC5.4 <-> IC7.17 <-> IC9.15
-	IC1.5 <-> IC10.16 <-> IC11.16 <-> IC2.5 <-> IC3.17 <-> IC4.32 <-> IC5.5 <-> IC7.16 <-> IC9.16
-	IC1.6 <-> IC10.17 <-> IC11.17 <-> IC2.6 <-> IC3.16 <-> IC4.31 <-> IC5.6 <-> IC7.15 <-> IC9.17
-	IC1.7 <-> IC10.18 <-> IC11.18 <-> IC2.7 <-> IC3.15 <-> IC4.30 <-> IC5.7 <-> IC7.14 <-> IC9.18
-	IC1.8 <-> IC10.19 <-> IC11.19 <-> IC2.8 <-> IC3.14 <-> IC4.29 <-> IC5.8 <-> IC7.13 <-> IC9.19
-	IC1.9 <-> IC10.20 <-> IC11.20 <-> IC2.9 <-> IC3.13 <-> IC4.28 <-> IC5.9 <-> IC7.20 <-> IC9.20
-	IC11.12 <-> IC6.11
-	IC3.12 <-> IC6.14
-	IC4.25 <-> IC6.4 <-> IC6.5
-	IC6.13 <-> IC9.12
-	IC6.15 <-> IC7.12
+	C1.1 <-> C2.1 <-> C3.1 <-> IC1.10 <-> IC1.20 <-> IC2.10 <-> IC2.20 <-> IC5.10 <-> IC5.20
+	C1.2 <-> C10.1 <-> C10.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC1.1 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC10.1 <-> IC10.10 <-> IC10.11 <-> IC10.12 <-> IC10.13 <-> IC10.14 <-> IC10.15 <-> IC10.16 <-> IC10.17 <-> IC10.18 <-> IC10.19 <-> IC10.2 <-> IC10.20 <-> IC10.3 <-> IC10.4 <-> IC10.5 <-> IC10.6 <-> IC10.7 <-> IC10.8 <-> IC10.9 <-> IC11.1 <-> IC11.10 <-> IC11.11 <-> IC11.12 <-> IC11.13 <-> IC11.14 <-> IC11.15 <-> IC11.16 <-> IC11.17 <-> IC11.18 <-> IC11.19 <-> IC11.2 <-> IC11.20 <-> IC11.3 <-> IC11.4 <-> IC11.5 <-> IC11.6 <-> IC11.7 <-> IC11.8 <-> IC11.9 <-> IC2.1 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.17 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.17 <-> IC4.18 <-> IC4.19 <-> IC4.2 <-> IC4.20 <-> IC4.21 <-> IC4.22 <-> IC4.23 <-> IC4.24 <-> IC4.25 <-> IC4.26 <-> IC4.27 <-> IC4.28 <-> IC4.29 <-> IC4.3 <-> IC4.30 <-> IC4.31 <-> IC4.32 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.15 <-> IC7.16 <-> IC7.17 <-> IC7.18 <-> IC7.19 <-> IC7.2 <-> IC7.20 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> IC9.1 <-> IC9.10 <-> IC9.11 <-> IC9.12 <-> IC9.13 <-> IC9.14 <-> IC9.15 <-> IC9.16 <-> IC9.17 <-> IC9.18 <-> IC9.19 <-> IC9.2 <-> IC9.20 <-> IC9.3 <-> IC9.4 <-> IC9.5 <-> IC9.6 <-> IC9.7 <-> IC9.8 <-> IC9.9
 
diff --git a/diylc-regression-data/input/user-files/netlist/RAM board 2_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/RAM board 2_incl_switches.txt
index 83fc702e..eacf179f 100644
--- a/diylc-regression-data/input/user-files/netlist/RAM board 2_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/RAM board 2_incl_switches.txt	
@@ -1,20 +1,5 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> C3.1 <-> IC1.10 <-> IC2.10 <-> IC5.10
-	C1.2 <-> C10.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.2 <-> IC1.11 <-> IC10.11 <-> IC10.12 <-> IC11.11 <-> IC2.11 <-> IC3.11 <-> IC4.17 <-> IC5.11 <-> IC6.12 <-> IC6.6 <-> IC6.9 <-> IC7.11 <-> IC9.11
-	C10.1 <-> C4.2 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> C9.1 <-> IC10.1 <-> IC10.10 <-> IC11.1 <-> IC11.10 <-> IC3.1 <-> IC3.10 <-> IC4.16 <-> IC4.27 <-> IC6.8 <-> IC7.1 <-> IC7.10 <-> IC9.1 <-> IC9.10
-	IC1.1 <-> IC2.1 <-> IC5.1
-	IC1.2 <-> IC10.13 <-> IC11.13 <-> IC2.2 <-> IC3.20 <-> IC4.13 <-> IC4.22 <-> IC5.2 <-> IC7.19 <-> IC9.13
-	IC1.3 <-> IC10.14 <-> IC11.14 <-> IC2.3 <-> IC3.19 <-> IC4.14 <-> IC4.23 <-> IC5.3 <-> IC7.18 <-> IC9.14
-	IC1.4 <-> IC10.15 <-> IC11.15 <-> IC2.4 <-> IC3.18 <-> IC4.15 <-> IC4.26 <-> IC5.4 <-> IC7.17 <-> IC9.15
-	IC1.5 <-> IC10.16 <-> IC11.16 <-> IC2.5 <-> IC3.17 <-> IC4.32 <-> IC5.5 <-> IC7.16 <-> IC9.16
-	IC1.6 <-> IC10.17 <-> IC11.17 <-> IC2.6 <-> IC3.16 <-> IC4.31 <-> IC5.6 <-> IC7.15 <-> IC9.17
-	IC1.7 <-> IC10.18 <-> IC11.18 <-> IC2.7 <-> IC3.15 <-> IC4.30 <-> IC5.7 <-> IC7.14 <-> IC9.18
-	IC1.8 <-> IC10.19 <-> IC11.19 <-> IC2.8 <-> IC3.14 <-> IC4.29 <-> IC5.8 <-> IC7.13 <-> IC9.19
-	IC1.9 <-> IC10.20 <-> IC11.20 <-> IC2.9 <-> IC3.13 <-> IC4.28 <-> IC5.9 <-> IC7.20 <-> IC9.20
-	IC11.12 <-> IC6.11
-	IC3.12 <-> IC6.14
-	IC4.25 <-> IC6.4 <-> IC6.5
-	IC6.13 <-> IC9.12
-	IC6.15 <-> IC7.12
+	C1.1 <-> C2.1 <-> C3.1 <-> IC1.10 <-> IC1.20 <-> IC2.10 <-> IC2.20 <-> IC5.10 <-> IC5.20
+	C1.2 <-> C10.1 <-> C10.2 <-> C2.2 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC1.1 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC10.1 <-> IC10.10 <-> IC10.11 <-> IC10.12 <-> IC10.13 <-> IC10.14 <-> IC10.15 <-> IC10.16 <-> IC10.17 <-> IC10.18 <-> IC10.19 <-> IC10.2 <-> IC10.20 <-> IC10.3 <-> IC10.4 <-> IC10.5 <-> IC10.6 <-> IC10.7 <-> IC10.8 <-> IC10.9 <-> IC11.1 <-> IC11.10 <-> IC11.11 <-> IC11.12 <-> IC11.13 <-> IC11.14 <-> IC11.15 <-> IC11.16 <-> IC11.17 <-> IC11.18 <-> IC11.19 <-> IC11.2 <-> IC11.20 <-> IC11.3 <-> IC11.4 <-> IC11.5 <-> IC11.6 <-> IC11.7 <-> IC11.8 <-> IC11.9 <-> IC2.1 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.17 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.17 <-> IC4.18 <-> IC4.19 <-> IC4.2 <-> IC4.20 <-> IC4.21 <-> IC4.22 <-> IC4.23 <-> IC4.24 <-> IC4.25 <-> IC4.26 <-> IC4.27 <-> IC4.28 <-> IC4.29 <-> IC4.3 <-> IC4.30 <-> IC4.31 <-> IC4.32 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.15 <-> IC7.16 <-> IC7.17 <-> IC7.18 <-> IC7.19 <-> IC7.2 <-> IC7.20 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> IC9.1 <-> IC9.10 <-> IC9.11 <-> IC9.12 <-> IC9.13 <-> IC9.14 <-> IC9.15 <-> IC9.16 <-> IC9.17 <-> IC9.18 <-> IC9.19 <-> IC9.2 <-> IC9.20 <-> IC9.3 <-> IC9.4 <-> IC9.5 <-> IC9.6 <-> IC9.7 <-> IC9.8 <-> IC9.9
 
diff --git a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt
index 9bd1a1c7..e9107236 100644
--- a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_excl_switches.txt	
@@ -24,8 +24,6 @@ Switch setup: [Default]
 	J19.Tip <-> R1.2 <-> R3.1
 	R1.1 <-> V4.9
 	R12.1 <-> R13.2 <-> R8.1 <-> Speed.2 <-> Speed.3
-	R13.1 <-> SW1.3
-	R17.2 <-> R4.2 <-> R5.2
 	R18.1 <-> Volume.2
 	R18.2 <-> V4.2
 	R2.1 <-> V4.8
diff --git a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt
index ce1afa0b..d27b5e5a 100644
--- a/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Radio Amp Noval_incl_switches.txt	
@@ -24,7 +24,6 @@ Switch setup: [SW1.ON1:SW2.ON1, SW1.ON1:SW2.ON2, SW1.ON2:SW2.ON1, SW1.ON2:SW2.ON
 	J19.Tip <-> R1.2 <-> R3.1
 	R1.1 <-> V4.9
 	R12.1 <-> R13.2 <-> R8.1 <-> Speed.2 <-> Speed.3
-	R17.2 <-> R4.2 <-> R5.2
 	R18.1 <-> Volume.2
 	R18.2 <-> V4.2
 	R2.1 <-> V4.8
diff --git a/diylc-regression-data/input/user-files/netlist/Register board (LSB)_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Register board (LSB)_excl_switches.txt
index a21ca16a..6f095284 100644
--- a/diylc-regression-data/input/user-files/netlist/Register board (LSB)_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Register board (LSB)_excl_switches.txt	
@@ -1,26 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> C10.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.1 <-> C6.2 <-> C9.2 <-> IC1.1 <-> IC1.10 <-> IC10.12 <-> IC11.12 <-> IC2.1 <-> IC2.10 <-> IC3.1 <-> IC3.10 <-> IC4.8 <-> IC5.1 <-> IC5.10 <-> IC6.8 <-> IC8.1 <-> IC8.10 <-> IC9.10 <-> IC9.12
-	C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.1 <-> IC1.11 <-> IC10.11 <-> IC11.11 <-> IC2.11 <-> IC3.11 <-> IC4.9 <-> IC5.11 <-> IC6.9 <-> IC8.11 <-> IC9.11
-	C7.2 <-> C8.2 <-> IC10.10 <-> IC11.10
-	IC1.2 <-> IC2.2 <-> IC3.2 <-> IC5.2 <-> IC6.3 <-> IC8.2
-	IC1.3 <-> IC2.3 <-> IC3.3 <-> IC5.3 <-> IC6.2 <-> IC8.3
-	IC1.4 <-> IC2.4 <-> IC3.4 <-> IC5.4 <-> IC6.6 <-> IC8.4
-	IC1.5 <-> IC2.5 <-> IC3.5 <-> IC5.5 <-> IC6.7 <-> IC8.5
-	IC1.6 <-> IC2.6 <-> IC3.6 <-> IC4.3 <-> IC5.6 <-> IC8.6
-	IC1.7 <-> IC2.7 <-> IC3.7 <-> IC4.2 <-> IC5.7 <-> IC8.7
-	IC1.8 <-> IC2.8 <-> IC3.8 <-> IC4.6 <-> IC5.8 <-> IC8.8
-	IC1.9 <-> IC2.9 <-> IC3.9 <-> IC4.7 <-> IC5.9 <-> IC8.9
-	IC10.13 <-> IC11.13 <-> IC6.10 <-> IC9.13
-	IC10.14 <-> IC11.14 <-> IC6.1 <-> IC9.14
-	IC10.15 <-> IC11.15 <-> IC6.15 <-> IC9.15
-	IC10.16 <-> IC11.16 <-> IC6.16 <-> IC9.16
-	IC10.17 <-> IC11.17 <-> IC4.10 <-> IC9.17
-	IC10.18 <-> IC11.18 <-> IC4.1 <-> IC9.18
-	IC10.19 <-> IC11.19 <-> IC4.15 <-> IC9.19
-	IC10.20 <-> IC11.20 <-> IC4.16 <-> IC9.20
-	IC4.11 <-> IC6.11
-	IC4.14 <-> IC6.14
-	IC4.4 <-> IC6.12
-	IC4.5 <-> IC6.13
+	C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC10.1 <-> IC10.10 <-> IC10.11 <-> IC10.12 <-> IC10.13 <-> IC10.14 <-> IC10.15 <-> IC10.16 <-> IC10.17 <-> IC10.18 <-> IC10.19 <-> IC10.2 <-> IC10.20 <-> IC10.3 <-> IC10.4 <-> IC10.5 <-> IC10.6 <-> IC10.7 <-> IC10.8 <-> IC10.9 <-> IC11.1 <-> IC11.10 <-> IC11.11 <-> IC11.12 <-> IC11.13 <-> IC11.14 <-> IC11.15 <-> IC11.16 <-> IC11.17 <-> IC11.18 <-> IC11.19 <-> IC11.2 <-> IC11.20 <-> IC11.3 <-> IC11.4 <-> IC11.5 <-> IC11.6 <-> IC11.7 <-> IC11.8 <-> IC11.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.17 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.20 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC8.1 <-> IC8.10 <-> IC8.11 <-> IC8.12 <-> IC8.13 <-> IC8.14 <-> IC8.15 <-> IC8.16 <-> IC8.17 <-> IC8.18 <-> IC8.19 <-> IC8.2 <-> IC8.20 <-> IC8.3 <-> IC8.4 <-> IC8.5 <-> IC8.6 <-> IC8.7 <-> IC8.8 <-> IC8.9 <-> IC9.1 <-> IC9.10 <-> IC9.11 <-> IC9.12 <-> IC9.13 <-> IC9.14 <-> IC9.15 <-> IC9.16 <-> IC9.17 <-> IC9.18 <-> IC9.19 <-> IC9.2 <-> IC9.20 <-> IC9.3 <-> IC9.4 <-> IC9.5 <-> IC9.6 <-> IC9.7 <-> IC9.8 <-> IC9.9
 
diff --git a/diylc-regression-data/input/user-files/netlist/Register board (LSB)_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Register board (LSB)_incl_switches.txt
index a21ca16a..6f095284 100644
--- a/diylc-regression-data/input/user-files/netlist/Register board (LSB)_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Register board (LSB)_incl_switches.txt	
@@ -1,26 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> C10.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.1 <-> C6.2 <-> C9.2 <-> IC1.1 <-> IC1.10 <-> IC10.12 <-> IC11.12 <-> IC2.1 <-> IC2.10 <-> IC3.1 <-> IC3.10 <-> IC4.8 <-> IC5.1 <-> IC5.10 <-> IC6.8 <-> IC8.1 <-> IC8.10 <-> IC9.10 <-> IC9.12
-	C1.2 <-> C10.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> C6.1 <-> C7.1 <-> C8.1 <-> C9.1 <-> IC1.11 <-> IC10.11 <-> IC11.11 <-> IC2.11 <-> IC3.11 <-> IC4.9 <-> IC5.11 <-> IC6.9 <-> IC8.11 <-> IC9.11
-	C7.2 <-> C8.2 <-> IC10.10 <-> IC11.10
-	IC1.2 <-> IC2.2 <-> IC3.2 <-> IC5.2 <-> IC6.3 <-> IC8.2
-	IC1.3 <-> IC2.3 <-> IC3.3 <-> IC5.3 <-> IC6.2 <-> IC8.3
-	IC1.4 <-> IC2.4 <-> IC3.4 <-> IC5.4 <-> IC6.6 <-> IC8.4
-	IC1.5 <-> IC2.5 <-> IC3.5 <-> IC5.5 <-> IC6.7 <-> IC8.5
-	IC1.6 <-> IC2.6 <-> IC3.6 <-> IC4.3 <-> IC5.6 <-> IC8.6
-	IC1.7 <-> IC2.7 <-> IC3.7 <-> IC4.2 <-> IC5.7 <-> IC8.7
-	IC1.8 <-> IC2.8 <-> IC3.8 <-> IC4.6 <-> IC5.8 <-> IC8.8
-	IC1.9 <-> IC2.9 <-> IC3.9 <-> IC4.7 <-> IC5.9 <-> IC8.9
-	IC10.13 <-> IC11.13 <-> IC6.10 <-> IC9.13
-	IC10.14 <-> IC11.14 <-> IC6.1 <-> IC9.14
-	IC10.15 <-> IC11.15 <-> IC6.15 <-> IC9.15
-	IC10.16 <-> IC11.16 <-> IC6.16 <-> IC9.16
-	IC10.17 <-> IC11.17 <-> IC4.10 <-> IC9.17
-	IC10.18 <-> IC11.18 <-> IC4.1 <-> IC9.18
-	IC10.19 <-> IC11.19 <-> IC4.15 <-> IC9.19
-	IC10.20 <-> IC11.20 <-> IC4.16 <-> IC9.20
-	IC4.11 <-> IC6.11
-	IC4.14 <-> IC6.14
-	IC4.4 <-> IC6.12
-	IC4.5 <-> IC6.13
+	C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.17 <-> IC1.18 <-> IC1.19 <-> IC1.2 <-> IC1.20 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC10.1 <-> IC10.10 <-> IC10.11 <-> IC10.12 <-> IC10.13 <-> IC10.14 <-> IC10.15 <-> IC10.16 <-> IC10.17 <-> IC10.18 <-> IC10.19 <-> IC10.2 <-> IC10.20 <-> IC10.3 <-> IC10.4 <-> IC10.5 <-> IC10.6 <-> IC10.7 <-> IC10.8 <-> IC10.9 <-> IC11.1 <-> IC11.10 <-> IC11.11 <-> IC11.12 <-> IC11.13 <-> IC11.14 <-> IC11.15 <-> IC11.16 <-> IC11.17 <-> IC11.18 <-> IC11.19 <-> IC11.2 <-> IC11.20 <-> IC11.3 <-> IC11.4 <-> IC11.5 <-> IC11.6 <-> IC11.7 <-> IC11.8 <-> IC11.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.17 <-> IC2.18 <-> IC2.19 <-> IC2.2 <-> IC2.20 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.17 <-> IC3.18 <-> IC3.19 <-> IC3.2 <-> IC3.20 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.20 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC8.1 <-> IC8.10 <-> IC8.11 <-> IC8.12 <-> IC8.13 <-> IC8.14 <-> IC8.15 <-> IC8.16 <-> IC8.17 <-> IC8.18 <-> IC8.19 <-> IC8.2 <-> IC8.20 <-> IC8.3 <-> IC8.4 <-> IC8.5 <-> IC8.6 <-> IC8.7 <-> IC8.8 <-> IC8.9 <-> IC9.1 <-> IC9.10 <-> IC9.11 <-> IC9.12 <-> IC9.13 <-> IC9.14 <-> IC9.15 <-> IC9.16 <-> IC9.17 <-> IC9.18 <-> IC9.19 <-> IC9.2 <-> IC9.20 <-> IC9.3 <-> IC9.4 <-> IC9.5 <-> IC9.6 <-> IC9.7 <-> IC9.8 <-> IC9.9
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix 18 watt_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix 18 watt_excl_switches.txt
index 060d81a9..74f57159 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix 18 watt_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix 18 watt_excl_switches.txt	
@@ -7,16 +7,11 @@ Switch setup: [Default]
 	.01.2 <-> 100k.1 <-> 100k.2 <-> 150p.2 <-> 2k7.2 <-> 4.7u.2 <-> 470k.1 <-> 4k7.1 <-> 820.1 <-> 820.1
 	.022.2 <-> .047.2 <-> 100k.1
 	.022.2 <-> 100k.1
-	.047.2 <-> 100k.1
 	0.1.1 <-> 47k.1 <-> 4k7.2 <-> 82k.2
 	0.1.2 <-> 470k.1
 	100k.2 <-> 100k.2 <-> 39k.1
 	100k.2 <-> 100k.2 <-> 39k.2 <-> 8k2.1
-	100k.2 <-> 39k.1
-	100k.2 <-> 39k.2
-	100k.2 <-> 8k2.1
 	100u 100v.1 <-> 100u 100v.2 <-> 1k.1 <-> 390.1 <-> 390.1 <-> 390.2 <-> 390.2 <-> 470k.1 <-> 470k.1 <-> 47R.1 <-> 47R.1 <-> 8k2.2 <-> R1.1
 	470k.2 <-> 470k.2 <-> 47k.2 <-> 820.2
-	47k.1 <-> 82k.2
 	D1.2 <-> D2.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix 18 watt_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix 18 watt_incl_switches.txt
index 060d81a9..74f57159 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix 18 watt_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix 18 watt_incl_switches.txt	
@@ -7,16 +7,11 @@ Switch setup: [Default]
 	.01.2 <-> 100k.1 <-> 100k.2 <-> 150p.2 <-> 2k7.2 <-> 4.7u.2 <-> 470k.1 <-> 4k7.1 <-> 820.1 <-> 820.1
 	.022.2 <-> .047.2 <-> 100k.1
 	.022.2 <-> 100k.1
-	.047.2 <-> 100k.1
 	0.1.1 <-> 47k.1 <-> 4k7.2 <-> 82k.2
 	0.1.2 <-> 470k.1
 	100k.2 <-> 100k.2 <-> 39k.1
 	100k.2 <-> 100k.2 <-> 39k.2 <-> 8k2.1
-	100k.2 <-> 39k.1
-	100k.2 <-> 39k.2
-	100k.2 <-> 8k2.1
 	100u 100v.1 <-> 100u 100v.2 <-> 1k.1 <-> 390.1 <-> 390.1 <-> 390.2 <-> 390.2 <-> 470k.1 <-> 470k.1 <-> 47R.1 <-> 47R.1 <-> 8k2.2 <-> R1.1
 	470k.2 <-> 470k.2 <-> 47k.2 <-> 820.2
-	47k.1 <-> 82k.2
 	D1.2 <-> D2.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_excl_switches.txt
index 3b58f99e..77ba15b1 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_excl_switches.txt	
@@ -6,7 +6,6 @@ Switch setup: [Default]
 	.01.1 <-> 100k.2
 	.01.1 <-> 220k.2
 	.01.2 <-> 470k.1
-	.01.2 <-> 470k.1
 	.022.1 <-> 470k.1
 	.022.1 <-> 470k.1
 	0.1.1 <-> 1M.2
@@ -18,7 +17,5 @@ Switch setup: [Default]
 	150 10W.2 <-> 470k.2 <-> 470k.2 <-> 47u.2
 	1k5.1 <-> 22u.1
 	22uF.1 <-> 2k2.1
-	470k.2 <-> 470k.2 <-> 47k.1
 	470k.2 <-> 470k.2 <-> 47k.1 <-> 820.2
-	4k7.2 <-> 8k2.1
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_incl_switches.txt
index 3b58f99e..77ba15b1 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix AC15 Xlite_incl_switches.txt	
@@ -6,7 +6,6 @@ Switch setup: [Default]
 	.01.1 <-> 100k.2
 	.01.1 <-> 220k.2
 	.01.2 <-> 470k.1
-	.01.2 <-> 470k.1
 	.022.1 <-> 470k.1
 	.022.1 <-> 470k.1
 	0.1.1 <-> 1M.2
@@ -18,7 +17,5 @@ Switch setup: [Default]
 	150 10W.2 <-> 470k.2 <-> 470k.2 <-> 47u.2
 	1k5.1 <-> 22u.1
 	22uF.1 <-> 2k2.1
-	470k.2 <-> 470k.2 <-> 47k.1
 	470k.2 <-> 470k.2 <-> 47k.1 <-> 820.2
-	4k7.2 <-> 8k2.1
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_excl_switches.txt
index 959aa8e7..abbe2053 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_excl_switches.txt	
@@ -11,14 +11,9 @@ Switch setup: [Default]
 	0.1.2 <-> 1M.1
 	100.1 <-> 100.2 <-> 270 Ohm.1 <-> 47u.1
 	100k.2 <-> 100k.2 <-> 39k.1
-	100k.2 <-> 39k.1
 	1M.2 <-> 1M.2 <-> 33k.2 <-> 820.2
 	220k.1 <-> 220k.1 <-> 270 Ohm.2 <-> 47u.2 <-> D1.1 <-> D3.1
-	33k.1 <-> 820.2
-	39k.2 <-> 82k.2
 	39k.2 <-> 82k.2 <-> 82k.2 <-> 8k2.1
-	82k.2 <-> 8k2.1
-	D1.1 <-> D3.1
 	D1.2 <-> D4.1
 	D2.1 <-> D3.2
 	D2.2 <-> D4.2
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_incl_switches.txt
index 959aa8e7..abbe2053 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Baby Blue_incl_switches.txt	
@@ -11,14 +11,9 @@ Switch setup: [Default]
 	0.1.2 <-> 1M.1
 	100.1 <-> 100.2 <-> 270 Ohm.1 <-> 47u.1
 	100k.2 <-> 100k.2 <-> 39k.1
-	100k.2 <-> 39k.1
 	1M.2 <-> 1M.2 <-> 33k.2 <-> 820.2
 	220k.1 <-> 220k.1 <-> 270 Ohm.2 <-> 47u.2 <-> D1.1 <-> D3.1
-	33k.1 <-> 820.2
-	39k.2 <-> 82k.2
 	39k.2 <-> 82k.2 <-> 82k.2 <-> 8k2.1
-	82k.2 <-> 8k2.1
-	D1.1 <-> D3.1
 	D1.2 <-> D4.1
 	D2.1 <-> D3.2
 	D2.2 <-> D4.2
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Bassman_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Bassman_excl_switches.txt
index eff535bf..009acd84 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Bassman_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Bassman_excl_switches.txt	
@@ -6,7 +6,6 @@ Switch setup: [Default]
 	.047.1 <-> 220k.1
 	.047.1 <-> 220k.1
 	.047.2 <-> 0.1.2 <-> 100k.1
-	.047.2 <-> 100k.1
 	.047.2 <-> 100k.2 <-> 47p 1kV.1
 	.047.2 <-> 47p 1kV.2 <-> 82k.2
 	0.1.1 <-> 22k.1
@@ -14,7 +13,6 @@ Switch setup: [Default]
 	100k.1 <-> 100k.1
 	100k.1 <-> 82k.1
 	100k.2 <-> 250p.2 <-> 47k.2
-	100k.2 <-> 47p 1kV.1
 	15k.1 <-> 56k.2
 	15k.2 <-> 33u 160v.1
 	1M.1 <-> 1M.1 <-> 22k.2 <-> 470.1
@@ -22,7 +20,6 @@ Switch setup: [Default]
 	270k.2 <-> 270k.2
 	33u 160v.2 <-> 56k.1 <-> D1.1
 	47k.1 <-> 820.1
-	56k.1 <-> D1.1
 	68k.2 <-> 68k.2
 	68k.2 <-> 68k.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Bassman_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Bassman_incl_switches.txt
index eff535bf..009acd84 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Bassman_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Bassman_incl_switches.txt	
@@ -6,7 +6,6 @@ Switch setup: [Default]
 	.047.1 <-> 220k.1
 	.047.1 <-> 220k.1
 	.047.2 <-> 0.1.2 <-> 100k.1
-	.047.2 <-> 100k.1
 	.047.2 <-> 100k.2 <-> 47p 1kV.1
 	.047.2 <-> 47p 1kV.2 <-> 82k.2
 	0.1.1 <-> 22k.1
@@ -14,7 +13,6 @@ Switch setup: [Default]
 	100k.1 <-> 100k.1
 	100k.1 <-> 82k.1
 	100k.2 <-> 250p.2 <-> 47k.2
-	100k.2 <-> 47p 1kV.1
 	15k.1 <-> 56k.2
 	15k.2 <-> 33u 160v.1
 	1M.1 <-> 1M.1 <-> 22k.2 <-> 470.1
@@ -22,7 +20,6 @@ Switch setup: [Default]
 	270k.2 <-> 270k.2
 	33u 160v.2 <-> 56k.1 <-> D1.1
 	47k.1 <-> 820.1
-	56k.1 <-> D1.1
 	68k.2 <-> 68k.2
 	68k.2 <-> 68k.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt
index d3e6e1d5..0a291838 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix JD stout_excl_switches.txt	
@@ -8,18 +8,13 @@ Switch setup: [Default]
 	.01.2 <-> 470k.1
 	.022.1 <-> .047.1
 	.022.1 <-> 470k.1
-	.022.2 <-> 47k.1
 	.022.2 <-> 47k.1 <-> 4k7.1 <-> 82k.2
 	100.2 <-> 100.2 <-> 100k.1 <-> 100k.2 <-> 100u 100v.2 <-> 10k 2W.2 <-> 22u 450v.1 <-> 22u 450v.2 <-> 22u 450v.2 <-> 270 3W.2 <-> 470k.2 <-> 470k.2 <-> 4k7.2 <-> D1.1 <-> D2.1
-	100.2 <-> D1.1
-	100.2 <-> D2.1
 	100k.1 <-> 150p.1
 	100k.2 <-> 100k.2 <-> 22u 450v.1 <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2
 	100u 100v.1 <-> 270 3W.1
-	10k 2W.1 <-> 1k 2w.2
 	10k 2W.1 <-> 1k 2W.2 <-> 1k 2w.2 <-> L2.1
 	1k5.2 <-> 1k5.2
-	4k7.1 <-> 82k.2
 	D1.2 <-> D3.1
 	D2.2 <-> D4.1
 	D3.2 <-> D4.2
diff --git a/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt
index d3e6e1d5..0a291838 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix JD stout_incl_switches.txt	
@@ -8,18 +8,13 @@ Switch setup: [Default]
 	.01.2 <-> 470k.1
 	.022.1 <-> .047.1
 	.022.1 <-> 470k.1
-	.022.2 <-> 47k.1
 	.022.2 <-> 47k.1 <-> 4k7.1 <-> 82k.2
 	100.2 <-> 100.2 <-> 100k.1 <-> 100k.2 <-> 100u 100v.2 <-> 10k 2W.2 <-> 22u 450v.1 <-> 22u 450v.2 <-> 22u 450v.2 <-> 270 3W.2 <-> 470k.2 <-> 470k.2 <-> 4k7.2 <-> D1.1 <-> D2.1
-	100.2 <-> D1.1
-	100.2 <-> D2.1
 	100k.1 <-> 150p.1
 	100k.2 <-> 100k.2 <-> 22u 450v.1 <-> 470k.2 <-> 470k.2 <-> 47k.2 <-> 4k7.1 <-> 4k7.2 <-> 820.2
 	100u 100v.1 <-> 270 3W.1
-	10k 2W.1 <-> 1k 2w.2
 	10k 2W.1 <-> 1k 2W.2 <-> 1k 2w.2 <-> L2.1
 	1k5.2 <-> 1k5.2
-	4k7.1 <-> 82k.2
 	D1.2 <-> D3.1
 	D2.2 <-> D4.1
 	D3.2 <-> D4.2
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_excl_switches.txt
index f915837f..39dc7926 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_excl_switches.txt	
@@ -5,23 +5,18 @@ Switch setup: [Default]
 	.047.1 <-> 220k.2
 	.047.1 <-> 220k.2
 	.047.2 <-> 100k.1
-	.047.2 <-> 150k.1
 	.047.2 <-> 82k.1
 	0.1.1 <-> 22k.1 <-> 47.2 <-> 820.2
 	0.1.2 <-> 1M.1
 	1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 47R.1 <-> 47R.1 <-> 56k.2
 	100k.1 <-> 150k.2 <-> 150p.2
-	100k.2 <-> 10K.1
 	100k.2 <-> 10K.1 <-> 33k.2 <-> 82k.2
 	100k.2 <-> 15k.2 <-> 33k.1
-	100k.2 <-> 33k.1
 	1k5.1 <-> 1k5.2 <-> 22u.2 <-> 47.1 <-> 4u7.2
 	1M.2 <-> 1M.2 <-> 22k.2 <-> 470.2
 	220k.1 <-> 220k.1 <-> 22u 63v.2
 	220k.1 <-> D3.2
-	22k.1 <-> 820.2
 	22u 63v.2 <-> D3.1
-	33k.2 <-> 82k.2
 	56k.1 <-> VR1.3
 	D1.2 <-> D2.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_incl_switches.txt
index f915837f..39dc7926 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Junior AB763_incl_switches.txt	
@@ -5,23 +5,18 @@ Switch setup: [Default]
 	.047.1 <-> 220k.2
 	.047.1 <-> 220k.2
 	.047.2 <-> 100k.1
-	.047.2 <-> 150k.1
 	.047.2 <-> 82k.1
 	0.1.1 <-> 22k.1 <-> 47.2 <-> 820.2
 	0.1.2 <-> 1M.1
 	1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 47R.1 <-> 47R.1 <-> 56k.2
 	100k.1 <-> 150k.2 <-> 150p.2
-	100k.2 <-> 10K.1
 	100k.2 <-> 10K.1 <-> 33k.2 <-> 82k.2
 	100k.2 <-> 15k.2 <-> 33k.1
-	100k.2 <-> 33k.1
 	1k5.1 <-> 1k5.2 <-> 22u.2 <-> 47.1 <-> 4u7.2
 	1M.2 <-> 1M.2 <-> 22k.2 <-> 470.2
 	220k.1 <-> 220k.1 <-> 22u 63v.2
 	220k.1 <-> D3.2
-	22k.1 <-> 820.2
 	22u 63v.2 <-> D3.1
-	33k.2 <-> 82k.2
 	56k.1 <-> VR1.3
 	D1.2 <-> D2.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Junior_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Junior_excl_switches.txt
index 718e7200..4a20dad2 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Junior_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Junior_excl_switches.txt	
@@ -6,23 +6,17 @@ Switch setup: [Default]
 	.022.2 <-> 100k.1
 	.022.2 <-> 82k.1
 	.022.2 <-> 82k.1
-	.047.2 <-> 100k.1
 	0.1.1 <-> 39k.1 <-> 68k.2 <-> 8k2.2
 	0.1.2 <-> 1M.1
 	1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 56k.2
 	100k.1 <-> 100k.2 <-> 150p.2 <-> 1k5.1 <-> 1M.1 <-> 2k7.2 <-> 4.7u.2 <-> 820.1 <-> 8k2.1 <-> C1.2
 	100k.1 <-> 27k.1 <-> D5.2
 	100k.2 <-> 100k.2 <-> 39k.1
-	100k.2 <-> 39k.1
 	1k5.2 <-> 1M.2 <-> 1M.2 <-> 39k.2
 	220k.1 <-> 220k.1 <-> 22u 63v.2
 	22u 63v.2 <-> D5.1
-	27k.1 <-> D5.2
 	27k.2 <-> 47R.2 <-> 47R.2
-	39k.1 <-> 68k.2
-	39k.2 <-> 82k.2
 	39k.2 <-> 82k.2 <-> 82k.2 <-> 8k2.1
 	56k.1 <-> VR1.3
-	82k.2 <-> 8k2.1
 	D1.2 <-> D2.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Junior_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Junior_incl_switches.txt
index 718e7200..4a20dad2 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Junior_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Junior_incl_switches.txt	
@@ -6,23 +6,17 @@ Switch setup: [Default]
 	.022.2 <-> 100k.1
 	.022.2 <-> 82k.1
 	.022.2 <-> 82k.1
-	.047.2 <-> 100k.1
 	0.1.1 <-> 39k.1 <-> 68k.2 <-> 8k2.2
 	0.1.2 <-> 1M.1
 	1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 56k.2
 	100k.1 <-> 100k.2 <-> 150p.2 <-> 1k5.1 <-> 1M.1 <-> 2k7.2 <-> 4.7u.2 <-> 820.1 <-> 8k2.1 <-> C1.2
 	100k.1 <-> 27k.1 <-> D5.2
 	100k.2 <-> 100k.2 <-> 39k.1
-	100k.2 <-> 39k.1
 	1k5.2 <-> 1M.2 <-> 1M.2 <-> 39k.2
 	220k.1 <-> 220k.1 <-> 22u 63v.2
 	22u 63v.2 <-> D5.1
-	27k.1 <-> D5.2
 	27k.2 <-> 47R.2 <-> 47R.2
-	39k.1 <-> 68k.2
-	39k.2 <-> 82k.2
 	39k.2 <-> 82k.2 <-> 82k.2 <-> 8k2.1
 	56k.1 <-> VR1.3
-	82k.2 <-> 8k2.1
 	D1.2 <-> D2.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_excl_switches.txt
index 8741ec3d..428681f8 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_excl_switches.txt	
@@ -4,13 +4,11 @@ Switch setup: [Default]
 	.022.1 <-> 220k.2
 	.022.1 <-> 220kk.2
 	.022.2 <-> .022.2 <-> 33k.1
-	.022.2 <-> 33k.1
 	.022.2 <-> 82k.1
 	.022.2 <-> 82k.1
 	.1 250v.1 <-> 39k.1 <-> 5k6.2
 	.1 250v.2 <-> 1M.1
 	100k.2 <-> 100k.2 <-> 10k.2 <-> 16uF 450v.1
-	100k.2 <-> 10k.2
 	10k.1 <-> 10k.1
 	10k.2 <-> 18K 3w.1 <-> 82k.2 <-> 82k.2
 	10u.1 <-> 10u.1 <-> 1R.2 <-> 1R.2 <-> 47k.2 <-> 5H.2 <-> D2.2 <-> D3.2
@@ -20,6 +18,4 @@ Switch setup: [Default]
 	1k5.2 <-> 1M.2 <-> 1M.2 <-> 39k.2
 	270k.2 <-> D3.1
 	33k.2 <-> 470p.2 <-> 47K.1
-	33k.2 <-> 47K.1
-	39k.1 <-> 5k6.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_incl_switches.txt
index 8741ec3d..428681f8 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Plexi 6V6_incl_switches.txt	
@@ -4,13 +4,11 @@ Switch setup: [Default]
 	.022.1 <-> 220k.2
 	.022.1 <-> 220kk.2
 	.022.2 <-> .022.2 <-> 33k.1
-	.022.2 <-> 33k.1
 	.022.2 <-> 82k.1
 	.022.2 <-> 82k.1
 	.1 250v.1 <-> 39k.1 <-> 5k6.2
 	.1 250v.2 <-> 1M.1
 	100k.2 <-> 100k.2 <-> 10k.2 <-> 16uF 450v.1
-	100k.2 <-> 10k.2
 	10k.1 <-> 10k.1
 	10k.2 <-> 18K 3w.1 <-> 82k.2 <-> 82k.2
 	10u.1 <-> 10u.1 <-> 1R.2 <-> 1R.2 <-> 47k.2 <-> 5H.2 <-> D2.2 <-> D3.2
@@ -20,6 +18,4 @@ Switch setup: [Default]
 	1k5.2 <-> 1M.2 <-> 1M.2 <-> 39k.2
 	270k.2 <-> D3.1
 	33k.2 <-> 470p.2 <-> 47K.1
-	33k.2 <-> 47K.1
-	39k.1 <-> 5k6.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_excl_switches.txt
index d3850889..44af3782 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_excl_switches.txt	
@@ -6,23 +6,17 @@ Switch setup: [Default]
 	.022.2 <-> 100k.1
 	.022.2 <-> 100k.1
 	.022.2 <-> 82k.1
-	.047.2 <-> 100k.1
 	0.1.1 <-> 33k.1 <-> 4k7.2 <-> 82k.2
 	0.1.2 <-> 1M.1
 	1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 56k.2
 	100k.1 <-> 100k.2 <-> 150p.2 <-> 1K.1 <-> 1M.1 <-> 3k3.2 <-> 4k7.1 <-> 820.1 <-> C1.2
 	100k.2 <-> 100k.2 <-> 39k.1
-	100k.2 <-> 39k.1
 	100k.2 <-> 39k.2 <-> 82k.2 <-> 8k2.1
-	100k.2 <-> 8k2.1
 	1M.2 <-> 1M.2 <-> 33k.2 <-> 820.2
 	220k.1 <-> 220k.1 <-> 22u 63v.2
 	220k.1 <-> 27k.1 <-> D5.2
 	22u 63v.2 <-> D5.1
-	27k.1 <-> D5.2
 	27k.2 <-> 47R.2 <-> 47R.2
-	33k.1 <-> 82k.2
-	39k.2 <-> 82k.2
 	56k.1 <-> VR1.3
 	D1.2 <-> D2.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_incl_switches.txt
index d3850889..44af3782 100644
--- a/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Rix Pro Jr_incl_switches.txt	
@@ -6,23 +6,17 @@ Switch setup: [Default]
 	.022.2 <-> 100k.1
 	.022.2 <-> 100k.1
 	.022.2 <-> 82k.1
-	.047.2 <-> 100k.1
 	0.1.1 <-> 33k.1 <-> 4k7.2 <-> 82k.2
 	0.1.2 <-> 1M.1
 	1 Ohm.2 <-> 1 Ohm.2 <-> 22u 63v.1 <-> 22u 63v.1 <-> 56k.2
 	100k.1 <-> 100k.2 <-> 150p.2 <-> 1K.1 <-> 1M.1 <-> 3k3.2 <-> 4k7.1 <-> 820.1 <-> C1.2
 	100k.2 <-> 100k.2 <-> 39k.1
-	100k.2 <-> 39k.1
 	100k.2 <-> 39k.2 <-> 82k.2 <-> 8k2.1
-	100k.2 <-> 8k2.1
 	1M.2 <-> 1M.2 <-> 33k.2 <-> 820.2
 	220k.1 <-> 220k.1 <-> 22u 63v.2
 	220k.1 <-> 27k.1 <-> D5.2
 	22u 63v.2 <-> D5.1
-	27k.1 <-> D5.2
 	27k.2 <-> 47R.2 <-> 47R.2
-	33k.1 <-> 82k.2
-	39k.2 <-> 82k.2
 	56k.1 <-> VR1.3
 	D1.2 <-> D2.2
 
diff --git a/diylc-regression-data/input/user-files/netlist/Stack Pointer board_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Stack Pointer board_excl_switches.txt
index f9266382..674f8cd7 100644
--- a/diylc-regression-data/input/user-files/netlist/Stack Pointer board_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Stack Pointer board_excl_switches.txt	
@@ -1,28 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> IC1.10 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.9 <-> IC3.10 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.9 <-> IC4.10 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.9 <-> IC5.11 <-> IC6.11 <-> IC7.11 <-> IC8.11
-	C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> IC1.1 <-> IC1.8 <-> IC2.8 <-> IC3.1 <-> IC3.8 <-> IC4.1 <-> IC4.8 <-> IC5.1 <-> IC5.10 <-> IC6.1 <-> IC6.10 <-> IC7.1 <-> IC7.10 <-> IC8.1 <-> IC8.10
-	IC1.11 <-> IC2.11 <-> IC3.11 <-> IC4.11
-	IC1.12 <-> IC3.4
-	IC1.13 <-> IC3.5
-	IC1.2 <-> IC5.3 <-> IC8.3
-	IC1.3 <-> IC5.2 <-> IC8.2
-	IC1.4 <-> IC2.12
-	IC1.5 <-> IC2.13
-	IC1.6 <-> IC5.4 <-> IC8.4
-	IC1.7 <-> IC5.5 <-> IC8.5
-	IC2.2 <-> IC6.7 <-> IC7.7
-	IC2.3 <-> IC6.6 <-> IC7.6
-	IC2.4 <-> IC4.12
-	IC2.5 <-> IC4.13
-	IC2.6 <-> IC6.8 <-> IC7.8
-	IC2.7 <-> IC6.9 <-> IC7.9
-	IC3.2 <-> IC5.7 <-> IC8.7
-	IC3.3 <-> IC5.6 <-> IC8.6
-	IC3.6 <-> IC5.8 <-> IC8.8
-	IC3.7 <-> IC5.9 <-> IC8.9
-	IC4.2 <-> IC6.3 <-> IC7.3
-	IC4.3 <-> IC6.2 <-> IC7.2
-	IC4.6 <-> IC6.4 <-> IC7.4
-	IC4.7 <-> IC6.5 <-> IC7.5
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.20 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.17 <-> IC6.18 <-> IC6.19 <-> IC6.2 <-> IC6.20 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.15 <-> IC7.16 <-> IC7.17 <-> IC7.18 <-> IC7.19 <-> IC7.2 <-> IC7.20 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> IC8.1 <-> IC8.10 <-> IC8.11 <-> IC8.12 <-> IC8.13 <-> IC8.14 <-> IC8.15 <-> IC8.16 <-> IC8.17 <-> IC8.18 <-> IC8.19 <-> IC8.2 <-> IC8.20 <-> IC8.3 <-> IC8.4 <-> IC8.5 <-> IC8.6 <-> IC8.7 <-> IC8.8 <-> IC8.9
 
diff --git a/diylc-regression-data/input/user-files/netlist/Stack Pointer board_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Stack Pointer board_incl_switches.txt
index f9266382..674f8cd7 100644
--- a/diylc-regression-data/input/user-files/netlist/Stack Pointer board_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Stack Pointer board_incl_switches.txt	
@@ -1,28 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> C3.1 <-> C4.1 <-> C5.2 <-> C6.2 <-> C7.2 <-> C8.2 <-> IC1.10 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.9 <-> IC3.10 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.9 <-> IC4.10 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.9 <-> IC5.11 <-> IC6.11 <-> IC7.11 <-> IC8.11
-	C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C6.1 <-> C7.1 <-> C8.1 <-> IC1.1 <-> IC1.8 <-> IC2.8 <-> IC3.1 <-> IC3.8 <-> IC4.1 <-> IC4.8 <-> IC5.1 <-> IC5.10 <-> IC6.1 <-> IC6.10 <-> IC7.1 <-> IC7.10 <-> IC8.1 <-> IC8.10
-	IC1.11 <-> IC2.11 <-> IC3.11 <-> IC4.11
-	IC1.12 <-> IC3.4
-	IC1.13 <-> IC3.5
-	IC1.2 <-> IC5.3 <-> IC8.3
-	IC1.3 <-> IC5.2 <-> IC8.2
-	IC1.4 <-> IC2.12
-	IC1.5 <-> IC2.13
-	IC1.6 <-> IC5.4 <-> IC8.4
-	IC1.7 <-> IC5.5 <-> IC8.5
-	IC2.2 <-> IC6.7 <-> IC7.7
-	IC2.3 <-> IC6.6 <-> IC7.6
-	IC2.4 <-> IC4.12
-	IC2.5 <-> IC4.13
-	IC2.6 <-> IC6.8 <-> IC7.8
-	IC2.7 <-> IC6.9 <-> IC7.9
-	IC3.2 <-> IC5.7 <-> IC8.7
-	IC3.3 <-> IC5.6 <-> IC8.6
-	IC3.6 <-> IC5.8 <-> IC8.8
-	IC3.7 <-> IC5.9 <-> IC8.9
-	IC4.2 <-> IC6.3 <-> IC7.3
-	IC4.3 <-> IC6.2 <-> IC7.2
-	IC4.6 <-> IC6.4 <-> IC7.4
-	IC4.7 <-> IC6.5 <-> IC7.5
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.14 <-> IC2.15 <-> IC2.16 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.7 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.15 <-> IC3.16 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.15 <-> IC4.16 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.13 <-> IC5.14 <-> IC5.15 <-> IC5.16 <-> IC5.17 <-> IC5.18 <-> IC5.19 <-> IC5.2 <-> IC5.20 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.6 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.15 <-> IC6.16 <-> IC6.17 <-> IC6.18 <-> IC6.19 <-> IC6.2 <-> IC6.20 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.15 <-> IC7.16 <-> IC7.17 <-> IC7.18 <-> IC7.19 <-> IC7.2 <-> IC7.20 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> IC8.1 <-> IC8.10 <-> IC8.11 <-> IC8.12 <-> IC8.13 <-> IC8.14 <-> IC8.15 <-> IC8.16 <-> IC8.17 <-> IC8.18 <-> IC8.19 <-> IC8.2 <-> IC8.20 <-> IC8.3 <-> IC8.4 <-> IC8.5 <-> IC8.6 <-> IC8.7 <-> IC8.8 <-> IC8.9
 
diff --git a/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_excl_switches.txt
index be98e9ba..db2692f2 100644
--- a/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_excl_switches.txt	
@@ -1,95 +1,8 @@
 Switch setup: [Default]
 
-	BC548.1 <-> C1.1 <-> D1.2 <-> IC1.9 <-> IC2.10
-	BC548.1 <-> C2.2 <-> D2.2 <-> IC1.11 <-> IC5.10
-	BC548.1 <-> C3.1 <-> D4.2 <-> IC1.1 <-> IC4.10
-	BC548.1 <-> C4.1 <-> D3.2 <-> IC1.3 <-> IC6.12
-	BC548.2 <-> BC558.3 <-> R13.1
-	BC548.2 <-> BC558.3 <-> R17.1
-	BC548.2 <-> BC558.3 <-> R2.1
-	BC548.2 <-> BC558.3 <-> R36.1
-	BC548.3 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> C1.2 <-> C2.1 <-> C3.2 <-> C4.2 <-> IC1.13 <-> IC1.5 <-> IC1.7 <-> IC2.5 <-> IC5.5 <-> R11.2 <-> R14.2 <-> R18.1 <-> R22.2 <-> R23.2 <-> R24.2 <-> R26.2 <-> R27.2 <-> R28.2 <-> R3.2 <-> R30.2 <-> R37.2 <-> R39.2 <-> R40.2 <-> R5.1 <-> R8.2 <-> R9.2 <-> VR13.2 <-> VR2.2 <-> VR7.2 <-> VR8.2
-	BC558.1 <-> BC558.1 <-> IC2.11 <-> IC3.11 <-> IC4.11 <-> IC5.11 <-> IC6.11 <-> IC7.11 <-> R21.2 <-> R7.2
-	BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R1.1
-	BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R12.1
-	BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R16.1
-	BC558.2 <-> R31.2 <-> R32.2 <-> R33.2 <-> R34.2 <-> R35.1
-	C10.1 <-> IC6.10 <-> IC6.3 <-> R37.1
-	C10.2 <-> IC6.13 <-> IC6.14
-	C5.1 <-> IC2.8 <-> IC2.9
-	C5.2 <-> IC2.12 <-> IC2.3 <-> R3.1
-	C6.1 <-> D5.2 <-> D6.2 <-> R7.1
-	C6.2 <-> R8.1 <-> Square/Triangle 1.1
-	C7.1 <-> IC5.8 <-> IC5.9
-	C7.2 <-> IC5.12 <-> IC5.3 <-> R24.1
-	C8.1 <-> D12.2 <-> D7.2 <-> R21.1
-	C8.2 <-> R22.1 <-> Square/Triangle 2.1
-	C9.1 <-> IC4.12 <-> IC4.5 <-> R14.1
-	C9.2 <-> IC4.8 <-> IC4.9
-	Coarse 1.2 <-> NTC.1
-	Coarse 2.2 <-> NTC.1
-	Coarse 3.2 <-> NTC.1
-	Coarse 3.2 <-> R32.1
-	CV In 1.Tip <-> NTC.1
-	CV In 2.Tip <-> NTC.1
-	CV In 3.Tip <-> NTC.1
-	CV In 4.Tip <-> R33.1
-	D1.1 <-> IC1.10
-	D12.1 <-> IC5.14 <-> R19.2 <-> R20.1
-	D2.1 <-> IC1.12
-	D3.1 <-> IC1.4
-	D4.1 <-> IC1.2
-	D5.1 <-> IC2.7 <-> Slope Shift 1.1
-	D6.1 <-> IC2.14 <-> R4.2 <-> R6.1
-	D7.1 <-> IC5.7 <-> Slope Shift 2.1
-	Fine 1.2 <-> NTC.1
-	Fine 2.2 <-> NTC.1
-	Fine 3.2 <-> NTC.1
-	Fine 4.2 <-> R31.1
-	FM In 1.Tip <-> VR1.2
-	FM In 2.Tip <-> VR4.2
-	FM In 3.Tip <-> VR6.2
-	FM In 4.Tip <-> VR10.2
-	IC1.8 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> IC5.4 <-> IC6.4 <-> IC7.4 <-> R13.2 <-> R17.2 <-> R2.2 <-> R36.2 <-> R42.2
-	IC2.1 <-> R10.1
-	IC2.13 <-> R4.1 <-> R5.2
-	IC2.2 <-> Pulsewidth 1.2 <-> R9.1 <-> VR3.1
-	IC2.6 <-> R6.2 <-> Slope Shift 1.2
-	IC3.1 <-> IC3.2 <-> Square/Triangle 2.3
-	IC3.10 <-> Square/Triangle 1.2
-	IC3.12 <-> R10.2 <-> R11.1
-	IC3.13 <-> IC3.14 <-> Square/Triangle 1.3
-	IC3.3 <-> R25.2 <-> R26.1
-	IC3.5 <-> Square/Triangle 2.2
-	IC3.6 <-> IC3.7 <-> Output 2.Tip
-	IC3.8 <-> IC3.9 <-> Output 1.Tip
-	IC4.1 <-> IC4.2 <-> Square/Sawtooth 3.3
-	IC4.13 <-> R15.1 <-> R27.1
-	IC4.14 <-> R15.2 <-> Square/Sawtooth 3.1
-	IC4.3 <-> R29.2 <-> R30.1
-	IC4.6 <-> Pulsewidth 3.2 <-> R28.1 <-> VR9.1
-	IC4.7 <-> R29.1
-	IC5.1 <-> R25.1
-	IC5.13 <-> R18.2 <-> R19.1
-	IC5.2 <-> Pulsewidth 2.2 <-> R23.1 <-> VR5.1
-	IC5.6 <-> R20.2 <-> Slope Shift 2.2
-	IC6.1 <-> R41.1
-	IC6.2 <-> Pulsewidth 4.2 <-> R40.1 <-> VR16.3
-	IC6.5 <-> IC7.12 <-> R41.2 <-> R42.1 <-> Square/Sawtooth 4.2
-	IC6.6 <-> IC6.7 <-> Square/Sawtooth 4.3
-	IC6.8 <-> R38.2 <-> Square/Sawtooth 4.1
-	IC6.9 <-> R38.1 <-> R39.1
-	IC7.13 <-> IC7.14 <-> Output 4.Tip
-	IC7.5 <-> Square/Sawtooth 3.2
-	IC7.6 <-> IC7.7 <-> Output 3.Tip
-	NTC.1 <-> VR1.1
-	NTC.1 <-> VR4.1
-	PWM In 1.Tip <-> VR3.2
-	PWM In 2.Tip <-> VR5.2
+	BC548.1 <-> BC548.1 <-> BC548.1 <-> BC548.1 <-> BC548.2 <-> BC548.2 <-> BC548.2 <-> BC548.2 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> BC558.1 <-> BC558.1 <-> BC558.1 <-> BC558.1 <-> BC558.2 <-> BC558.2 <-> BC558.2 <-> BC558.2 <-> BC558.3 <-> BC558.3 <-> BC558.3 <-> BC558.3 <-> C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> Coarse 1.2 <-> Coarse 3.2 <-> CV In 1.Tip <-> CV In 3.Tip <-> D1.1 <-> D1.2 <-> D12.1 <-> D12.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> D4.2 <-> D5.2 <-> D6.2 <-> D7.1 <-> D7.2 <-> Fine 1.2 <-> Fine 3.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.14 <-> IC5.2 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.2 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> Output 1.Tip <-> Output 2.Tip <-> Output 3.Tip <-> Output 4.Tip <-> Pulsewidth 1.2 <-> Pulsewidth 2.2 <-> Pulsewidth 3.2 <-> Pulsewidth 4.2 <-> PWM In 1.Tip <-> PWM In 4.Tip <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R14.1 <-> R14.2 <-> R15.1 <-> R15.2 <-> R16.1 <-> R16.2 <-> R17.1 <-> R17.2 <-> R18.1 <-> R19.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R21.1 <-> R21.2 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> R24.1 <-> R24.2 <-> R25.1 <-> R25.2 <-> R26.1 <-> R26.2 <-> R27.1 <-> R27.2 <-> R28.1 <-> R28.2 <-> R29.1 <-> R29.2 <-> R3.1 <-> R3.2 <-> R30.1 <-> R30.2 <-> R31.2 <-> R32.2 <-> R33.2 <-> R34.2 <-> R35.1 <-> R35.2 <-> R36.1 <-> R36.2 <-> R37.1 <-> R37.2 <-> R38.1 <-> R38.2 <-> R39.1 <-> R39.2 <-> R4.1 <-> R40.1 <-> R40.2 <-> R41.1 <-> R41.2 <-> R42.1 <-> R42.2 <-> R5.1 <-> R5.2 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> R9.1 <-> R9.2 <-> Slope Shift 1.2 <-> Slope Shift 2.1 <-> Square/Sawtooth 3.1 <-> Square/Sawtooth 3.2 <-> Square/Sawtooth 3.3 <-> Square/Sawtooth 4.1 <-> Square/Sawtooth 4.2 <-> Square/Sawtooth 4.3 <-> Square/Triangle 1.1 <-> Square/Triangle 1.2 <-> Square/Triangle 1.3 <-> Square/Triangle 2.1 <-> Square/Triangle 2.2 <-> Square/Triangle 2.3 <-> VR1.1 <-> VR1.3 <-> VR10.1 <-> VR13.1 <-> VR13.2 <-> VR13.3 <-> VR16.1 <-> VR16.2 <-> VR16.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.3 <-> VR5.1 <-> VR5.3 <-> VR6.1 <-> VR6.3 <-> VR7.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 <-> VR9.1 <-> VR9.3
+	Coarse 2.2 <-> Coarse 3.2 <-> CV In 2.Tip <-> CV In 4.Tip <-> Fine 2.2 <-> Fine 4.2 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> R31.1 <-> R32.1 <-> R33.1 <-> R34.1 <-> VR10.3 <-> VR4.1
+	D5.1 <-> D6.1 <-> FM In 2.Tip <-> FM In 4.Tip <-> IC2.14 <-> IC2.7 <-> R4.2 <-> R6.1 <-> Slope Shift 1.1 <-> VR10.2 <-> VR4.2
+	FM In 1.Tip <-> FM In 3.Tip <-> IC5.13 <-> IC5.6 <-> PWM In 2.Tip <-> R18.2 <-> R19.1 <-> R20.2 <-> Slope Shift 2.2 <-> VR1.2 <-> VR5.2 <-> VR6.2
 	PWM In 3.Tip <-> VR9.2
-	PWM In 4.Tip <-> VR16.2
-	R1.2 <-> VR2.1
-	R12.2 <-> VR8.1
-	R16.2 <-> VR7.1
-	R35.2 <-> VR13.3
 
diff --git a/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_incl_switches.txt
index be98e9ba..db2692f2 100644
--- a/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Synth Oscllator_v1_incl_switches.txt	
@@ -1,95 +1,8 @@
 Switch setup: [Default]
 
-	BC548.1 <-> C1.1 <-> D1.2 <-> IC1.9 <-> IC2.10
-	BC548.1 <-> C2.2 <-> D2.2 <-> IC1.11 <-> IC5.10
-	BC548.1 <-> C3.1 <-> D4.2 <-> IC1.1 <-> IC4.10
-	BC548.1 <-> C4.1 <-> D3.2 <-> IC1.3 <-> IC6.12
-	BC548.2 <-> BC558.3 <-> R13.1
-	BC548.2 <-> BC558.3 <-> R17.1
-	BC548.2 <-> BC558.3 <-> R2.1
-	BC548.2 <-> BC558.3 <-> R36.1
-	BC548.3 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> C1.2 <-> C2.1 <-> C3.2 <-> C4.2 <-> IC1.13 <-> IC1.5 <-> IC1.7 <-> IC2.5 <-> IC5.5 <-> R11.2 <-> R14.2 <-> R18.1 <-> R22.2 <-> R23.2 <-> R24.2 <-> R26.2 <-> R27.2 <-> R28.2 <-> R3.2 <-> R30.2 <-> R37.2 <-> R39.2 <-> R40.2 <-> R5.1 <-> R8.2 <-> R9.2 <-> VR13.2 <-> VR2.2 <-> VR7.2 <-> VR8.2
-	BC558.1 <-> BC558.1 <-> IC2.11 <-> IC3.11 <-> IC4.11 <-> IC5.11 <-> IC6.11 <-> IC7.11 <-> R21.2 <-> R7.2
-	BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R1.1
-	BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R12.1
-	BC558.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> R16.1
-	BC558.2 <-> R31.2 <-> R32.2 <-> R33.2 <-> R34.2 <-> R35.1
-	C10.1 <-> IC6.10 <-> IC6.3 <-> R37.1
-	C10.2 <-> IC6.13 <-> IC6.14
-	C5.1 <-> IC2.8 <-> IC2.9
-	C5.2 <-> IC2.12 <-> IC2.3 <-> R3.1
-	C6.1 <-> D5.2 <-> D6.2 <-> R7.1
-	C6.2 <-> R8.1 <-> Square/Triangle 1.1
-	C7.1 <-> IC5.8 <-> IC5.9
-	C7.2 <-> IC5.12 <-> IC5.3 <-> R24.1
-	C8.1 <-> D12.2 <-> D7.2 <-> R21.1
-	C8.2 <-> R22.1 <-> Square/Triangle 2.1
-	C9.1 <-> IC4.12 <-> IC4.5 <-> R14.1
-	C9.2 <-> IC4.8 <-> IC4.9
-	Coarse 1.2 <-> NTC.1
-	Coarse 2.2 <-> NTC.1
-	Coarse 3.2 <-> NTC.1
-	Coarse 3.2 <-> R32.1
-	CV In 1.Tip <-> NTC.1
-	CV In 2.Tip <-> NTC.1
-	CV In 3.Tip <-> NTC.1
-	CV In 4.Tip <-> R33.1
-	D1.1 <-> IC1.10
-	D12.1 <-> IC5.14 <-> R19.2 <-> R20.1
-	D2.1 <-> IC1.12
-	D3.1 <-> IC1.4
-	D4.1 <-> IC1.2
-	D5.1 <-> IC2.7 <-> Slope Shift 1.1
-	D6.1 <-> IC2.14 <-> R4.2 <-> R6.1
-	D7.1 <-> IC5.7 <-> Slope Shift 2.1
-	Fine 1.2 <-> NTC.1
-	Fine 2.2 <-> NTC.1
-	Fine 3.2 <-> NTC.1
-	Fine 4.2 <-> R31.1
-	FM In 1.Tip <-> VR1.2
-	FM In 2.Tip <-> VR4.2
-	FM In 3.Tip <-> VR6.2
-	FM In 4.Tip <-> VR10.2
-	IC1.8 <-> IC2.4 <-> IC3.4 <-> IC4.4 <-> IC5.4 <-> IC6.4 <-> IC7.4 <-> R13.2 <-> R17.2 <-> R2.2 <-> R36.2 <-> R42.2
-	IC2.1 <-> R10.1
-	IC2.13 <-> R4.1 <-> R5.2
-	IC2.2 <-> Pulsewidth 1.2 <-> R9.1 <-> VR3.1
-	IC2.6 <-> R6.2 <-> Slope Shift 1.2
-	IC3.1 <-> IC3.2 <-> Square/Triangle 2.3
-	IC3.10 <-> Square/Triangle 1.2
-	IC3.12 <-> R10.2 <-> R11.1
-	IC3.13 <-> IC3.14 <-> Square/Triangle 1.3
-	IC3.3 <-> R25.2 <-> R26.1
-	IC3.5 <-> Square/Triangle 2.2
-	IC3.6 <-> IC3.7 <-> Output 2.Tip
-	IC3.8 <-> IC3.9 <-> Output 1.Tip
-	IC4.1 <-> IC4.2 <-> Square/Sawtooth 3.3
-	IC4.13 <-> R15.1 <-> R27.1
-	IC4.14 <-> R15.2 <-> Square/Sawtooth 3.1
-	IC4.3 <-> R29.2 <-> R30.1
-	IC4.6 <-> Pulsewidth 3.2 <-> R28.1 <-> VR9.1
-	IC4.7 <-> R29.1
-	IC5.1 <-> R25.1
-	IC5.13 <-> R18.2 <-> R19.1
-	IC5.2 <-> Pulsewidth 2.2 <-> R23.1 <-> VR5.1
-	IC5.6 <-> R20.2 <-> Slope Shift 2.2
-	IC6.1 <-> R41.1
-	IC6.2 <-> Pulsewidth 4.2 <-> R40.1 <-> VR16.3
-	IC6.5 <-> IC7.12 <-> R41.2 <-> R42.1 <-> Square/Sawtooth 4.2
-	IC6.6 <-> IC6.7 <-> Square/Sawtooth 4.3
-	IC6.8 <-> R38.2 <-> Square/Sawtooth 4.1
-	IC6.9 <-> R38.1 <-> R39.1
-	IC7.13 <-> IC7.14 <-> Output 4.Tip
-	IC7.5 <-> Square/Sawtooth 3.2
-	IC7.6 <-> IC7.7 <-> Output 3.Tip
-	NTC.1 <-> VR1.1
-	NTC.1 <-> VR4.1
-	PWM In 1.Tip <-> VR3.2
-	PWM In 2.Tip <-> VR5.2
+	BC548.1 <-> BC548.1 <-> BC548.1 <-> BC548.1 <-> BC548.2 <-> BC548.2 <-> BC548.2 <-> BC548.2 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> BC548.3 <-> BC558.1 <-> BC558.1 <-> BC558.1 <-> BC558.1 <-> BC558.2 <-> BC558.2 <-> BC558.2 <-> BC558.2 <-> BC558.3 <-> BC558.3 <-> BC558.3 <-> BC558.3 <-> C1.1 <-> C1.2 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> Coarse 1.2 <-> Coarse 3.2 <-> CV In 1.Tip <-> CV In 3.Tip <-> D1.1 <-> D1.2 <-> D12.1 <-> D12.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> D4.2 <-> D5.2 <-> D6.2 <-> D7.1 <-> D7.2 <-> Fine 1.2 <-> Fine 3.2 <-> IC1.1 <-> IC1.10 <-> IC1.11 <-> IC1.12 <-> IC1.13 <-> IC1.14 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> IC1.9 <-> IC2.1 <-> IC2.10 <-> IC2.11 <-> IC2.12 <-> IC2.13 <-> IC2.2 <-> IC2.3 <-> IC2.4 <-> IC2.5 <-> IC2.6 <-> IC2.8 <-> IC2.9 <-> IC3.1 <-> IC3.10 <-> IC3.11 <-> IC3.12 <-> IC3.13 <-> IC3.14 <-> IC3.2 <-> IC3.3 <-> IC3.4 <-> IC3.5 <-> IC3.6 <-> IC3.7 <-> IC3.8 <-> IC3.9 <-> IC4.1 <-> IC4.10 <-> IC4.11 <-> IC4.12 <-> IC4.13 <-> IC4.14 <-> IC4.2 <-> IC4.3 <-> IC4.4 <-> IC4.5 <-> IC4.6 <-> IC4.7 <-> IC4.8 <-> IC4.9 <-> IC5.1 <-> IC5.10 <-> IC5.11 <-> IC5.12 <-> IC5.14 <-> IC5.2 <-> IC5.3 <-> IC5.4 <-> IC5.5 <-> IC5.7 <-> IC5.8 <-> IC5.9 <-> IC6.1 <-> IC6.10 <-> IC6.11 <-> IC6.12 <-> IC6.13 <-> IC6.14 <-> IC6.2 <-> IC6.3 <-> IC6.4 <-> IC6.5 <-> IC6.6 <-> IC6.7 <-> IC6.8 <-> IC6.9 <-> IC7.1 <-> IC7.10 <-> IC7.11 <-> IC7.12 <-> IC7.13 <-> IC7.14 <-> IC7.2 <-> IC7.3 <-> IC7.4 <-> IC7.5 <-> IC7.6 <-> IC7.7 <-> IC7.8 <-> IC7.9 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> NTC.2 <-> Output 1.Tip <-> Output 2.Tip <-> Output 3.Tip <-> Output 4.Tip <-> Pulsewidth 1.2 <-> Pulsewidth 2.2 <-> Pulsewidth 3.2 <-> Pulsewidth 4.2 <-> PWM In 1.Tip <-> PWM In 4.Tip <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R14.1 <-> R14.2 <-> R15.1 <-> R15.2 <-> R16.1 <-> R16.2 <-> R17.1 <-> R17.2 <-> R18.1 <-> R19.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R21.1 <-> R21.2 <-> R22.1 <-> R22.2 <-> R23.1 <-> R23.2 <-> R24.1 <-> R24.2 <-> R25.1 <-> R25.2 <-> R26.1 <-> R26.2 <-> R27.1 <-> R27.2 <-> R28.1 <-> R28.2 <-> R29.1 <-> R29.2 <-> R3.1 <-> R3.2 <-> R30.1 <-> R30.2 <-> R31.2 <-> R32.2 <-> R33.2 <-> R34.2 <-> R35.1 <-> R35.2 <-> R36.1 <-> R36.2 <-> R37.1 <-> R37.2 <-> R38.1 <-> R38.2 <-> R39.1 <-> R39.2 <-> R4.1 <-> R40.1 <-> R40.2 <-> R41.1 <-> R41.2 <-> R42.1 <-> R42.2 <-> R5.1 <-> R5.2 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> R9.1 <-> R9.2 <-> Slope Shift 1.2 <-> Slope Shift 2.1 <-> Square/Sawtooth 3.1 <-> Square/Sawtooth 3.2 <-> Square/Sawtooth 3.3 <-> Square/Sawtooth 4.1 <-> Square/Sawtooth 4.2 <-> Square/Sawtooth 4.3 <-> Square/Triangle 1.1 <-> Square/Triangle 1.2 <-> Square/Triangle 1.3 <-> Square/Triangle 2.1 <-> Square/Triangle 2.2 <-> Square/Triangle 2.3 <-> VR1.1 <-> VR1.3 <-> VR10.1 <-> VR13.1 <-> VR13.2 <-> VR13.3 <-> VR16.1 <-> VR16.2 <-> VR16.3 <-> VR2.1 <-> VR2.2 <-> VR2.3 <-> VR3.1 <-> VR3.2 <-> VR3.3 <-> VR4.3 <-> VR5.1 <-> VR5.3 <-> VR6.1 <-> VR6.3 <-> VR7.1 <-> VR7.2 <-> VR7.3 <-> VR8.1 <-> VR8.2 <-> VR8.3 <-> VR9.1 <-> VR9.3
+	Coarse 2.2 <-> Coarse 3.2 <-> CV In 2.Tip <-> CV In 4.Tip <-> Fine 2.2 <-> Fine 4.2 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> NTC.1 <-> R31.1 <-> R32.1 <-> R33.1 <-> R34.1 <-> VR10.3 <-> VR4.1
+	D5.1 <-> D6.1 <-> FM In 2.Tip <-> FM In 4.Tip <-> IC2.14 <-> IC2.7 <-> R4.2 <-> R6.1 <-> Slope Shift 1.1 <-> VR10.2 <-> VR4.2
+	FM In 1.Tip <-> FM In 3.Tip <-> IC5.13 <-> IC5.6 <-> PWM In 2.Tip <-> R18.2 <-> R19.1 <-> R20.2 <-> Slope Shift 2.2 <-> VR1.2 <-> VR5.2 <-> VR6.2
 	PWM In 3.Tip <-> VR9.2
-	PWM In 4.Tip <-> VR16.2
-	R1.2 <-> VR2.1
-	R12.2 <-> VR8.1
-	R16.2 <-> VR7.1
-	R35.2 <-> VR13.3
 
diff --git a/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_excl_switches.txt b/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_excl_switches.txt
index d162b0c1..136f4e1b 100644
--- a/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_excl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_excl_switches.txt	
@@ -3,7 +3,6 @@ Switch setup: [Default]
 	.022.1 <-> 0.047.1 <-> 33k.2
 	.022.1 <-> 100p.1 <-> 220k.1
 	.022.1 <-> 100p.2 <-> 220k.1
-	.022.1 <-> 220k.1
 	.022.2 <-> 270k.1
 	.022.2 <-> 470k.1
 	.047.1 <-> 2k2.2
diff --git a/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_incl_switches.txt b/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_incl_switches.txt
index d162b0c1..136f4e1b 100644
--- a/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_incl_switches.txt	
+++ b/diylc-regression-data/input/user-files/netlist/Thunderbolt Mk3_incl_switches.txt	
@@ -3,7 +3,6 @@ Switch setup: [Default]
 	.022.1 <-> 0.047.1 <-> 33k.2
 	.022.1 <-> 100p.1 <-> 220k.1
 	.022.1 <-> 100p.2 <-> 220k.1
-	.022.1 <-> 220k.1
 	.022.2 <-> 270k.1
 	.022.2 <-> 470k.1
 	.047.1 <-> 2k2.2
diff --git a/diylc-regression-data/input/user-files/png/Blue 7.png b/diylc-regression-data/input/user-files/png/Blue 7.png
index 8ceed314..a150d781 100644
Binary files a/diylc-regression-data/input/user-files/png/Blue 7.png and b/diylc-regression-data/input/user-files/png/Blue 7.png differ
diff --git a/diylc-regression-data/input/user-files/png/DR18Tagstrip.png b/diylc-regression-data/input/user-files/png/DR18Tagstrip.png
index 6c86b3d9..44707f95 100644
Binary files a/diylc-regression-data/input/user-files/png/DR18Tagstrip.png and b/diylc-regression-data/input/user-files/png/DR18Tagstrip.png differ
diff --git a/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png b/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png
index 2ac19805..a1f685a0 100644
Binary files a/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png and b/diylc-regression-data/input/user-files/png/Deluxe_Micro_EF80_Layout.png differ
diff --git a/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png b/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png
index ef342ba6..3587bda4 100644
Binary files a/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png and b/diylc-regression-data/input/user-files/png/LM386 Voltage Converter.png differ
diff --git a/diylc-regression-data/input/user-files/png/Rix 18 watt.png b/diylc-regression-data/input/user-files/png/Rix 18 watt.png
index b597a497..5c55589a 100644
Binary files a/diylc-regression-data/input/user-files/png/Rix 18 watt.png and b/diylc-regression-data/input/user-files/png/Rix 18 watt.png differ
diff --git a/diylc-regression-data/input/user-files/png/Rix AC15 Xlite.png b/diylc-regression-data/input/user-files/png/Rix AC15 Xlite.png
index 14d212c8..005a46b6 100644
Binary files a/diylc-regression-data/input/user-files/png/Rix AC15 Xlite.png and b/diylc-regression-data/input/user-files/png/Rix AC15 Xlite.png differ
diff --git a/diylc-regression-data/input/user-files/png/Rix Baby Blue.png b/diylc-regression-data/input/user-files/png/Rix Baby Blue.png
index f88aa680..546cedb9 100644
Binary files a/diylc-regression-data/input/user-files/png/Rix Baby Blue.png and b/diylc-regression-data/input/user-files/png/Rix Baby Blue.png differ
diff --git a/diylc-regression-data/input/user-files/png/Rix Bassman.png b/diylc-regression-data/input/user-files/png/Rix Bassman.png
index af654297..e20e3037 100644
Binary files a/diylc-regression-data/input/user-files/png/Rix Bassman.png and b/diylc-regression-data/input/user-files/png/Rix Bassman.png differ
diff --git a/diylc-regression-data/input/user-files/png/Rix JD stout.png b/diylc-regression-data/input/user-files/png/Rix JD stout.png
index 072bd71e..b4bd8b36 100644
Binary files a/diylc-regression-data/input/user-files/png/Rix JD stout.png and b/diylc-regression-data/input/user-files/png/Rix JD stout.png differ
diff --git a/diylc-regression-data/input/user-files/png/Rix Junior AB763.png b/diylc-regression-data/input/user-files/png/Rix Junior AB763.png
index 842547be..08446716 100644
Binary files a/diylc-regression-data/input/user-files/png/Rix Junior AB763.png and b/diylc-regression-data/input/user-files/png/Rix Junior AB763.png differ
diff --git a/diylc-regression-data/input/user-files/png/Rix Junior.png b/diylc-regression-data/input/user-files/png/Rix Junior.png
index 6d292227..218a0b88 100644
Binary files a/diylc-regression-data/input/user-files/png/Rix Junior.png and b/diylc-regression-data/input/user-files/png/Rix Junior.png differ
diff --git a/diylc-regression-data/input/user-files/png/Rix Plexi 6V6.png b/diylc-regression-data/input/user-files/png/Rix Plexi 6V6.png
index a04871aa..15f5e258 100644
Binary files a/diylc-regression-data/input/user-files/png/Rix Plexi 6V6.png and b/diylc-regression-data/input/user-files/png/Rix Plexi 6V6.png differ
diff --git a/diylc-regression-data/input/user-files/png/Rix Pro Jr.png b/diylc-regression-data/input/user-files/png/Rix Pro Jr.png
index 4efa3c28..623a63a1 100644
Binary files a/diylc-regression-data/input/user-files/png/Rix Pro Jr.png and b/diylc-regression-data/input/user-files/png/Rix Pro Jr.png differ
diff --git a/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png b/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png
index 64509006..46bf2ed2 100644
Binary files a/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png and b/diylc-regression-data/input/user-files/png/Silvertone 1484 v6f.png differ
diff --git a/diylc-regression-data/input/user-files/png/Thunderbolt Mk3.png b/diylc-regression-data/input/user-files/png/Thunderbolt Mk3.png
index 5b22e393..2ab22c23 100644
Binary files a/diylc-regression-data/input/user-files/png/Thunderbolt Mk3.png and b/diylc-regression-data/input/user-files/png/Thunderbolt Mk3.png differ
diff --git a/diylc-regression-data/input/user-files/png/dist_layout.png b/diylc-regression-data/input/user-files/png/dist_layout.png
index b451908d..9af11c1e 100644
Binary files a/diylc-regression-data/input/user-files/png/dist_layout.png and b/diylc-regression-data/input/user-files/png/dist_layout.png differ
diff --git a/diylc-regression-data/input/v1/netlist/30w_amp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/30w_amp_excl_switches.txt
index 476b2779..19e2c3bd 100644
--- a/diylc-regression-data/input/v1/netlist/30w_amp_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/30w_amp_excl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> R1.1
-	C2.1 <-> R2.2
+	C1.1 <-> C1.2 <-> R1.1
+	C2.1 <-> R2.1 <-> R2.2 <-> R3.2
 	C2.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R4.2
 	C5.1 <-> R3.1
 	C5.2 <-> R4.1
-	R2.1 <-> R3.2
 
diff --git a/diylc-regression-data/input/v1/netlist/30w_amp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/30w_amp_incl_switches.txt
index 476b2779..19e2c3bd 100644
--- a/diylc-regression-data/input/v1/netlist/30w_amp_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/30w_amp_incl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> R1.1
-	C2.1 <-> R2.2
+	C1.1 <-> C1.2 <-> R1.1
+	C2.1 <-> R2.1 <-> R2.2 <-> R3.2
 	C2.2 <-> C3.2 <-> C4.2 <-> R1.2 <-> R4.2
 	C5.1 <-> R3.1
 	C5.2 <-> R4.1
-	R2.1 <-> R3.2
 
diff --git a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt
index 81f67ae2..6fd93682 100644
--- a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_excl_switches.txt
@@ -1,6 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1
+	C1.1 <-> P1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R LED Current.1 <-> R1.1
 	C1.2 <-> P2.2
 	C2.1 <-> Q1.3 <-> R2.2
 	C2.2 <-> RP.1 <-> S1.4
@@ -10,7 +10,6 @@ Switch setup: [Default]
 	C4.2 <-> P5.2
 	D1.1 <-> R LED Current.2
 	D1.2 <-> S1.8
-	P1.1 <-> R LED Current.1
 	P2.1 <-> P3.1
 	P4.1 <-> P5.3 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2 <-> S1.7
 	P4.2 <-> P4.3 <-> R4.1
diff --git a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt
index 4645324c..7a425f38 100644
--- a/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/5_knob_fuzz_incl_switches.txt
@@ -1,6 +1,6 @@
 Switch setup: [S1.ON1]
 
-	C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1
+	C1.1 <-> P1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R LED Current.1 <-> R1.1
 	C1.2 <-> P2.2
 	C2.1 <-> Q1.3 <-> R2.2
 	C2.2 <-> RP.1
@@ -10,7 +10,6 @@ Switch setup: [S1.ON1]
 	C4.2 <-> P5.2
 	D1.1 <-> R LED Current.2
 	D1.2 <-> P4.1 <-> P5.3 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2
-	P1.1 <-> R LED Current.1
 	P2.1 <-> P3.1
 	P4.2 <-> P4.3 <-> R4.1
 	P5.1 <-> R6.1
@@ -19,7 +18,7 @@ Switch setup: [S1.ON1]
 
 Switch setup: [S1.ON2]
 
-	C1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R1.1
+	C1.1 <-> P1.1 <-> P1.2 <-> P2.3 <-> P3.3 <-> R LED Current.1 <-> R1.1
 	C1.2 <-> P2.2
 	C2.1 <-> Q1.3 <-> R2.2
 	C2.2 <-> RP.1
@@ -28,7 +27,6 @@ Switch setup: [S1.ON2]
 	C4.1 <-> R5.2
 	C4.2 <-> P5.2
 	D1.1 <-> R LED Current.2
-	P1.1 <-> R LED Current.1
 	P2.1 <-> P3.1
 	P4.1 <-> P5.3 <-> Q1.1 <-> Q1.2 <-> R5.1 <-> RP.2
 	P4.2 <-> P4.3 <-> R4.1
diff --git a/diylc-regression-data/input/v1/netlist/amz_minibooster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_minibooster_excl_switches.txt
index a8c762e8..a1ec9208 100644
--- a/diylc-regression-data/input/v1/netlist/amz_minibooster_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/amz_minibooster_excl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R1.1
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1
-	C2.2 <-> C3.1 <-> Q1.1
+	C1.1 <-> C1.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R1.1
+	C2.1 <-> C4.2 <-> C5.2 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> R5.2
+	C2.2 <-> C3.1 <-> C3.2 <-> Q1.1
 	C4.1 <-> R4.1
-	C4.2 <-> C5.2 <-> R1.2 <-> R3.2 <-> R5.2
 	Q2.1 <-> R2.1 <-> R4.2
 
diff --git a/diylc-regression-data/input/v1/netlist/amz_minibooster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_minibooster_incl_switches.txt
index a8c762e8..a1ec9208 100644
--- a/diylc-regression-data/input/v1/netlist/amz_minibooster_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/amz_minibooster_incl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R1.1
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.2 <-> Q2.3 <-> R2.2 <-> R3.1
-	C2.2 <-> C3.1 <-> Q1.1
+	C1.1 <-> C1.2 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R1.1
+	C2.1 <-> C4.2 <-> C5.2 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> R5.2
+	C2.2 <-> C3.1 <-> C3.2 <-> Q1.1
 	C4.1 <-> R4.1
-	C4.2 <-> C5.2 <-> R1.2 <-> R3.2 <-> R5.2
 	Q2.1 <-> R2.1 <-> R4.2
 
diff --git a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_excl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_excl_switches.txt
index be0bdceb..b9275042 100644
--- a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_excl_switches.txt
@@ -1,8 +1,8 @@
 Switch setup: [Default]
 
+	C1.1 <-> C3.1 <-> C3.2 <-> Q1.1 <-> R2.1
 	C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R1.1
 	C2.2 <-> C5.2 <-> R4.2 <-> R5.2
-	C3.1 <-> Q1.1 <-> R2.1
 	C4.1 <-> D1.1 <-> R5.1
 	C5.1 <-> R1.2 <-> R3.1 <-> R4.1
 	R2.2 <-> R3.2
diff --git a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_incl_switches.txt b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_incl_switches.txt
index be0bdceb..b9275042 100644
--- a/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/amz_mosfet_boost_incl_switches.txt
@@ -1,8 +1,8 @@
 Switch setup: [Default]
 
+	C1.1 <-> C3.1 <-> C3.2 <-> Q1.1 <-> R2.1
 	C1.2 <-> C2.1 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R1.1
 	C2.2 <-> C5.2 <-> R4.2 <-> R5.2
-	C3.1 <-> Q1.1 <-> R2.1
 	C4.1 <-> D1.1 <-> R5.1
 	C5.1 <-> R1.2 <-> R3.1 <-> R4.1
 	R2.2 <-> R3.2
diff --git a/diylc-regression-data/input/v1/netlist/antiquity_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/antiquity_fuzz_excl_switches.txt
index ea4851ed..af1a6226 100644
--- a/diylc-regression-data/input/v1/netlist/antiquity_fuzz_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/antiquity_fuzz_excl_switches.txt
@@ -1,11 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> D1.1 <-> D1.2 <-> Q1.3 <-> R2.2 <-> R3.1
-	C1.2 <-> R1.2
-	C2.1 <-> VR1.2
-	C2.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R2.1 <-> VR1.3 <-> VR2.3
+	C1.1 <-> C1.2 <-> D1.1 <-> D1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> VR1.1
+	C2.1 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> Q2.3 <-> R1.1 <-> R2.1 <-> R4.1 <-> VR1.2 <-> VR1.3 <-> VR2.3
 	C3.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.2
 	C3.2 <-> VR2.1
-	Q2.1 <-> Q2.2 <-> R3.2 <-> VR1.1
-	Q2.3 <-> R4.1
+	R6.1 <-> VR2.2
 
diff --git a/diylc-regression-data/input/v1/netlist/antiquity_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/antiquity_fuzz_incl_switches.txt
index ea4851ed..af1a6226 100644
--- a/diylc-regression-data/input/v1/netlist/antiquity_fuzz_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/antiquity_fuzz_incl_switches.txt
@@ -1,11 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> D1.1 <-> D1.2 <-> Q1.3 <-> R2.2 <-> R3.1
-	C1.2 <-> R1.2
-	C2.1 <-> VR1.2
-	C2.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R2.1 <-> VR1.3 <-> VR2.3
+	C1.1 <-> C1.2 <-> D1.1 <-> D1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> VR1.1
+	C2.1 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> Q2.3 <-> R1.1 <-> R2.1 <-> R4.1 <-> VR1.2 <-> VR1.3 <-> VR2.3
 	C3.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.2
 	C3.2 <-> VR2.1
-	Q2.1 <-> Q2.2 <-> R3.2 <-> VR1.1
-	Q2.3 <-> R4.1
+	R6.1 <-> VR2.2
 
diff --git a/diylc-regression-data/input/v1/netlist/atari_punk_console_556_excl_switches.txt b/diylc-regression-data/input/v1/netlist/atari_punk_console_556_excl_switches.txt
index e59850e6..82dde920 100644
--- a/diylc-regression-data/input/v1/netlist/atari_punk_console_556_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/atari_punk_console_556_excl_switches.txt
@@ -1,12 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.2 <-> IC1.6 <-> R1.1
-	C1.2 <-> C2.1 <-> IC1.7 <-> P3.1 <-> R3.2
-	C2.2 <-> IC1.10 <-> IC1.9 <-> P2.3
-	C3.1 <-> IC1.13
-	C3.2 <-> R2.2
-	IC1.1 <-> P1.3 <-> R1.2
-	IC1.12 <-> IC1.8 <-> P1.1 <-> P1.2 <-> P2.1 <-> P2.2
-	IC1.14 <-> IC1.5
-	P3.3 <-> R2.1 <-> R3.1
+	C1.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> IC1.10 <-> IC1.13 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.9 <-> P2.3 <-> R1.1 <-> R2.2
+	C1.2 <-> C2.1 <-> IC1.1 <-> IC1.12 <-> IC1.14 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> P1.1 <-> P1.2 <-> P1.3 <-> P2.1 <-> P2.2 <-> P3.1 <-> P3.3 <-> R1.2 <-> R2.1 <-> R3.1 <-> R3.2
+	IC1.11 <-> IC1.4
 
diff --git a/diylc-regression-data/input/v1/netlist/atari_punk_console_556_incl_switches.txt b/diylc-regression-data/input/v1/netlist/atari_punk_console_556_incl_switches.txt
index e59850e6..82dde920 100644
--- a/diylc-regression-data/input/v1/netlist/atari_punk_console_556_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/atari_punk_console_556_incl_switches.txt
@@ -1,12 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.2 <-> IC1.6 <-> R1.1
-	C1.2 <-> C2.1 <-> IC1.7 <-> P3.1 <-> R3.2
-	C2.2 <-> IC1.10 <-> IC1.9 <-> P2.3
-	C3.1 <-> IC1.13
-	C3.2 <-> R2.2
-	IC1.1 <-> P1.3 <-> R1.2
-	IC1.12 <-> IC1.8 <-> P1.1 <-> P1.2 <-> P2.1 <-> P2.2
-	IC1.14 <-> IC1.5
-	P3.3 <-> R2.1 <-> R3.1
+	C1.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> IC1.10 <-> IC1.13 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.9 <-> P2.3 <-> R1.1 <-> R2.2
+	C1.2 <-> C2.1 <-> IC1.1 <-> IC1.12 <-> IC1.14 <-> IC1.5 <-> IC1.7 <-> IC1.8 <-> P1.1 <-> P1.2 <-> P1.3 <-> P2.1 <-> P2.2 <-> P3.1 <-> P3.3 <-> R1.2 <-> R2.1 <-> R3.1 <-> R3.2
+	IC1.11 <-> IC1.4
 
diff --git a/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_excl_switches.txt b/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_excl_switches.txt
index e7f7de15..6acf01df 100644
--- a/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_excl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> Q1.3 <-> R2.1
-	C2.1 <-> C4.2 <-> D1.2 <-> R3.1 <-> R4.1
-	C2.2 <-> C6.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.2
-	C3.1 <-> Q2.2 <-> Q2.3 <-> VR1.2
-	C3.2 <-> Q2.1 <-> R3.2
+	C1.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C6.1 <-> C6.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R3.2 <-> VR1.2
+	C1.2 <-> Q1.3 <-> R2.1 <-> R2.2
+	C2.1 <-> C4.2 <-> C5.2 <-> D1.2 <-> R3.1 <-> R4.1
 	C4.1 <-> C5.1 <-> R4.2 <-> VR1.3
+	R1.1 <-> VR1.1
 
diff --git a/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_incl_switches.txt b/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_incl_switches.txt
index e7f7de15..6acf01df 100644
--- a/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/axis_face_silicon_v3_incl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.2 <-> Q1.3 <-> R2.1
-	C2.1 <-> C4.2 <-> D1.2 <-> R3.1 <-> R4.1
-	C2.2 <-> C6.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> R1.2
-	C3.1 <-> Q2.2 <-> Q2.3 <-> VR1.2
-	C3.2 <-> Q2.1 <-> R3.2
+	C1.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C6.1 <-> C6.2 <-> D1.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R3.2 <-> VR1.2
+	C1.2 <-> Q1.3 <-> R2.1 <-> R2.2
+	C2.1 <-> C4.2 <-> C5.2 <-> D1.2 <-> R3.1 <-> R4.1
 	C4.1 <-> C5.1 <-> R4.2 <-> VR1.3
+	R1.1 <-> VR1.1
 
diff --git a/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_excl_switches.txt
index 50ace27f..b91a92c8 100644
--- a/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_excl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
 	C1.1 <-> D1.2 <-> Q1.3
-	C1.2 <-> R2.1
-	C2.1 <-> D1.1 <-> R1.2
+	C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> R1.1 <-> R1.2 <-> R2.1
 	Q1.1 <-> Q1.2 <-> R2.2
 
diff --git a/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_incl_switches.txt
index 50ace27f..b91a92c8 100644
--- a/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/bazz_fuzz_v1_incl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
 	C1.1 <-> D1.2 <-> Q1.3
-	C1.2 <-> R2.1
-	C2.1 <-> D1.1 <-> R1.2
+	C1.2 <-> C2.1 <-> C2.2 <-> D1.1 <-> R1.1 <-> R1.2 <-> R2.1
 	Q1.1 <-> Q1.2 <-> R2.2
 
diff --git a/diylc-regression-data/input/v1/netlist/bi-polar_boost_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bi-polar_boost_excl_switches.txt
index c2097faf..4683e878 100644
--- a/diylc-regression-data/input/v1/netlist/bi-polar_boost_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/bi-polar_boost_excl_switches.txt
@@ -3,10 +3,9 @@ Switch setup: [Default]
 	C1.1 <-> C2.1 <-> R1.1 <-> R3.1 <-> R5.1 <-> VR1.2
 	C1.2 <-> C6.2 <-> C7.2 <-> R2.1 <-> R4.2 <-> R7.1 <-> R8.2
 	C2.2 <-> Q1.1 <-> R1.2
-	C3.2 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2
-	C5.1 <-> D1.1 <-> R7.2
-	C6.1 <-> C9.1 <-> D1.2 <-> Q2.2 <-> Q2.3 <-> R6.2
-	C7.1 <-> R4.1 <-> R6.1 <-> VR1.1
-	C8.1 <-> Q2.1 <-> R5.2
-	C8.2 <-> R8.1
+	C3.1 <-> C7.1 <-> R4.1 <-> R6.1 <-> VR1.1
+	C3.2 <-> C8.1 <-> C8.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> R2.2 <-> R3.2 <-> R5.2 <-> R8.1
+	C4.1 <-> C5.1 <-> D1.1 <-> R7.2
+	C4.2 <-> C5.2
+	C6.1 <-> C9.1 <-> C9.2 <-> D1.2 <-> Q2.2 <-> Q2.3 <-> R6.2
 
diff --git a/diylc-regression-data/input/v1/netlist/bi-polar_boost_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bi-polar_boost_incl_switches.txt
index c2097faf..4683e878 100644
--- a/diylc-regression-data/input/v1/netlist/bi-polar_boost_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/bi-polar_boost_incl_switches.txt
@@ -3,10 +3,9 @@ Switch setup: [Default]
 	C1.1 <-> C2.1 <-> R1.1 <-> R3.1 <-> R5.1 <-> VR1.2
 	C1.2 <-> C6.2 <-> C7.2 <-> R2.1 <-> R4.2 <-> R7.1 <-> R8.2
 	C2.2 <-> Q1.1 <-> R1.2
-	C3.2 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2
-	C5.1 <-> D1.1 <-> R7.2
-	C6.1 <-> C9.1 <-> D1.2 <-> Q2.2 <-> Q2.3 <-> R6.2
-	C7.1 <-> R4.1 <-> R6.1 <-> VR1.1
-	C8.1 <-> Q2.1 <-> R5.2
-	C8.2 <-> R8.1
+	C3.1 <-> C7.1 <-> R4.1 <-> R6.1 <-> VR1.1
+	C3.2 <-> C8.1 <-> C8.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> R2.2 <-> R3.2 <-> R5.2 <-> R8.1
+	C4.1 <-> C5.1 <-> D1.1 <-> R7.2
+	C4.2 <-> C5.2
+	C6.1 <-> C9.1 <-> C9.2 <-> D1.2 <-> Q2.2 <-> Q2.3 <-> R6.2
 
diff --git a/diylc-regression-data/input/v1/netlist/big_muff_1977_excl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_1977_excl_switches.txt
index 1b1789ab..51b20d40 100644
--- a/diylc-regression-data/input/v1/netlist/big_muff_1977_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/big_muff_1977_excl_switches.txt
@@ -1,31 +1,15 @@
 Switch setup: [Default]
 
-	C1.1 <-> R3.2
-	C1.2 <-> R1.2
+	C1.1 <-> C4.2 <-> R11.2 <-> R3.2 <-> R6.2
+	C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R11.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R7.1 <-> Volume.3
 	C10.1 <-> R16.2 <-> Tone.3
-	C10.2 <-> C2.2 <-> C3.1 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R7.1 <-> Volume.3
-	C11.1 <-> C12.1 <-> C7.2 <-> D3.1 <-> D6.2 <-> IC2.7 <-> R12.2
-	C11.2 <-> R16.1
+	C11.1 <-> C12.1 <-> C7.2 <-> C9.1 <-> D3.1 <-> D6.2 <-> IC2.3 <-> IC2.7 <-> R12.2 <-> R14.1 <-> R18.2
 	C12.2 <-> R15.1 <-> Tone.1
-	C13.1 <-> C4.1 <-> IC1.6 <-> R8.2
-	C13.2 <-> Sustain.1
-	C2.1 <-> IC1.3 <-> R4.1 <-> R7.2
-	C3.2 <-> IC1.8 <-> R11.1
-	C4.2 <-> R11.2 <-> R6.2
+	C13.1 <-> C4.1 <-> IC1.2 <-> IC1.6 <-> R3.1 <-> R5.1 <-> R8.2
+	C13.2 <-> C6.1 <-> C7.1 <-> C8.2 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> IC1.1 <-> IC1.5 <-> IC2.2 <-> IC2.6 <-> R12.1 <-> R13.2 <-> R18.1 <-> R2.1 <-> R2.2 <-> R4.2 <-> R5.2 <-> R6.1 <-> Sustain.1 <-> Sustain.2
+	C2.1 <-> IC1.3 <-> IC1.7 <-> R10.2 <-> R4.1 <-> R7.2 <-> R8.1 <-> R9.2 <-> Sustain.3
 	C5.1 <-> R9.1
-	C6.1 <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2
-	C7.1 <-> D1.2 <-> D4.1 <-> IC2.2 <-> R12.1 <-> R13.2
-	C8.1 <-> R13.1
-	C8.2 <-> Sustain.2
-	C9.1 <-> IC2.3 <-> R14.1 <-> R18.2
-	D1.1 <-> D2.2
-	D2.1 <-> D3.2
-	D4.2 <-> D5.1
-	D5.2 <-> D6.1
-	IC1.1 <-> R5.2 <-> R6.1
-	IC1.2 <-> R3.1 <-> R5.1
-	IC1.7 <-> R8.1 <-> R9.2
-	R10.2 <-> Sustain.3
+	C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1
 	R17.1 <-> Volume.2
 	Tone.2 <-> Volume.1
 
diff --git a/diylc-regression-data/input/v1/netlist/big_muff_1977_incl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_1977_incl_switches.txt
index 1b1789ab..51b20d40 100644
--- a/diylc-regression-data/input/v1/netlist/big_muff_1977_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/big_muff_1977_incl_switches.txt
@@ -1,31 +1,15 @@
 Switch setup: [Default]
 
-	C1.1 <-> R3.2
-	C1.2 <-> R1.2
+	C1.1 <-> C4.2 <-> R11.2 <-> R3.2 <-> R6.2
+	C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R11.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R7.1 <-> Volume.3
 	C10.1 <-> R16.2 <-> Tone.3
-	C10.2 <-> C2.2 <-> C3.1 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R7.1 <-> Volume.3
-	C11.1 <-> C12.1 <-> C7.2 <-> D3.1 <-> D6.2 <-> IC2.7 <-> R12.2
-	C11.2 <-> R16.1
+	C11.1 <-> C12.1 <-> C7.2 <-> C9.1 <-> D3.1 <-> D6.2 <-> IC2.3 <-> IC2.7 <-> R12.2 <-> R14.1 <-> R18.2
 	C12.2 <-> R15.1 <-> Tone.1
-	C13.1 <-> C4.1 <-> IC1.6 <-> R8.2
-	C13.2 <-> Sustain.1
-	C2.1 <-> IC1.3 <-> R4.1 <-> R7.2
-	C3.2 <-> IC1.8 <-> R11.1
-	C4.2 <-> R11.2 <-> R6.2
+	C13.1 <-> C4.1 <-> IC1.2 <-> IC1.6 <-> R3.1 <-> R5.1 <-> R8.2
+	C13.2 <-> C6.1 <-> C7.1 <-> C8.2 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> IC1.1 <-> IC1.5 <-> IC2.2 <-> IC2.6 <-> R12.1 <-> R13.2 <-> R18.1 <-> R2.1 <-> R2.2 <-> R4.2 <-> R5.2 <-> R6.1 <-> Sustain.1 <-> Sustain.2
+	C2.1 <-> IC1.3 <-> IC1.7 <-> R10.2 <-> R4.1 <-> R7.2 <-> R8.1 <-> R9.2 <-> Sustain.3
 	C5.1 <-> R9.1
-	C6.1 <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2
-	C7.1 <-> D1.2 <-> D4.1 <-> IC2.2 <-> R12.1 <-> R13.2
-	C8.1 <-> R13.1
-	C8.2 <-> Sustain.2
-	C9.1 <-> IC2.3 <-> R14.1 <-> R18.2
-	D1.1 <-> D2.2
-	D2.1 <-> D3.2
-	D4.2 <-> D5.1
-	D5.2 <-> D6.1
-	IC1.1 <-> R5.2 <-> R6.1
-	IC1.2 <-> R3.1 <-> R5.1
-	IC1.7 <-> R8.1 <-> R9.2
-	R10.2 <-> Sustain.3
+	C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1
 	R17.1 <-> Volume.2
 	Tone.2 <-> Volume.1
 
diff --git a/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_excl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_excl_switches.txt
index a472f4cf..5695884e 100644
--- a/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_excl_switches.txt
@@ -1,34 +1,16 @@
 Switch setup: [Default]
 
-	C1.1 <-> R3.2
-	C1.2 <-> R1.2
-	C10.1 <-> R16.2 <-> Tone.3
-	C10.2 <-> C2.2 <-> C3.1 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
-	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> D3.1 <-> D6.2 <-> IC2.7 <-> R12.2
-	C11.2 <-> R16.1
-	C12.2 <-> R15.1 <-> Tone.1
-	C13.2 <-> R19.1
-	C14.1 <-> C4.1 <-> IC1.6 <-> R8.2
-	C14.2 <-> Sustain.1
-	C2.1 <-> IC1.3 <-> R4.1 <-> R7.2
-	C3.2 <-> IC1.8 <-> R11.1
-	C4.2 <-> R11.2 <-> R6.2
+	C1.1 <-> C4.2 <-> R11.2 <-> R3.2 <-> R6.2
+	C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R11.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
+	C10.1 <-> C13.2 <-> R16.2 <-> R19.1 <-> Tone.3
+	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> C9.1 <-> D3.1 <-> D6.2 <-> IC2.3 <-> IC2.7 <-> R12.2 <-> R14.1 <-> R18.2
+	C12.2 <-> R15.1 <-> R19.2 <-> R20.1 <-> S1.1 <-> Tone.1
+	C14.1 <-> C4.1 <-> IC1.2 <-> IC1.6 <-> R3.1 <-> R5.1 <-> R8.2
+	C14.2 <-> C6.1 <-> C7.1 <-> C8.2 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> IC1.1 <-> IC1.5 <-> IC2.2 <-> IC2.6 <-> R12.1 <-> R13.2 <-> R18.1 <-> R2.1 <-> R2.2 <-> R4.2 <-> R5.2 <-> R6.1 <-> Sustain.1 <-> Sustain.2
+	C2.1 <-> IC1.3 <-> IC1.7 <-> R10.2 <-> R4.1 <-> R7.2 <-> R8.1 <-> R9.2 <-> Sustain.3
 	C5.1 <-> R9.1
-	C6.1 <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2
-	C7.1 <-> D1.2 <-> D4.1 <-> IC2.2 <-> R12.1 <-> R13.2
-	C8.1 <-> R13.1
-	C8.2 <-> Sustain.2
-	C9.1 <-> IC2.3 <-> R14.1 <-> R18.2
-	D1.1 <-> D2.2
-	D2.1 <-> D3.2
-	D4.2 <-> D5.1
-	D5.2 <-> D6.1
-	IC1.1 <-> R5.2 <-> R6.1
-	IC1.2 <-> R3.1 <-> R5.1
-	IC1.7 <-> R8.1 <-> R9.2
-	R10.2 <-> Sustain.3
+	C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1
 	R17.1 <-> Volume.2
-	R19.2 <-> R20.1 <-> S1.1
 	S1.2 <-> Volume.1
 	S1.3 <-> Tone.2
 
diff --git a/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_incl_switches.txt b/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_incl_switches.txt
index 97676437..cb892e7f 100644
--- a/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/big_muff_1978_tone_bypass_incl_switches.txt
@@ -1,65 +1,29 @@
 Switch setup: [S1.ON1]
 
-	C1.1 <-> R3.2
-	C1.2 <-> R1.2
-	C10.1 <-> R16.2 <-> Tone.3
-	C10.2 <-> C2.2 <-> C3.1 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
-	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> D3.1 <-> D6.2 <-> IC2.7 <-> R12.2
-	C11.2 <-> R16.1
-	C12.2 <-> R15.1 <-> Tone.1
-	C13.2 <-> R19.1
-	C14.1 <-> C4.1 <-> IC1.6 <-> R8.2
-	C14.2 <-> Sustain.1
-	C2.1 <-> IC1.3 <-> R4.1 <-> R7.2
-	C3.2 <-> IC1.8 <-> R11.1
-	C4.2 <-> R11.2 <-> R6.2
+	C1.1 <-> C4.2 <-> R11.2 <-> R3.2 <-> R6.2
+	C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R11.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
+	C10.1 <-> C13.2 <-> R16.2 <-> R19.1 <-> Tone.3
+	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> C9.1 <-> D3.1 <-> D6.2 <-> IC2.3 <-> IC2.7 <-> R12.2 <-> R14.1 <-> R18.2
+	C12.2 <-> R15.1 <-> R19.2 <-> R20.1 <-> Tone.1 <-> Volume.1
+	C14.1 <-> C4.1 <-> IC1.2 <-> IC1.6 <-> R3.1 <-> R5.1 <-> R8.2
+	C14.2 <-> C6.1 <-> C7.1 <-> C8.2 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> IC1.1 <-> IC1.5 <-> IC2.2 <-> IC2.6 <-> R12.1 <-> R13.2 <-> R18.1 <-> R2.1 <-> R2.2 <-> R4.2 <-> R5.2 <-> R6.1 <-> Sustain.1 <-> Sustain.2
+	C2.1 <-> IC1.3 <-> IC1.7 <-> R10.2 <-> R4.1 <-> R7.2 <-> R8.1 <-> R9.2 <-> Sustain.3
 	C5.1 <-> R9.1
-	C6.1 <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2
-	C7.1 <-> D1.2 <-> D4.1 <-> IC2.2 <-> R12.1 <-> R13.2
-	C8.1 <-> R13.1
-	C8.2 <-> Sustain.2
-	C9.1 <-> IC2.3 <-> R14.1 <-> R18.2
-	D1.1 <-> D2.2
-	D2.1 <-> D3.2
-	D4.2 <-> D5.1
-	D5.2 <-> D6.1
-	IC1.1 <-> R5.2 <-> R6.1
-	IC1.2 <-> R3.1 <-> R5.1
-	IC1.7 <-> R8.1 <-> R9.2
-	R10.2 <-> Sustain.3
+	C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1
 	R17.1 <-> Volume.2
-	R19.2 <-> R20.1 <-> Volume.1
 
 Switch setup: [S1.ON2]
 
-	C1.1 <-> R3.2
-	C1.2 <-> R1.2
-	C10.1 <-> R16.2 <-> Tone.3
-	C10.2 <-> C2.2 <-> C3.1 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC2.4 <-> R1.1 <-> R10.1 <-> R14.2 <-> R15.2 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
-	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> D3.1 <-> D6.2 <-> IC2.7 <-> R12.2
-	C11.2 <-> R16.1
-	C12.2 <-> R15.1 <-> Tone.1
-	C13.2 <-> R19.1
-	C14.1 <-> C4.1 <-> IC1.6 <-> R8.2
-	C14.2 <-> Sustain.1
-	C2.1 <-> IC1.3 <-> R4.1 <-> R7.2
-	C3.2 <-> IC1.8 <-> R11.1
-	C4.2 <-> R11.2 <-> R6.2
+	C1.1 <-> C4.2 <-> R11.2 <-> R3.2 <-> R6.2
+	C1.2 <-> C10.2 <-> C11.2 <-> C2.2 <-> C3.1 <-> C3.2 <-> C5.2 <-> C6.2 <-> C9.2 <-> IC1.4 <-> IC1.8 <-> IC2.4 <-> IC2.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R11.1 <-> R14.2 <-> R15.2 <-> R16.1 <-> R17.2 <-> R20.2 <-> R7.1 <-> Volume.3
+	C10.1 <-> C13.2 <-> R16.2 <-> R19.1 <-> Tone.3
+	C11.1 <-> C12.1 <-> C13.1 <-> C7.2 <-> C9.1 <-> D3.1 <-> D6.2 <-> IC2.3 <-> IC2.7 <-> R12.2 <-> R14.1 <-> R18.2
+	C12.2 <-> R15.1 <-> R19.2 <-> R20.1 <-> Tone.1
+	C14.1 <-> C4.1 <-> IC1.2 <-> IC1.6 <-> R3.1 <-> R5.1 <-> R8.2
+	C14.2 <-> C6.1 <-> C7.1 <-> C8.2 <-> D1.2 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> IC1.1 <-> IC1.5 <-> IC2.2 <-> IC2.6 <-> R12.1 <-> R13.2 <-> R18.1 <-> R2.1 <-> R2.2 <-> R4.2 <-> R5.2 <-> R6.1 <-> Sustain.1 <-> Sustain.2
+	C2.1 <-> IC1.3 <-> IC1.7 <-> R10.2 <-> R4.1 <-> R7.2 <-> R8.1 <-> R9.2 <-> Sustain.3
 	C5.1 <-> R9.1
-	C6.1 <-> IC1.5 <-> IC2.6 <-> R18.1 <-> R2.2 <-> R4.2
-	C7.1 <-> D1.2 <-> D4.1 <-> IC2.2 <-> R12.1 <-> R13.2
-	C8.1 <-> R13.1
-	C8.2 <-> Sustain.2
-	C9.1 <-> IC2.3 <-> R14.1 <-> R18.2
-	D1.1 <-> D2.2
-	D2.1 <-> D3.2
-	D4.2 <-> D5.1
-	D5.2 <-> D6.1
-	IC1.1 <-> R5.2 <-> R6.1
-	IC1.2 <-> R3.1 <-> R5.1
-	IC1.7 <-> R8.1 <-> R9.2
-	R10.2 <-> Sustain.3
+	C8.1 <-> D1.1 <-> D2.2 <-> D4.2 <-> D5.1 <-> IC2.1 <-> IC2.5 <-> R13.1
 	R17.1 <-> Volume.2
-	R19.2 <-> R20.1
 	Tone.2 <-> Volume.1
 
diff --git a/diylc-regression-data/input/v1/netlist/blackfire_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/blackfire_vero_excl_switches.txt
index 59c631fc..c7ab8ce9 100644
--- a/diylc-regression-data/input/v1/netlist/blackfire_vero_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/blackfire_vero_excl_switches.txt
@@ -1,18 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> Q1.3 <-> R2.1 <-> R3.2
-	C2.1 <-> Q2.1 <-> Q2.2 <-> Q3.1 <-> Q3.2 <-> R11.1 <-> R7.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C8.1 <-> C9.1 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> Q4.1 <-> Q4.2 <-> Q4.3 <-> Q5.1 <-> Q5.2 <-> Q5.3 <-> R1.1 <-> R10.1 <-> R10.2 <-> R11.1 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R14.1 <-> R15.1 <-> R15.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R18.2 <-> R19.1 <-> R19.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R7.1 <-> R8.1 <-> R8.2 <-> R9.1
 	C2.2 <-> C6.2 <-> C8.2 <-> R1.2 <-> R11.2 <-> R14.2 <-> R16.2 <-> R17.2 <-> R4.2 <-> R7.2 <-> R9.2
-	C3.1 <-> R6.2
-	C4.2 <-> C5.1 <-> C7.2 <-> Q3.3 <-> R10.1 <-> R12.1 <-> R15.1 <-> R8.1
-	C5.2 <-> R8.2 <-> R9.1
-	C6.1 <-> C7.1 <-> Q4.1 <-> Q4.2 <-> R14.1
-	C8.1 <-> C9.1 <-> R19.2 <-> R20.2
-	Q1.1 <-> Q1.2 <-> R10.2 <-> R13.1 <-> R18.2 <-> R3.1 <-> R4.1 <-> R5.1 <-> R6.1
-	Q2.3 <-> R5.2
-	Q4.3 <-> R12.2
-	Q5.1 <-> Q5.2 <-> R17.1
-	Q5.3 <-> R15.2 <-> R16.1 <-> R20.1
-	R18.1 <-> R19.1
+	C3.2 <-> C9.2
 
diff --git a/diylc-regression-data/input/v1/netlist/blackfire_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/blackfire_vero_incl_switches.txt
index 59c631fc..c7ab8ce9 100644
--- a/diylc-regression-data/input/v1/netlist/blackfire_vero_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/blackfire_vero_incl_switches.txt
@@ -1,18 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> Q1.3 <-> R2.1 <-> R3.2
-	C2.1 <-> Q2.1 <-> Q2.2 <-> Q3.1 <-> Q3.2 <-> R11.1 <-> R7.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C8.1 <-> C9.1 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> Q4.1 <-> Q4.2 <-> Q4.3 <-> Q5.1 <-> Q5.2 <-> Q5.3 <-> R1.1 <-> R10.1 <-> R10.2 <-> R11.1 <-> R12.1 <-> R12.2 <-> R13.1 <-> R13.2 <-> R14.1 <-> R15.1 <-> R15.2 <-> R16.1 <-> R17.1 <-> R18.1 <-> R18.2 <-> R19.1 <-> R19.2 <-> R2.1 <-> R2.2 <-> R20.1 <-> R20.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R7.1 <-> R8.1 <-> R8.2 <-> R9.1
 	C2.2 <-> C6.2 <-> C8.2 <-> R1.2 <-> R11.2 <-> R14.2 <-> R16.2 <-> R17.2 <-> R4.2 <-> R7.2 <-> R9.2
-	C3.1 <-> R6.2
-	C4.2 <-> C5.1 <-> C7.2 <-> Q3.3 <-> R10.1 <-> R12.1 <-> R15.1 <-> R8.1
-	C5.2 <-> R8.2 <-> R9.1
-	C6.1 <-> C7.1 <-> Q4.1 <-> Q4.2 <-> R14.1
-	C8.1 <-> C9.1 <-> R19.2 <-> R20.2
-	Q1.1 <-> Q1.2 <-> R10.2 <-> R13.1 <-> R18.2 <-> R3.1 <-> R4.1 <-> R5.1 <-> R6.1
-	Q2.3 <-> R5.2
-	Q4.3 <-> R12.2
-	Q5.1 <-> Q5.2 <-> R17.1
-	Q5.3 <-> R15.2 <-> R16.1 <-> R20.1
-	R18.1 <-> R19.1
+	C3.2 <-> C9.2
 
diff --git a/diylc-regression-data/input/v1/netlist/bonerender_excl_switches.txt b/diylc-regression-data/input/v1/netlist/bonerender_excl_switches.txt
index 9e29faa1..c228feea 100644
--- a/diylc-regression-data/input/v1/netlist/bonerender_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/bonerender_excl_switches.txt
@@ -1,16 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q3.2 <-> Q3.3 <-> R1.1
-	C1.2 <-> C4.2
-	C2.1 <-> C4.1 <-> C7.1 <-> R2.2 <-> R3.2
-	C2.2 <-> C3.1 <-> R1.2
-	C5.1 <-> C8.1 <-> R6.1
-	C5.2 <-> R5.1
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R4.1
-	C6.2 <-> Q3.1 <-> R2.1
-	C7.2 <-> R6.2
-	C8.2 <-> R7.1
-	Q1.1 <-> R5.2
+	C1.1 <-> C2.1 <-> C4.1 <-> C7.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R2.2 <-> R3.2
+	C1.2 <-> C4.2 <-> R7.2 <-> R8.1
+	C2.2 <-> C3.1 <-> C5.2 <-> C7.2 <-> R1.2 <-> R5.1 <-> R6.2
+	C3.2 <-> C6.2 <-> Q3.1 <-> R2.1
+	C5.1 <-> C6.1 <-> C8.1 <-> Q2.2 <-> Q2.3 <-> R4.1 <-> R4.2 <-> R6.1
+	C8.2 <-> Q1.1 <-> R5.2 <-> R7.1
 	Q1.2 <-> Q1.3 <-> Q2.1 <-> R3.1
-	R7.2 <-> R8.1
 
diff --git a/diylc-regression-data/input/v1/netlist/bonerender_incl_switches.txt b/diylc-regression-data/input/v1/netlist/bonerender_incl_switches.txt
index 9e29faa1..c228feea 100644
--- a/diylc-regression-data/input/v1/netlist/bonerender_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/bonerender_incl_switches.txt
@@ -1,16 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q3.2 <-> Q3.3 <-> R1.1
-	C1.2 <-> C4.2
-	C2.1 <-> C4.1 <-> C7.1 <-> R2.2 <-> R3.2
-	C2.2 <-> C3.1 <-> R1.2
-	C5.1 <-> C8.1 <-> R6.1
-	C5.2 <-> R5.1
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R4.1
-	C6.2 <-> Q3.1 <-> R2.1
-	C7.2 <-> R6.2
-	C8.2 <-> R7.1
-	Q1.1 <-> R5.2
+	C1.1 <-> C2.1 <-> C4.1 <-> C7.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R2.2 <-> R3.2
+	C1.2 <-> C4.2 <-> R7.2 <-> R8.1
+	C2.2 <-> C3.1 <-> C5.2 <-> C7.2 <-> R1.2 <-> R5.1 <-> R6.2
+	C3.2 <-> C6.2 <-> Q3.1 <-> R2.1
+	C5.1 <-> C6.1 <-> C8.1 <-> Q2.2 <-> Q2.3 <-> R4.1 <-> R4.2 <-> R6.1
+	C8.2 <-> Q1.1 <-> R5.2 <-> R7.1
 	Q1.2 <-> Q1.3 <-> Q2.1 <-> R3.1
-	R7.2 <-> R8.1
 
diff --git a/diylc-regression-data/input/v1/netlist/chaos_excl_switches.txt b/diylc-regression-data/input/v1/netlist/chaos_excl_switches.txt
index 181068f9..ecba4712 100644
--- a/diylc-regression-data/input/v1/netlist/chaos_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/chaos_excl_switches.txt
@@ -1,20 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> IC1.3 <-> R2.2
-	C10.1 <-> C11.2 <-> R10.2
-	C10.2 <-> C9.1 <-> R9.1
-	C11.1 <-> C12.2 <-> C2.2 <-> C5.2 <-> IC1.4 <-> R1.1 <-> R10.1 <-> R13.1
-	C12.1 <-> R12.2 <-> R13.2 <-> R2.1 <-> R8.1
-	C2.1 <-> R3.1
-	C3.1 <-> D1.2 <-> D2.1 <-> IC1.2 <-> R4.1
-	C3.2 <-> C4.1 <-> D1.1 <-> D3.2 <-> IC1.1 <-> R4.2
-	C4.2 <-> R5.2
-	C5.1 <-> R6.1
-	C6.1 <-> C7.1 <-> D4.1 <-> D5.2 <-> IC1.6 <-> R7.2
-	C6.2 <-> D4.2 <-> D5.1 <-> IC1.7 <-> R6.2 <-> R7.1
-	C7.2 <-> C8.1 <-> R9.2
-	D2.2 <-> D3.1
-	IC1.5 <-> R11.1 <-> R12.1
-	IC1.8 <-> R5.1 <-> R8.2
+	C1.1 <-> C12.1 <-> C5.1 <-> R1.2 <-> R12.2 <-> R13.2 <-> R2.1 <-> R6.1 <-> R8.1
+	C1.2 <-> C2.1 <-> C3.2 <-> C4.1 <-> C6.2 <-> C7.2 <-> C8.1 <-> D1.1 <-> D3.2 <-> D4.2 <-> D5.1 <-> IC1.1 <-> IC1.3 <-> IC1.5 <-> IC1.7 <-> R11.1 <-> R12.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R6.2 <-> R7.1 <-> R9.2
+	C10.1 <-> C11.1 <-> C11.2 <-> C12.2 <-> C2.2 <-> C5.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.1 <-> R3.2 <-> R5.1 <-> R8.2
+	C10.2 <-> C3.1 <-> C6.1 <-> C7.1 <-> C8.2 <-> C9.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D4.1 <-> D5.2 <-> IC1.2 <-> IC1.6 <-> R4.1 <-> R7.2 <-> R9.1
+	C4.2 <-> C9.2 <-> R5.2
 
diff --git a/diylc-regression-data/input/v1/netlist/chaos_incl_switches.txt b/diylc-regression-data/input/v1/netlist/chaos_incl_switches.txt
index 181068f9..ecba4712 100644
--- a/diylc-regression-data/input/v1/netlist/chaos_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/chaos_incl_switches.txt
@@ -1,20 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> IC1.3 <-> R2.2
-	C10.1 <-> C11.2 <-> R10.2
-	C10.2 <-> C9.1 <-> R9.1
-	C11.1 <-> C12.2 <-> C2.2 <-> C5.2 <-> IC1.4 <-> R1.1 <-> R10.1 <-> R13.1
-	C12.1 <-> R12.2 <-> R13.2 <-> R2.1 <-> R8.1
-	C2.1 <-> R3.1
-	C3.1 <-> D1.2 <-> D2.1 <-> IC1.2 <-> R4.1
-	C3.2 <-> C4.1 <-> D1.1 <-> D3.2 <-> IC1.1 <-> R4.2
-	C4.2 <-> R5.2
-	C5.1 <-> R6.1
-	C6.1 <-> C7.1 <-> D4.1 <-> D5.2 <-> IC1.6 <-> R7.2
-	C6.2 <-> D4.2 <-> D5.1 <-> IC1.7 <-> R6.2 <-> R7.1
-	C7.2 <-> C8.1 <-> R9.2
-	D2.2 <-> D3.1
-	IC1.5 <-> R11.1 <-> R12.1
-	IC1.8 <-> R5.1 <-> R8.2
+	C1.1 <-> C12.1 <-> C5.1 <-> R1.2 <-> R12.2 <-> R13.2 <-> R2.1 <-> R6.1 <-> R8.1
+	C1.2 <-> C2.1 <-> C3.2 <-> C4.1 <-> C6.2 <-> C7.2 <-> C8.1 <-> D1.1 <-> D3.2 <-> D4.2 <-> D5.1 <-> IC1.1 <-> IC1.3 <-> IC1.5 <-> IC1.7 <-> R11.1 <-> R12.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R6.2 <-> R7.1 <-> R9.2
+	C10.1 <-> C11.1 <-> C11.2 <-> C12.2 <-> C2.2 <-> C5.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R10.1 <-> R10.2 <-> R11.2 <-> R13.1 <-> R3.2 <-> R5.1 <-> R8.2
+	C10.2 <-> C3.1 <-> C6.1 <-> C7.1 <-> C8.2 <-> C9.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D4.1 <-> D5.2 <-> IC1.2 <-> IC1.6 <-> R4.1 <-> R7.2 <-> R9.1
+	C4.2 <-> C9.2 <-> R5.2
 
diff --git a/diylc-regression-data/input/v1/netlist/colorsound_il_wah_excl_switches.txt b/diylc-regression-data/input/v1/netlist/colorsound_il_wah_excl_switches.txt
index aaaa186f..f510bc75 100644
--- a/diylc-regression-data/input/v1/netlist/colorsound_il_wah_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/colorsound_il_wah_excl_switches.txt
@@ -1,14 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> R2.1
-	C2.1 <-> C6.1 <-> Q1.1 <-> R3.1 <-> R4.1
-	C2.2 <-> C5.2 <-> R7.2
+	C1.1 <-> C2.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R10.2 <-> R6.2 <-> R7.2
+	C1.2 <-> C2.1 <-> C6.1 <-> C7.2 <-> Q1.1 <-> R10.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R9.2
 	C3.1 <-> R5.2 <-> R7.1
-	C3.2 <-> R6.1
+	C3.2 <-> R6.1 <-> R8.2
 	C4.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 <-> R5.1
 	C4.2 <-> C5.1 <-> R8.1
 	C6.2 <-> C7.1 <-> R9.1
-	C7.2 <-> R10.1 <-> R9.2
-	R1.1 <-> R10.2 <-> R6.2
 
diff --git a/diylc-regression-data/input/v1/netlist/colorsound_il_wah_incl_switches.txt b/diylc-regression-data/input/v1/netlist/colorsound_il_wah_incl_switches.txt
index aaaa186f..f510bc75 100644
--- a/diylc-regression-data/input/v1/netlist/colorsound_il_wah_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/colorsound_il_wah_incl_switches.txt
@@ -1,14 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> R2.1
-	C2.1 <-> C6.1 <-> Q1.1 <-> R3.1 <-> R4.1
-	C2.2 <-> C5.2 <-> R7.2
+	C1.1 <-> C2.2 <-> C5.2 <-> R1.1 <-> R1.2 <-> R10.2 <-> R6.2 <-> R7.2
+	C1.2 <-> C2.1 <-> C6.1 <-> C7.2 <-> Q1.1 <-> R10.1 <-> R2.1 <-> R3.1 <-> R4.1 <-> R9.2
 	C3.1 <-> R5.2 <-> R7.1
-	C3.2 <-> R6.1
+	C3.2 <-> R6.1 <-> R8.2
 	C4.1 <-> Q1.2 <-> Q1.3 <-> R2.2 <-> R3.2 <-> R5.1
 	C4.2 <-> C5.1 <-> R8.1
 	C6.2 <-> C7.1 <-> R9.1
-	C7.2 <-> R10.1 <-> R9.2
-	R1.1 <-> R10.2 <-> R6.2
 
diff --git a/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_excl_switches.txt
index 8f172f62..a95751eb 100644
--- a/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_excl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C2.2 <-> Q1.3 <-> R2.1
+	C1.1 <-> C5.2 <-> R1.1 <-> R6.2
+	C1.2 <-> C2.2 <-> C4.1 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R2.1 <-> R2.2 <-> R4.1
 	C2.1 <-> Q2.3 <-> R3.2
 	C3.1 <-> R3.1 <-> R5.1
-	C3.2 <-> C4.2 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R2.2 <-> R4.1
-	C5.1 <-> R5.2 <-> R6.1
+	C3.2 <-> C4.2 <-> C5.1 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 <-> R5.2 <-> R6.1
 
diff --git a/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_incl_switches.txt
index 8f172f62..a95751eb 100644
--- a/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/colorsound_one_knob_fuzz_incl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C2.2 <-> Q1.3 <-> R2.1
+	C1.1 <-> C5.2 <-> R1.1 <-> R6.2
+	C1.2 <-> C2.2 <-> C4.1 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R2.1 <-> R2.2 <-> R4.1
 	C2.1 <-> Q2.3 <-> R3.2
 	C3.1 <-> R3.1 <-> R5.1
-	C3.2 <-> C4.2 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R2.2 <-> R4.1
-	C5.1 <-> R5.2 <-> R6.1
+	C3.2 <-> C4.2 <-> C5.1 <-> Q1.1 <-> Q1.2 <-> R1.2 <-> R4.2 <-> R5.2 <-> R6.1
 
diff --git a/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_excl_switches.txt
index acdb992f..48c27dcb 100644
--- a/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_excl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> R3.2
-	C1.2 <-> R4.1 <-> Vol.1
+	C1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R4.1 <-> Vol.1
 	C2.1 <-> R3.1
 	C2.2 <-> R1.2 <-> R2.2 <-> R4.2 <-> Vol.3
-	Q1.1 <-> Q1.2 <-> R1.1
 	Q1.3 <-> R2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_incl_switches.txt
index acdb992f..48c27dcb 100644
--- a/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/discrete_fet_guitar_preamp_incl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> R3.2
-	C1.2 <-> R4.1 <-> Vol.1
+	C1.2 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R4.1 <-> Vol.1
 	C2.1 <-> R3.1
 	C2.2 <-> R1.2 <-> R2.2 <-> R4.2 <-> Vol.3
-	Q1.1 <-> Q1.2 <-> R1.1
 	Q1.3 <-> R2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/dist+_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dist+_excl_switches.txt
index 8c7d12bf..b88d856c 100644
--- a/diylc-regression-data/input/v1/netlist/dist+_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/dist+_excl_switches.txt
@@ -1,14 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> C4.1
-	C2.1 <-> C3.1 <-> IC1.2 <-> R2.1
-	C2.2 <-> C5.1 <-> IC1.7 <-> R2.2
-	C3.2 <-> R3.1
-	C4.2 <-> C6.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R7.1
-	C5.2 <-> R6.1
-	C6.1 <-> D1.1 <-> D2.2 <-> R6.2
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1
 	C7.1 <-> R4.2 <-> R5.2 <-> R7.2
-	IC1.3 <-> R1.1 <-> R4.1
-	IC1.6 <-> R5.1
+	IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/v1/netlist/dist+_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dist+_incl_switches.txt
index 8c7d12bf..b88d856c 100644
--- a/diylc-regression-data/input/v1/netlist/dist+_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/dist+_incl_switches.txt
@@ -1,14 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2
-	C1.2 <-> C4.1
-	C2.1 <-> C3.1 <-> IC1.2 <-> R2.1
-	C2.2 <-> C5.1 <-> IC1.7 <-> R2.2
-	C3.2 <-> R3.1
-	C4.2 <-> C6.2 <-> C7.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R7.1
-	C5.2 <-> R6.1
-	C6.1 <-> D1.1 <-> D2.2 <-> R6.2
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1
 	C7.1 <-> R4.2 <-> R5.2 <-> R7.2
-	IC1.3 <-> R1.1 <-> R4.1
-	IC1.6 <-> R5.1
+	IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_excl_switches.txt
index d974f33e..1d71d28a 100644
--- a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_excl_switches.txt
@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> IC1.2 <-> R1.1
-	C1.2 <-> C5.1 <-> IC1.7 <-> R1.2
+	C1.1 <-> C2.1 <-> C3.2 <-> IC1.2 <-> IC1.6 <-> R1.1 <-> R8.1
+	C1.2 <-> C5.1 <-> IC1.1 <-> IC1.3 <-> IC1.5 <-> IC1.7 <-> R1.2 <-> R2.1 <-> R3.1 <-> R4.1
 	C2.2 <-> R2.2
-	C3.1 <-> R3.2
-	C3.2 <-> R8.1
-	C4.1 <-> R4.2 <-> R5.1
-	C4.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R5.2 <-> R6.1 <-> R8.2
-	C5.2 <-> R9.1
-	C6.1 <-> D1.1 <-> D3.2 <-> R9.2
-	D2.2 <-> D3.1
-	IC1.3 <-> R3.1 <-> R4.1
-	R6.2 <-> R7.2
+	C3.1 <-> C6.1 <-> D1.1 <-> D3.2 <-> R3.2 <-> R9.2
+	C4.1 <-> D2.2 <-> D3.1 <-> R4.2 <-> R5.1
+	C4.2 <-> C5.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R5.2 <-> R6.1 <-> R8.2 <-> R9.1
+	R6.2 <-> R7.1 <-> R7.2
 
diff --git a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_incl_switches.txt
index d974f33e..1d71d28a 100644
--- a/diylc-regression-data/input/v1/netlist/dod_overdrive_250_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/dod_overdrive_250_incl_switches.txt
@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.1 <-> IC1.2 <-> R1.1
-	C1.2 <-> C5.1 <-> IC1.7 <-> R1.2
+	C1.1 <-> C2.1 <-> C3.2 <-> IC1.2 <-> IC1.6 <-> R1.1 <-> R8.1
+	C1.2 <-> C5.1 <-> IC1.1 <-> IC1.3 <-> IC1.5 <-> IC1.7 <-> R1.2 <-> R2.1 <-> R3.1 <-> R4.1
 	C2.2 <-> R2.2
-	C3.1 <-> R3.2
-	C3.2 <-> R8.1
-	C4.1 <-> R4.2 <-> R5.1
-	C4.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> R5.2 <-> R6.1 <-> R8.2
-	C5.2 <-> R9.1
-	C6.1 <-> D1.1 <-> D3.2 <-> R9.2
-	D2.2 <-> D3.1
-	IC1.3 <-> R3.1 <-> R4.1
-	R6.2 <-> R7.2
+	C3.1 <-> C6.1 <-> D1.1 <-> D3.2 <-> R3.2 <-> R9.2
+	C4.1 <-> D2.2 <-> D3.1 <-> R4.2 <-> R5.1
+	C4.2 <-> C5.2 <-> C6.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R5.2 <-> R6.1 <-> R8.2 <-> R9.1
+	R6.2 <-> R7.1 <-> R7.2
 
diff --git a/diylc-regression-data/input/v1/netlist/dynamic_overhype_excl_switches.txt b/diylc-regression-data/input/v1/netlist/dynamic_overhype_excl_switches.txt
index c1f325cc..d4e56049 100644
--- a/diylc-regression-data/input/v1/netlist/dynamic_overhype_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/dynamic_overhype_excl_switches.txt
@@ -1,26 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> R15.2 <-> R18.2 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1
-	C1.2 <-> C2.2 <-> C9.2 <-> D1.1 <-> IC1.4 <-> R1.1 <-> R14.2 <-> R16.2 <-> R19.2 <-> R3.1 <-> R7.2
-	C10.1 <-> R14.1
-	C11.2 <-> Q2.2 <-> Q2.3 <-> R18.1
-	C2.1 <-> D1.2 <-> IC1.5 <-> Q1.1 <-> Q2.1 <-> R5.1
-	C3.1 <-> R17.1
-	C3.2 <-> R16.1
-	C4.1 <-> R2.2
-	C4.2 <-> R3.2
-	C5.1 <-> R1.2
-	C5.2 <-> IC1.3 <-> R8.2
-	C6.1 <-> R9.2
-	C6.2 <-> C7.1 <-> IC1.2 <-> R13.1
-	C7.2 <-> D2.2 <-> D4.1 <-> D5.1 <-> D6.2 <-> IC1.1 <-> R12.2
-	C8.1 <-> R10.1
-	C8.2 <-> IC1.6 <-> R11.1
-	C9.1 <-> IC1.8 <-> R12.1 <-> R15.1
-	D2.1 <-> D3.2
-	D3.1 <-> D4.2
-	D5.2 <-> D6.1
-	IC1.7 <-> R11.2
-	Q1.2 <-> Q1.3 <-> R2.1 <-> R6.2
-	R17.2 <-> R19.1
+	C1.2 <-> C2.2 <-> C3.1 <-> C9.1 <-> C9.2 <-> D1.1 <-> D3.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R12.1 <-> R14.2 <-> R15.1 <-> R16.2 <-> R17.1 <-> R19.2 <-> R3.1 <-> R7.2
+	C10.1 <-> C10.2 <-> R13.2 <-> R14.1
+	C11.1 <-> C4.2 <-> C6.2 <-> C7.1 <-> C8.2 <-> D5.2 <-> D6.1 <-> IC1.2 <-> IC1.6 <-> R11.1 <-> R13.1 <-> R17.2 <-> R19.1 <-> R3.2
+	C11.2 <-> C2.1 <-> C3.2 <-> C5.1 <-> C6.1 <-> C7.2 <-> C8.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.2 <-> D4.1 <-> D5.1 <-> D6.2 <-> IC1.1 <-> IC1.5 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R10.1 <-> R10.2 <-> R12.2 <-> R16.1 <-> R18.1 <-> R2.1 <-> R5.1 <-> R6.2 <-> R9.2
+	C4.1 <-> C5.2 <-> IC1.3 <-> IC1.7 <-> R11.2 <-> R2.2 <-> R8.2
 
diff --git a/diylc-regression-data/input/v1/netlist/dynamic_overhype_incl_switches.txt b/diylc-regression-data/input/v1/netlist/dynamic_overhype_incl_switches.txt
index c1f325cc..d4e56049 100644
--- a/diylc-regression-data/input/v1/netlist/dynamic_overhype_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/dynamic_overhype_incl_switches.txt
@@ -1,26 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> R15.2 <-> R18.2 <-> R5.2 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1
-	C1.2 <-> C2.2 <-> C9.2 <-> D1.1 <-> IC1.4 <-> R1.1 <-> R14.2 <-> R16.2 <-> R19.2 <-> R3.1 <-> R7.2
-	C10.1 <-> R14.1
-	C11.2 <-> Q2.2 <-> Q2.3 <-> R18.1
-	C2.1 <-> D1.2 <-> IC1.5 <-> Q1.1 <-> Q2.1 <-> R5.1
-	C3.1 <-> R17.1
-	C3.2 <-> R16.1
-	C4.1 <-> R2.2
-	C4.2 <-> R3.2
-	C5.1 <-> R1.2
-	C5.2 <-> IC1.3 <-> R8.2
-	C6.1 <-> R9.2
-	C6.2 <-> C7.1 <-> IC1.2 <-> R13.1
-	C7.2 <-> D2.2 <-> D4.1 <-> D5.1 <-> D6.2 <-> IC1.1 <-> R12.2
-	C8.1 <-> R10.1
-	C8.2 <-> IC1.6 <-> R11.1
-	C9.1 <-> IC1.8 <-> R12.1 <-> R15.1
-	D2.1 <-> D3.2
-	D3.1 <-> D4.2
-	D5.2 <-> D6.1
-	IC1.7 <-> R11.2
-	Q1.2 <-> Q1.3 <-> R2.1 <-> R6.2
-	R17.2 <-> R19.1
+	C1.2 <-> C2.2 <-> C3.1 <-> C9.1 <-> C9.2 <-> D1.1 <-> D3.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R12.1 <-> R14.2 <-> R15.1 <-> R16.2 <-> R17.1 <-> R19.2 <-> R3.1 <-> R7.2
+	C10.1 <-> C10.2 <-> R13.2 <-> R14.1
+	C11.1 <-> C4.2 <-> C6.2 <-> C7.1 <-> C8.2 <-> D5.2 <-> D6.1 <-> IC1.2 <-> IC1.6 <-> R11.1 <-> R13.1 <-> R17.2 <-> R19.1 <-> R3.2
+	C11.2 <-> C2.1 <-> C3.2 <-> C5.1 <-> C6.1 <-> C7.2 <-> C8.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.2 <-> D4.1 <-> D5.1 <-> D6.2 <-> IC1.1 <-> IC1.5 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> R1.2 <-> R10.1 <-> R10.2 <-> R12.2 <-> R16.1 <-> R18.1 <-> R2.1 <-> R5.1 <-> R6.2 <-> R9.2
+	C4.1 <-> C5.2 <-> IC1.3 <-> IC1.7 <-> R11.2 <-> R2.2 <-> R8.2
 
diff --git a/diylc-regression-data/input/v1/netlist/easy_face_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/easy_face_vero_excl_switches.txt
index e6d84bc3..102f882f 100644
--- a/diylc-regression-data/input/v1/netlist/easy_face_vero_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/easy_face_vero_excl_switches.txt
@@ -1,10 +1,9 @@
 Switch setup: [Default]
 
+	C1.1 <-> C3.1 <-> R1.2 <-> VR1.1
+	C1.2 <-> VR1.2 <-> VR1.3
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1
-	C2.2 <-> Q2.1 <-> Q2.2 <-> R3.2 <-> R4.2
-	C3.1 <-> R1.2 <-> VR1.1
-	Q1.3 <-> R3.1
-	Q2.3 <-> R2.1
+	C2.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R3.2 <-> R4.2
+	C3.2 <-> Q2.3 <-> R2.1
 	R1.1 <-> R2.2
-	VR1.2 <-> VR1.3
 
diff --git a/diylc-regression-data/input/v1/netlist/easy_face_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/easy_face_vero_incl_switches.txt
index e6d84bc3..102f882f 100644
--- a/diylc-regression-data/input/v1/netlist/easy_face_vero_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/easy_face_vero_incl_switches.txt
@@ -1,10 +1,9 @@
 Switch setup: [Default]
 
+	C1.1 <-> C3.1 <-> R1.2 <-> VR1.1
+	C1.2 <-> VR1.2 <-> VR1.3
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1
-	C2.2 <-> Q2.1 <-> Q2.2 <-> R3.2 <-> R4.2
-	C3.1 <-> R1.2 <-> VR1.1
-	Q1.3 <-> R3.1
-	Q2.3 <-> R2.1
+	C2.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R3.2 <-> R4.2
+	C3.2 <-> Q2.3 <-> R2.1
 	R1.1 <-> R2.2
-	VR1.2 <-> VR1.3
 
diff --git a/diylc-regression-data/input/v1/netlist/electronic_dazer_excl_switches.txt b/diylc-regression-data/input/v1/netlist/electronic_dazer_excl_switches.txt
index 35c616f0..20ad95d6 100644
--- a/diylc-regression-data/input/v1/netlist/electronic_dazer_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/electronic_dazer_excl_switches.txt
@@ -1,17 +1,7 @@
 Switch setup: [Default]
 
+	C1.1 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C6.1 <-> C6.2 <-> C8.1 <-> C8.2 <-> D1.2 <-> D10.1 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> D7.2 <-> D8.1 <-> D9.2
 	C1.2 <-> Q1.1 <-> R1.2
-	C10.1 <-> C8.2 <-> D7.2 <-> D8.1
-	C10.2 <-> D10.1 <-> D9.2
-	C11.1 <-> C9.2 <-> D8.2 <-> D9.1
-	C11.2 <-> D10.2
-	C2.2 <-> C4.1 <-> D1.2 <-> D2.1
-	C3.1 <-> D1.1
-	C3.2 <-> C5.1 <-> D2.2 <-> D3.1
-	C4.2 <-> C6.1 <-> D3.2 <-> D4.1
-	C5.2 <-> C7.1 <-> D4.2 <-> D5.1
-	C6.2 <-> C8.1 <-> D5.2 <-> D6.1
-	C7.2 <-> C9.1 <-> D6.2 <-> D7.1
-	Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2
+	C11.1 <-> C11.2 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> D1.1 <-> D10.2 <-> D2.2 <-> D3.1 <-> D4.2 <-> D5.1 <-> D6.2 <-> D7.1 <-> D8.2 <-> D9.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2
 	Q2.3 <-> R1.1 <-> S1.3
 
diff --git a/diylc-regression-data/input/v1/netlist/electronic_dazer_incl_switches.txt b/diylc-regression-data/input/v1/netlist/electronic_dazer_incl_switches.txt
index 38710a06..d8aa421b 100644
--- a/diylc-regression-data/input/v1/netlist/electronic_dazer_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/electronic_dazer_incl_switches.txt
@@ -1,17 +1,7 @@
 Switch setup: [S1.ON1, S1.ON2]
 
+	C1.1 <-> C10.1 <-> C10.2 <-> C2.1 <-> C2.2 <-> C4.1 <-> C4.2 <-> C6.1 <-> C6.2 <-> C8.1 <-> C8.2 <-> D1.2 <-> D10.1 <-> D2.1 <-> D3.2 <-> D4.1 <-> D5.2 <-> D6.1 <-> D7.2 <-> D8.1 <-> D9.2
 	C1.2 <-> Q1.1 <-> R1.2
-	C10.1 <-> C8.2 <-> D7.2 <-> D8.1
-	C10.2 <-> D10.1 <-> D9.2
-	C11.1 <-> C9.2 <-> D8.2 <-> D9.1
-	C11.2 <-> D10.2
-	C2.2 <-> C4.1 <-> D1.2 <-> D2.1
-	C3.1 <-> D1.1
-	C3.2 <-> C5.1 <-> D2.2 <-> D3.1
-	C4.2 <-> C6.1 <-> D3.2 <-> D4.1
-	C5.2 <-> C7.1 <-> D4.2 <-> D5.1
-	C6.2 <-> C8.1 <-> D5.2 <-> D6.1
-	C7.2 <-> C9.1 <-> D6.2 <-> D7.1
-	Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2
+	C11.1 <-> C11.2 <-> C3.1 <-> C3.2 <-> C5.1 <-> C5.2 <-> C7.1 <-> C7.2 <-> C9.1 <-> C9.2 <-> D1.1 <-> D10.2 <-> D2.2 <-> D3.1 <-> D4.2 <-> D5.1 <-> D6.2 <-> D7.1 <-> D8.2 <-> D9.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2
 	Q2.3 <-> R1.1
 
diff --git a/diylc-regression-data/input/v1/netlist/fet_booster_od_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fet_booster_od_excl_switches.txt
index 8d044ed8..3d1f83a1 100644
--- a/diylc-regression-data/input/v1/netlist/fet_booster_od_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/fet_booster_od_excl_switches.txt
@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1 <-> R2.1
-	C1.2 <-> R5.1
-	C2.1 <-> D1.2 <-> VR1.1 <-> VR1.2
+	C1.1 <-> C1.2 <-> R1.1 <-> R2.1 <-> R5.1
+	C2.1 <-> C3.1 <-> D1.2 <-> R3.1 <-> VR1.1 <-> VR1.2
 	C2.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R1.2 <-> R3.2
-	C3.1 <-> R3.1
-	C3.2 <-> Q1.1 <-> R4.1 <-> VR1.3
+	C3.2 <-> Q1.1 <-> R4.1 <-> R5.2 <-> VR1.3
 	C5.1 <-> D2.1 <-> D3.2 <-> R2.2 <-> R4.2
 	D2.2 <-> D3.1
 	Q1.2 <-> Q1.3
diff --git a/diylc-regression-data/input/v1/netlist/fet_booster_od_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fet_booster_od_incl_switches.txt
index 8d044ed8..3d1f83a1 100644
--- a/diylc-regression-data/input/v1/netlist/fet_booster_od_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/fet_booster_od_incl_switches.txt
@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1 <-> R2.1
-	C1.2 <-> R5.1
-	C2.1 <-> D1.2 <-> VR1.1 <-> VR1.2
+	C1.1 <-> C1.2 <-> R1.1 <-> R2.1 <-> R5.1
+	C2.1 <-> C3.1 <-> D1.2 <-> R3.1 <-> VR1.1 <-> VR1.2
 	C2.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> R1.2 <-> R3.2
-	C3.1 <-> R3.1
-	C3.2 <-> Q1.1 <-> R4.1 <-> VR1.3
+	C3.2 <-> Q1.1 <-> R4.1 <-> R5.2 <-> VR1.3
 	C5.1 <-> D2.1 <-> D3.2 <-> R2.2 <-> R4.2
 	D2.2 <-> D3.1
 	Q1.2 <-> Q1.3
diff --git a/diylc-regression-data/input/v1/netlist/firefly_preamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/firefly_preamp_excl_switches.txt
index 09152a4d..abd40973 100644
--- a/diylc-regression-data/input/v1/netlist/firefly_preamp_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/firefly_preamp_excl_switches.txt
@@ -1,12 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.2
+	C1.1 <-> C4.2 <-> Q1.1 <-> Q2.1 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3
+	C2.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> R5.2
 	C2.2 <-> R1.1 <-> R3.1 <-> R5.1
-	C3.1 <-> R4.1
-	C3.2 <-> R4.2
-	C4.2 <-> Q2.1 <-> VR2.2 <-> VR2.3
-	Q2.2 <-> Q2.3 <-> R5.2
-	R1.2 <-> R2.2
+	C3.1 <-> R2.1 <-> R4.1
+	C3.2 <-> R1.2 <-> R2.2 <-> R4.2
 	VR1.1 <-> VR2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/firefly_preamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/firefly_preamp_incl_switches.txt
index 09152a4d..abd40973 100644
--- a/diylc-regression-data/input/v1/netlist/firefly_preamp_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/firefly_preamp_incl_switches.txt
@@ -1,12 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.2
+	C1.1 <-> C4.2 <-> Q1.1 <-> Q2.1 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3
+	C2.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> R5.2
 	C2.2 <-> R1.1 <-> R3.1 <-> R5.1
-	C3.1 <-> R4.1
-	C3.2 <-> R4.2
-	C4.2 <-> Q2.1 <-> VR2.2 <-> VR2.3
-	Q2.2 <-> Q2.3 <-> R5.2
-	R1.2 <-> R2.2
+	C3.1 <-> R2.1 <-> R4.1
+	C3.2 <-> R1.2 <-> R2.2 <-> R4.2
 	VR1.1 <-> VR2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_excl_switches.txt b/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_excl_switches.txt
index 9dae1d5c..ce2bc65c 100644
--- a/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_excl_switches.txt
@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.2
+	C1.1 <-> C4.2 <-> Q1.1 <-> Q2.1 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3
+	C2.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> R5.2
 	C2.2 <-> C5.1 <-> C6.1 <-> R1.1 <-> R3.1 <-> R5.1
-	C3.1 <-> R4.1
-	C3.2 <-> R4.2
+	C3.1 <-> C6.2 <-> R2.1 <-> R4.1 <-> R7.1
+	C3.2 <-> R1.2 <-> R2.2 <-> R4.2
 	C4.1 <-> R6.1
-	C4.2 <-> Q2.1 <-> VR2.2 <-> VR2.3
-	C5.2 <-> R6.2 <-> R7.2
-	C6.2 <-> R7.1
-	Q2.2 <-> Q2.3 <-> R5.2
-	R1.2 <-> R2.2
-	VR1.1 <-> VR2.1
+	C5.2 <-> R6.2 <-> R7.2 <-> VR1.1 <-> VR2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_incl_switches.txt b/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_incl_switches.txt
index 9dae1d5c..ce2bc65c 100644
--- a/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/firefly_preamp_mods_incl_switches.txt
@@ -1,15 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.2
+	C1.1 <-> C4.2 <-> Q1.1 <-> Q2.1 <-> VR1.2 <-> VR1.3 <-> VR2.2 <-> VR2.3
+	C2.1 <-> Q1.2 <-> Q1.3 <-> Q2.2 <-> Q2.3 <-> R3.2 <-> R5.2
 	C2.2 <-> C5.1 <-> C6.1 <-> R1.1 <-> R3.1 <-> R5.1
-	C3.1 <-> R4.1
-	C3.2 <-> R4.2
+	C3.1 <-> C6.2 <-> R2.1 <-> R4.1 <-> R7.1
+	C3.2 <-> R1.2 <-> R2.2 <-> R4.2
 	C4.1 <-> R6.1
-	C4.2 <-> Q2.1 <-> VR2.2 <-> VR2.3
-	C5.2 <-> R6.2 <-> R7.2
-	C6.2 <-> R7.1
-	Q2.2 <-> Q2.3 <-> R5.2
-	R1.2 <-> R2.2
-	VR1.1 <-> VR2.1
+	C5.2 <-> R6.2 <-> R7.2 <-> VR1.1 <-> VR2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/fuzzrite_excl_switches.txt b/diylc-regression-data/input/v1/netlist/fuzzrite_excl_switches.txt
index 283ba053..143f8267 100644
--- a/diylc-regression-data/input/v1/netlist/fuzzrite_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/fuzzrite_excl_switches.txt
@@ -1,10 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R5.1
-	C1.2 <-> Q1.3 <-> R3.1
-	C2.2 <-> C4.1 <-> R1.1 <-> R3.2
-	C3.1 <-> R2.1 <-> R4.2
-	C4.2 <-> Q2.3 <-> R4.1
-	Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R5.2
+	C1.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R5.1 <-> R5.2
+	C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R2.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2
 	R1.2 <-> R2.2
 
diff --git a/diylc-regression-data/input/v1/netlist/fuzzrite_incl_switches.txt b/diylc-regression-data/input/v1/netlist/fuzzrite_incl_switches.txt
index 283ba053..143f8267 100644
--- a/diylc-regression-data/input/v1/netlist/fuzzrite_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/fuzzrite_incl_switches.txt
@@ -1,10 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> R5.1
-	C1.2 <-> Q1.3 <-> R3.1
-	C2.2 <-> C4.1 <-> R1.1 <-> R3.2
-	C3.1 <-> R2.1 <-> R4.2
-	C4.2 <-> Q2.3 <-> R4.1
-	Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R5.2
+	C1.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R5.1 <-> R5.2
+	C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> Q1.3 <-> Q2.3 <-> R1.1 <-> R2.1 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2
 	R1.2 <-> R2.2
 
diff --git a/diylc-regression-data/input/v1/netlist/g5at_preamp_master_excl_switches.txt b/diylc-regression-data/input/v1/netlist/g5at_preamp_master_excl_switches.txt
index 20410949..cc44601b 100644
--- a/diylc-regression-data/input/v1/netlist/g5at_preamp_master_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/g5at_preamp_master_excl_switches.txt
@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.2 <-> Q1.3 <-> R2.1
-	C1.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
-	C2.1 <-> C7.1 <-> Q1.1 <-> Q2.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
-	C2.2 <-> C3.1 <-> C5.2 <-> R3.1
-	C4.1 <-> R3.2 <-> R4.1
-	C5.1 <-> R4.2
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R5.1
+	C1.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
+	C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
+	C2.1 <-> C7.1 <-> C7.2 <-> Q1.1 <-> Q2.1 <-> R1.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
+	C2.2 <-> C3.1 <-> C5.2 <-> C6.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R5.1
+	C4.1 <-> R1.2 <-> R3.2 <-> R4.1
 	VR1.3 <-> VR2.3
 
diff --git a/diylc-regression-data/input/v1/netlist/g5at_preamp_master_incl_switches.txt b/diylc-regression-data/input/v1/netlist/g5at_preamp_master_incl_switches.txt
index 20410949..cc44601b 100644
--- a/diylc-regression-data/input/v1/netlist/g5at_preamp_master_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/g5at_preamp_master_incl_switches.txt
@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.2 <-> Q1.3 <-> R2.1
-	C1.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
-	C2.1 <-> C7.1 <-> Q1.1 <-> Q2.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
-	C2.2 <-> C3.1 <-> C5.2 <-> R3.1
-	C4.1 <-> R3.2 <-> R4.1
-	C5.1 <-> R4.2
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R5.1
+	C1.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
+	C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
+	C2.1 <-> C7.1 <-> C7.2 <-> Q1.1 <-> Q2.1 <-> R1.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
+	C2.2 <-> C3.1 <-> C5.2 <-> C6.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R5.1
+	C4.1 <-> R1.2 <-> R3.2 <-> R4.1
 	VR1.3 <-> VR2.3
 
diff --git a/diylc-regression-data/input/v1/netlist/ga5t_preamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ga5t_preamp_excl_switches.txt
index 20410949..cc44601b 100644
--- a/diylc-regression-data/input/v1/netlist/ga5t_preamp_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/ga5t_preamp_excl_switches.txt
@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.2 <-> Q1.3 <-> R2.1
-	C1.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
-	C2.1 <-> C7.1 <-> Q1.1 <-> Q2.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
-	C2.2 <-> C3.1 <-> C5.2 <-> R3.1
-	C4.1 <-> R3.2 <-> R4.1
-	C5.1 <-> R4.2
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R5.1
+	C1.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
+	C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
+	C2.1 <-> C7.1 <-> C7.2 <-> Q1.1 <-> Q2.1 <-> R1.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
+	C2.2 <-> C3.1 <-> C5.2 <-> C6.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R5.1
+	C4.1 <-> R1.2 <-> R3.2 <-> R4.1
 	VR1.3 <-> VR2.3
 
diff --git a/diylc-regression-data/input/v1/netlist/ga5t_preamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ga5t_preamp_incl_switches.txt
index 20410949..cc44601b 100644
--- a/diylc-regression-data/input/v1/netlist/ga5t_preamp_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/ga5t_preamp_incl_switches.txt
@@ -1,11 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.2 <-> Q1.3 <-> R2.1
-	C1.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
-	C2.1 <-> C7.1 <-> Q1.1 <-> Q2.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
-	C2.2 <-> C3.1 <-> C5.2 <-> R3.1
-	C4.1 <-> R3.2 <-> R4.1
-	C5.1 <-> R4.2
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R5.1
+	C1.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
+	C1.2 <-> C3.2 <-> C4.2 <-> C6.2 <-> R2.2 <-> R5.2
+	C2.1 <-> C7.1 <-> C7.2 <-> Q1.1 <-> Q2.1 <-> R1.1 <-> VR1.1 <-> VR1.2 <-> VR2.1 <-> VR2.2
+	C2.2 <-> C3.1 <-> C5.2 <-> C6.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R5.1
+	C4.1 <-> R1.2 <-> R3.2 <-> R4.1
 	VR1.3 <-> VR2.3
 
diff --git a/diylc-regression-data/input/v1/netlist/goldtone_excl_switches.txt b/diylc-regression-data/input/v1/netlist/goldtone_excl_switches.txt
index dc89def8..dfe3757c 100644
--- a/diylc-regression-data/input/v1/netlist/goldtone_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/goldtone_excl_switches.txt
@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> C5.2 <-> D1.2 <-> IC1.2 <-> IC1.6 <-> R5.2
-	C1.2 <-> C2.1 <-> C4.2 <-> C7.1 <-> C8.1 <-> D1.1 <-> D2.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R3.2
-	C2.2 <-> C3.1 <-> R1.2
-	C3.2 <-> R2.2
-	C4.1 <-> R3.1 <-> R4.2 <-> R5.1
-	C5.1 <-> C6.1 <-> IC1.3 <-> IC1.7 <-> R2.1 <-> R4.1 <-> R6.1
-	C6.2 <-> R7.2
+	C1.1 <-> C2.2 <-> C3.1 <-> C4.1 <-> C5.1 <-> C5.2 <-> C6.1 <-> D1.2 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.2 <-> R2.1 <-> R3.1 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1
+	C1.2 <-> C2.1 <-> C4.2 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> D1.1 <-> D2.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R3.2 <-> R7.2
+	C3.2 <-> IC1.1 <-> IC1.5 <-> R2.2 <-> R6.2
 	C8.2 <-> R8.1
-	D2.2 <-> D3.1 <-> R7.1
-	D3.2 <-> D4.1
-	IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/v1/netlist/goldtone_incl_switches.txt b/diylc-regression-data/input/v1/netlist/goldtone_incl_switches.txt
index dc89def8..dfe3757c 100644
--- a/diylc-regression-data/input/v1/netlist/goldtone_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/goldtone_incl_switches.txt
@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> C5.2 <-> D1.2 <-> IC1.2 <-> IC1.6 <-> R5.2
-	C1.2 <-> C2.1 <-> C4.2 <-> C7.1 <-> C8.1 <-> D1.1 <-> D2.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R3.2
-	C2.2 <-> C3.1 <-> R1.2
-	C3.2 <-> R2.2
-	C4.1 <-> R3.1 <-> R4.2 <-> R5.1
-	C5.1 <-> C6.1 <-> IC1.3 <-> IC1.7 <-> R2.1 <-> R4.1 <-> R6.1
-	C6.2 <-> R7.2
+	C1.1 <-> C2.2 <-> C3.1 <-> C4.1 <-> C5.1 <-> C5.2 <-> C6.1 <-> D1.2 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.2 <-> R2.1 <-> R3.1 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R7.1
+	C1.2 <-> C2.1 <-> C4.2 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> D1.1 <-> D2.1 <-> D4.2 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R3.2 <-> R7.2
+	C3.2 <-> IC1.1 <-> IC1.5 <-> R2.2 <-> R6.2
 	C8.2 <-> R8.1
-	D2.2 <-> D3.1 <-> R7.1
-	D3.2 <-> D4.1
-	IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/v1/netlist/guitar_buffer_excl_switches.txt b/diylc-regression-data/input/v1/netlist/guitar_buffer_excl_switches.txt
index 809448e7..d4ca9ae7 100644
--- a/diylc-regression-data/input/v1/netlist/guitar_buffer_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/guitar_buffer_excl_switches.txt
@@ -4,10 +4,9 @@ Switch setup: [Default]
 	C1.2 <-> C5.2 <-> D1.1 <-> R1.2 <-> R2.1 <-> R4.1 <-> R9.1
 	C2.2 <-> R2.2 <-> R3.1
 	C3.1 <-> R6.2
-	C3.2 <-> R4.2
+	C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R4.2 <-> R8.1
 	C4.1 <-> R7.2
 	C4.2 <-> R5.2
 	C5.1 <-> D1.2 <-> D2.2 <-> Q2.1 <-> R3.2 <-> R6.1 <-> R7.1 <-> R8.2
 	D2.1 <-> Q1.2 <-> Q1.3 <-> R5.1 <-> R9.2
-	Q1.1 <-> Q2.2 <-> Q2.3 <-> R8.1
 
diff --git a/diylc-regression-data/input/v1/netlist/guitar_buffer_incl_switches.txt b/diylc-regression-data/input/v1/netlist/guitar_buffer_incl_switches.txt
index 809448e7..d4ca9ae7 100644
--- a/diylc-regression-data/input/v1/netlist/guitar_buffer_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/guitar_buffer_incl_switches.txt
@@ -4,10 +4,9 @@ Switch setup: [Default]
 	C1.2 <-> C5.2 <-> D1.1 <-> R1.2 <-> R2.1 <-> R4.1 <-> R9.1
 	C2.2 <-> R2.2 <-> R3.1
 	C3.1 <-> R6.2
-	C3.2 <-> R4.2
+	C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R4.2 <-> R8.1
 	C4.1 <-> R7.2
 	C4.2 <-> R5.2
 	C5.1 <-> D1.2 <-> D2.2 <-> Q2.1 <-> R3.2 <-> R6.1 <-> R7.1 <-> R8.2
 	D2.1 <-> Q1.2 <-> Q1.3 <-> R5.1 <-> R9.2
-	Q1.1 <-> Q2.2 <-> Q2.3 <-> R8.1
 
diff --git a/diylc-regression-data/input/v1/netlist/gus_overdrive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/gus_overdrive_excl_switches.txt
index fe232c8b..189e22fd 100644
--- a/diylc-regression-data/input/v1/netlist/gus_overdrive_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/gus_overdrive_excl_switches.txt
@@ -2,13 +2,11 @@ Switch setup: [Default]
 
 	.001.1 <-> 10k.2
 	.001.2 <-> .22uf.2 <-> 10K.2 <-> 1K.2
-	.1uf.2 <-> 4.7K.1
 	.1uf.2 <-> 4.7K.1 <-> Q1.3
 	.22uf.1 <-> 1K.2
 	100.1 <-> 1K.1 <-> 1K.2
 	10k.1 <-> 1uf.2
 	10K.1 <-> 22uf.1 <-> 4.7K.2 <-> 47K.1
 	1K.1 <-> 1K.1 <-> 22uf.2 <-> Q1.1 <-> Q1.2
-	1K.1 <-> 22uf.2
 	1uf.1 <-> 4.7k.1
 
diff --git a/diylc-regression-data/input/v1/netlist/gus_overdrive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/gus_overdrive_incl_switches.txt
index fe232c8b..189e22fd 100644
--- a/diylc-regression-data/input/v1/netlist/gus_overdrive_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/gus_overdrive_incl_switches.txt
@@ -2,13 +2,11 @@ Switch setup: [Default]
 
 	.001.1 <-> 10k.2
 	.001.2 <-> .22uf.2 <-> 10K.2 <-> 1K.2
-	.1uf.2 <-> 4.7K.1
 	.1uf.2 <-> 4.7K.1 <-> Q1.3
 	.22uf.1 <-> 1K.2
 	100.1 <-> 1K.1 <-> 1K.2
 	10k.1 <-> 1uf.2
 	10K.1 <-> 22uf.1 <-> 4.7K.2 <-> 47K.1
 	1K.1 <-> 1K.1 <-> 22uf.2 <-> Q1.1 <-> Q1.2
-	1K.1 <-> 22uf.2
 	1uf.1 <-> 4.7k.1
 
diff --git a/diylc-regression-data/input/v1/netlist/hao_rust_driver_excl_switches.txt b/diylc-regression-data/input/v1/netlist/hao_rust_driver_excl_switches.txt
index 8c0e3179..0177014f 100644
--- a/diylc-regression-data/input/v1/netlist/hao_rust_driver_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/hao_rust_driver_excl_switches.txt
@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.2 <-> R3.2
-	C2.1 <-> C3.1 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R6.1
-	C2.2 <-> R5.1
-	C3.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> R6.2
+	C1.1 <-> C1.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.2 <-> R8.2
+	C2.1 <-> C3.1 <-> D1.1 <-> D2.2 <-> IC1.2 <-> IC1.6 <-> R4.1 <-> R5.2 <-> R6.1 <-> R7.2 <-> R8.1
+	C2.2 <-> C3.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> IC1.5 <-> R1.1 <-> R5.1 <-> R6.2
 	C4.1 <-> R7.1
-	IC1.3 <-> IC1.8 <-> R1.2 <-> R2.1
-	IC1.4 <-> R2.2 <-> R8.2
-	IC1.5 <-> R1.1
-	IC1.6 <-> R4.1 <-> R5.2
-	IC1.7 <-> R3.1 <-> R4.2
-	R7.2 <-> R8.1
 
diff --git a/diylc-regression-data/input/v1/netlist/hao_rust_driver_incl_switches.txt b/diylc-regression-data/input/v1/netlist/hao_rust_driver_incl_switches.txt
index 8c0e3179..0177014f 100644
--- a/diylc-regression-data/input/v1/netlist/hao_rust_driver_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/hao_rust_driver_incl_switches.txt
@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.2 <-> R3.2
-	C2.1 <-> C3.1 <-> D1.1 <-> D2.2 <-> IC1.2 <-> R6.1
-	C2.2 <-> R5.1
-	C3.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> R6.2
+	C1.1 <-> C1.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.2 <-> R8.2
+	C2.1 <-> C3.1 <-> D1.1 <-> D2.2 <-> IC1.2 <-> IC1.6 <-> R4.1 <-> R5.2 <-> R6.1 <-> R7.2 <-> R8.1
+	C2.2 <-> C3.2 <-> C4.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> IC1.5 <-> R1.1 <-> R5.1 <-> R6.2
 	C4.1 <-> R7.1
-	IC1.3 <-> IC1.8 <-> R1.2 <-> R2.1
-	IC1.4 <-> R2.2 <-> R8.2
-	IC1.5 <-> R1.1
-	IC1.6 <-> R4.1 <-> R5.2
-	IC1.7 <-> R3.1 <-> R4.2
-	R7.2 <-> R8.1
 
diff --git a/diylc-regression-data/input/v1/netlist/hermida_zen_drive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/hermida_zen_drive_excl_switches.txt
index 1f6586e8..bb43d2ca 100644
--- a/diylc-regression-data/input/v1/netlist/hermida_zen_drive_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/hermida_zen_drive_excl_switches.txt
@@ -12,7 +12,6 @@ Switch setup: [Default]
 	C5.2 <-> Voice (R6).1
 	C7.1 <-> R10.1
 	D1.2 <-> Q1.1 <-> Q1.2
-	D2.2 <-> Q2.1
 	D2.2 <-> Q2.1 <-> Q2.2 <-> Q2.3
 	R10.2 <-> Volume (R11).1
 	R5.2 <-> Voice (R6).2
diff --git a/diylc-regression-data/input/v1/netlist/hermida_zen_drive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/hermida_zen_drive_incl_switches.txt
index 1f6586e8..bb43d2ca 100644
--- a/diylc-regression-data/input/v1/netlist/hermida_zen_drive_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/hermida_zen_drive_incl_switches.txt
@@ -12,7 +12,6 @@ Switch setup: [Default]
 	C5.2 <-> Voice (R6).1
 	C7.1 <-> R10.1
 	D1.2 <-> Q1.1 <-> Q1.2
-	D2.2 <-> Q2.1
 	D2.2 <-> Q2.1 <-> Q2.2 <-> Q2.3
 	R10.2 <-> Volume (R11).1
 	R5.2 <-> Voice (R6).2
diff --git a/diylc-regression-data/input/v1/netlist/ic_buffer_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ic_buffer_excl_switches.txt
index 5daac513..4acd6c76 100644
--- a/diylc-regression-data/input/v1/netlist/ic_buffer_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/ic_buffer_excl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.2 <-> IC1.3 <-> R1.1 <-> R2.2
-	C2.1 <-> IC1.2 <-> IC1.7
+	C1.1 <-> C2.2 <-> IC1.1 <-> IC1.5
+	C1.2 <-> C2.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2
 	IC1.4 <-> IC1.8 <-> R1.2
-	IC1.6 <-> R2.1 <-> R3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/ic_buffer_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ic_buffer_incl_switches.txt
index 5daac513..4acd6c76 100644
--- a/diylc-regression-data/input/v1/netlist/ic_buffer_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/ic_buffer_incl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.2 <-> IC1.3 <-> R1.1 <-> R2.2
-	C2.1 <-> IC1.2 <-> IC1.7
+	C1.1 <-> C2.2 <-> IC1.1 <-> IC1.5
+	C1.2 <-> C2.1 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2
 	IC1.4 <-> IC1.8 <-> R1.2
-	IC1.6 <-> R2.1 <-> R3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jawari_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jawari_excl_switches.txt
index dc363dc8..c5108543 100644
--- a/diylc-regression-data/input/v1/netlist/jawari_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jawari_excl_switches.txt
@@ -1,9 +1,6 @@
 Switch setup: [Default]
 
 	C1.1 <-> C1.2 <-> C2.2 <-> D1.1 <-> D2.1 <-> Q1.1 <-> R1.2 <-> R2.2 <-> R3.2 <-> R4.2
-	C2.1 <-> R2.1
-	C3.1 <-> D1.2 <-> D2.2 <-> D3.1
-	C3.2 <-> R4.1
-	D3.2 <-> R3.1
-	Q1.2 <-> Q1.3 <-> R1.1
+	C2.1 <-> C3.2 <-> D3.2 <-> R2.1 <-> R3.1 <-> R4.1
+	C3.1 <-> D1.2 <-> D2.2 <-> D3.1 <-> Q1.2 <-> Q1.3 <-> R1.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jawari_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jawari_incl_switches.txt
index dc363dc8..c5108543 100644
--- a/diylc-regression-data/input/v1/netlist/jawari_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jawari_incl_switches.txt
@@ -1,9 +1,6 @@
 Switch setup: [Default]
 
 	C1.1 <-> C1.2 <-> C2.2 <-> D1.1 <-> D2.1 <-> Q1.1 <-> R1.2 <-> R2.2 <-> R3.2 <-> R4.2
-	C2.1 <-> R2.1
-	C3.1 <-> D1.2 <-> D2.2 <-> D3.1
-	C3.2 <-> R4.1
-	D3.2 <-> R3.1
-	Q1.2 <-> Q1.3 <-> R1.1
+	C2.1 <-> C3.2 <-> D3.2 <-> R2.1 <-> R3.1 <-> R4.1
+	C3.1 <-> D1.2 <-> D2.2 <-> D3.1 <-> Q1.2 <-> Q1.3 <-> R1.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jawari_sitar_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jawari_sitar_excl_switches.txt
index ef3647c7..a6343b9e 100644
--- a/diylc-regression-data/input/v1/netlist/jawari_sitar_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jawari_sitar_excl_switches.txt
@@ -1,13 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> D1.2 <-> D2.2 <-> D3.1
-	C1.2 <-> R3.1
+	C1.1 <-> C3.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> IC.1 <-> IC.3 <-> IC.4 <-> IC.6 <-> Q1.1
+	C1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 <-> VR1.3
 	C2.1 <-> VR1.2
-	C2.2 <-> C3.2 <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1
-	C3.1 <-> IC.1
-	D1.1 <-> IC.4
-	D2.1 <-> IC.6
-	D3.2 <-> R2.1
-	IC.3 <-> Q1.1
-	Q1.2 <-> Q1.3 <-> VR1.3
+	C2.2 <-> C3.2 <-> IC.2 <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1
+	D3.2 <-> R1.1 <-> R2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jawari_sitar_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jawari_sitar_incl_switches.txt
index ef3647c7..a6343b9e 100644
--- a/diylc-regression-data/input/v1/netlist/jawari_sitar_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jawari_sitar_incl_switches.txt
@@ -1,13 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> D1.2 <-> D2.2 <-> D3.1
-	C1.2 <-> R3.1
+	C1.1 <-> C3.1 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> IC.1 <-> IC.3 <-> IC.4 <-> IC.6 <-> Q1.1
+	C1.2 <-> Q1.2 <-> Q1.3 <-> R3.1 <-> VR1.3
 	C2.1 <-> VR1.2
-	C2.2 <-> C3.2 <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1
-	C3.1 <-> IC.1
-	D1.1 <-> IC.4
-	D2.1 <-> IC.6
-	D3.2 <-> R2.1
-	IC.3 <-> Q1.1
-	Q1.2 <-> Q1.3 <-> VR1.3
+	C2.2 <-> C3.2 <-> IC.2 <-> IC.5 <-> R1.2 <-> R2.2 <-> R3.2 <-> VR1.1
+	D3.2 <-> R1.1 <-> R2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jdha_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jdha_vero_excl_switches.txt
index fca509fb..f8bc959b 100644
--- a/diylc-regression-data/input/v1/netlist/jdha_vero_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jdha_vero_excl_switches.txt
@@ -1,14 +1,12 @@
 Switch setup: [Default]
 
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1
+	C1.1 <-> C3.1 <-> Q3.2 <-> Q3.3 <-> R12.1 <-> R9.2
+	C1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R10.1 <-> R2.1
 	C2.1 <-> R8.2
 	C2.2 <-> R10.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.2 <-> R7.2
-	C3.1 <-> Q3.2 <-> Q3.3 <-> R12.1 <-> R9.2
-	C3.2 <-> Q2.1 <-> R6.2
-	C4.1 <-> C5.2 <-> R11.1
+	C3.2 <-> C4.1 <-> C5.2 <-> Q2.1 <-> R11.1 <-> R6.2
 	C4.2 <-> R5.2
-	Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R9.1
+	C5.1 <-> Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1
 	Q2.2 <-> Q2.3 <-> R4.1 <-> R5.1
 	R3.1 <-> R4.2
-	R7.1 <-> R8.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jdha_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jdha_vero_incl_switches.txt
index fca509fb..f8bc959b 100644
--- a/diylc-regression-data/input/v1/netlist/jdha_vero_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jdha_vero_incl_switches.txt
@@ -1,14 +1,12 @@
 Switch setup: [Default]
 
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R2.1
+	C1.1 <-> C3.1 <-> Q3.2 <-> Q3.3 <-> R12.1 <-> R9.2
+	C1.2 <-> Q1.2 <-> Q1.3 <-> R1.2 <-> R10.1 <-> R2.1
 	C2.1 <-> R8.2
 	C2.2 <-> R10.2 <-> R11.2 <-> R12.2 <-> R2.2 <-> R3.2 <-> R7.2
-	C3.1 <-> Q3.2 <-> Q3.3 <-> R12.1 <-> R9.2
-	C3.2 <-> Q2.1 <-> R6.2
-	C4.1 <-> C5.2 <-> R11.1
+	C3.2 <-> C4.1 <-> C5.2 <-> Q2.1 <-> R11.1 <-> R6.2
 	C4.2 <-> R5.2
-	Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R9.1
+	C5.1 <-> Q1.1 <-> Q3.1 <-> R1.1 <-> R6.1 <-> R7.1 <-> R8.1 <-> R9.1
 	Q2.2 <-> Q2.3 <-> R4.1 <-> R5.1
 	R3.1 <-> R4.2
-	R7.1 <-> R8.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_excl_switches.txt
index 07fdcd54..328cd2b7 100644
--- a/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_excl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.3 <-> R1.2 <-> R3.1
-	C1.2 <-> IC1.4 <-> R2.2 <-> R3.2
-	IC1.2 <-> R2.1
-	IC1.6 <-> R1.1
+	C1.1 <-> IC1.3 <-> IC1.7 <-> R1.2 <-> R3.1
+	C1.2 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2
+	IC1.1 <-> IC1.2 <-> IC1.5 <-> IC1.6 <-> R1.1 <-> R2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_incl_switches.txt
index 07fdcd54..328cd2b7 100644
--- a/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jfet_matcher_vero_incl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.3 <-> R1.2 <-> R3.1
-	C1.2 <-> IC1.4 <-> R2.2 <-> R3.2
-	IC1.2 <-> R2.1
-	IC1.6 <-> R1.1
+	C1.1 <-> IC1.3 <-> IC1.7 <-> R1.2 <-> R3.1
+	C1.2 <-> IC1.4 <-> IC1.8 <-> R2.2 <-> R3.2
+	IC1.1 <-> IC1.2 <-> IC1.5 <-> IC1.6 <-> R1.1 <-> R2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jfet_vulcan_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_vulcan_excl_switches.txt
index cb3af933..cae53e94 100644
--- a/diylc-regression-data/input/v1/netlist/jfet_vulcan_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jfet_vulcan_excl_switches.txt
@@ -1,22 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> D1.2 <-> R2.1
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C8.1 <-> C9.1 <-> C9.2 <-> D1.2 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R11.1 <-> R13.1 <-> R14.1 <-> R16.1 <-> R2.1 <-> R3.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1 <-> R8.1 <-> R9.1
 	C2.2 <-> C6.2 <-> C8.2 <-> R1.2 <-> R12.2 <-> R14.2 <-> R17.2 <-> R2.2 <-> R3.2 <-> R7.2 <-> R8.2
-	C3.1 <-> Q1.1 <-> R5.1
-	C4.2 <-> C5.2 <-> R6.1
-	C5.1 <-> D2.2 <-> R6.2 <-> R7.1
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R8.1
-	C7.1 <-> Q2.1 <-> R9.1
-	C7.2 <-> R11.1
-	C8.1 <-> Q3.2 <-> Q3.3 <-> R14.1
-	C9.1 <-> Q3.1 <-> R13.1
-	C9.2 <-> R16.1
-	D1.1 <-> R4.1
-	D2.1 <-> R10.1
-	D3.1 <-> R15.1
-	D3.2 <-> R11.2 <-> R12.1
+	C3.2 <-> D3.2 <-> R11.2 <-> R12.1 <-> R16.2 <-> R17.1
+	D1.1 <-> D2.1 <-> D3.1 <-> R10.1 <-> R15.1 <-> R4.1
 	R10.2 <-> R13.2 <-> R15.2 <-> R4.2 <-> R5.2 <-> R9.2
-	R16.2 <-> R17.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jfet_vulcan_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jfet_vulcan_incl_switches.txt
index cb3af933..cae53e94 100644
--- a/diylc-regression-data/input/v1/netlist/jfet_vulcan_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jfet_vulcan_incl_switches.txt
@@ -1,22 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> D1.2 <-> R2.1
-	C2.1 <-> Q1.2 <-> Q1.3 <-> R3.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> C7.2 <-> C8.1 <-> C9.1 <-> C9.2 <-> D1.2 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> R1.1 <-> R11.1 <-> R13.1 <-> R14.1 <-> R16.1 <-> R2.1 <-> R3.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1 <-> R8.1 <-> R9.1
 	C2.2 <-> C6.2 <-> C8.2 <-> R1.2 <-> R12.2 <-> R14.2 <-> R17.2 <-> R2.2 <-> R3.2 <-> R7.2 <-> R8.2
-	C3.1 <-> Q1.1 <-> R5.1
-	C4.2 <-> C5.2 <-> R6.1
-	C5.1 <-> D2.2 <-> R6.2 <-> R7.1
-	C6.1 <-> Q2.2 <-> Q2.3 <-> R8.1
-	C7.1 <-> Q2.1 <-> R9.1
-	C7.2 <-> R11.1
-	C8.1 <-> Q3.2 <-> Q3.3 <-> R14.1
-	C9.1 <-> Q3.1 <-> R13.1
-	C9.2 <-> R16.1
-	D1.1 <-> R4.1
-	D2.1 <-> R10.1
-	D3.1 <-> R15.1
-	D3.2 <-> R11.2 <-> R12.1
+	C3.2 <-> D3.2 <-> R11.2 <-> R12.1 <-> R16.2 <-> R17.1
+	D1.1 <-> D2.1 <-> D3.1 <-> R10.1 <-> R15.1 <-> R4.1
 	R10.2 <-> R13.2 <-> R15.2 <-> R4.2 <-> R5.2 <-> R9.2
-	R16.2 <-> R17.1
 
diff --git a/diylc-regression-data/input/v1/netlist/joe's_easydrive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/joe's_easydrive_excl_switches.txt
index 366aedd2..e54855cf 100644
--- a/diylc-regression-data/input/v1/netlist/joe's_easydrive_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/joe's_easydrive_excl_switches.txt
@@ -1,12 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> C3.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R3.2
-	C1.2 <-> D1.2
 	C1.2 <-> D1.2 <-> D2.1
-	C2.1 <-> D1.1
 	C2.1 <-> D1.1 <-> D2.2 <-> R2.1 <-> R4.2
 	C4.1 <-> R3.1 <-> R4.1
 	C4.2 <-> C5.2 <-> C6.2 <-> R1.2
 	C6.1 <-> Q1.1 <-> R1.1
-	Q1.1 <-> R1.1
 
diff --git a/diylc-regression-data/input/v1/netlist/joe's_easydrive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/joe's_easydrive_incl_switches.txt
index 366aedd2..e54855cf 100644
--- a/diylc-regression-data/input/v1/netlist/joe's_easydrive_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/joe's_easydrive_incl_switches.txt
@@ -1,12 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> C3.1 <-> C5.1 <-> Q1.2 <-> Q1.3 <-> R3.2
-	C1.2 <-> D1.2
 	C1.2 <-> D1.2 <-> D2.1
-	C2.1 <-> D1.1
 	C2.1 <-> D1.1 <-> D2.2 <-> R2.1 <-> R4.2
 	C4.1 <-> R3.1 <-> R4.1
 	C4.2 <-> C5.2 <-> C6.2 <-> R1.2
 	C6.1 <-> Q1.1 <-> R1.1
-	Q1.1 <-> R1.1
 
diff --git a/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_excl_switches.txt
index 4ccd3efd..13b7d50b 100644
--- a/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_excl_switches.txt
@@ -4,8 +4,6 @@ Switch setup: [Default]
 	C1.2 <-> C4.2 <-> C5.1 <-> R2.1 <-> R4.2
 	C2.1 <-> R3.1 <-> R4.1
 	C2.2 <-> C6.2 <-> R1.2
-	C4.1 <-> D1.1
 	C4.1 <-> D1.1 <-> D2.2
 	C6.1 <-> Q1.1 <-> R1.1
-	Q1.1 <-> R1.1
 
diff --git a/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_incl_switches.txt
index 4ccd3efd..13b7d50b 100644
--- a/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/joes_simple_overdrive_incl_switches.txt
@@ -4,8 +4,6 @@ Switch setup: [Default]
 	C1.2 <-> C4.2 <-> C5.1 <-> R2.1 <-> R4.2
 	C2.1 <-> R3.1 <-> R4.1
 	C2.2 <-> C6.2 <-> R1.2
-	C4.1 <-> D1.1
 	C4.1 <-> D1.1 <-> D2.2
 	C6.1 <-> Q1.1 <-> R1.1
-	Q1.1 <-> R1.1
 
diff --git a/diylc-regression-data/input/v1/netlist/joes_simple_sim_excl_switches.txt b/diylc-regression-data/input/v1/netlist/joes_simple_sim_excl_switches.txt
index f0dc9a18..7a0a72b0 100644
--- a/diylc-regression-data/input/v1/netlist/joes_simple_sim_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/joes_simple_sim_excl_switches.txt
@@ -1,11 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R2.1 <-> R4.2
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.3 <-> R4.1 <-> R5.2
+	C1.2 <-> C3.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.1
+	C2.1 <-> C4.2 <-> P1.1 <-> Q2.3 <-> R4.1 <-> R5.2
 	C2.2 <-> C3.2 <-> P1.3 <-> R1.2 <-> R2.2 <-> R6.2 <-> R7.2
-	C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R7.1
-	C4.2 <-> P1.1
-	R3.1 <-> R5.1
+	C4.1 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R5.1 <-> R7.1
 
diff --git a/diylc-regression-data/input/v1/netlist/joes_simple_sim_incl_switches.txt b/diylc-regression-data/input/v1/netlist/joes_simple_sim_incl_switches.txt
index f0dc9a18..7a0a72b0 100644
--- a/diylc-regression-data/input/v1/netlist/joes_simple_sim_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/joes_simple_sim_incl_switches.txt
@@ -1,11 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R2.1 <-> R4.2
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.3 <-> R4.1 <-> R5.2
+	C1.2 <-> C3.1 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R6.1
+	C2.1 <-> C4.2 <-> P1.1 <-> Q2.3 <-> R4.1 <-> R5.2
 	C2.2 <-> C3.2 <-> P1.3 <-> R1.2 <-> R2.2 <-> R6.2 <-> R7.2
-	C3.1 <-> Q1.1 <-> Q1.2 <-> R6.1
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R7.1
-	C4.2 <-> P1.1
-	R3.1 <-> R5.1
+	C4.1 <-> Q2.1 <-> Q2.2 <-> R3.1 <-> R5.1 <-> R7.1
 
diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_excl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_excl_switches.txt
index f422af61..2f6ac7fa 100644
--- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_excl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R1.1 <-> R2.1
+	C1.1 <-> C2.2 <-> C4.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R1.2 <-> R2.1
+	C1.2 <-> C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
 	C2.1 <-> R2.2 <-> R4.1
-	C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R1.2
 	C3.1 <-> Q2.2 <-> Q2.3 <-> R3.1
-	C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
-	C4.1 <-> D1.1 <-> D2.2
 	C5.1 <-> R5.2
 
diff --git a/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_incl_switches.txt b/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_incl_switches.txt
index f422af61..2f6ac7fa 100644
--- a/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/jordan_bosstone_modified_incl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R1.1 <-> R2.1
+	C1.1 <-> C2.2 <-> C4.1 <-> C5.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R1.2 <-> R2.1
+	C1.2 <-> C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
 	C2.1 <-> R2.2 <-> R4.1
-	C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q1.1 <-> Q1.2 <-> R1.2
 	C3.1 <-> Q2.2 <-> Q2.3 <-> R3.1
-	C3.2 <-> C4.2 <-> Q2.1 <-> R3.2 <-> R4.2 <-> R5.1
-	C4.1 <-> D1.1 <-> D2.2
 	C5.1 <-> R5.2
 
diff --git a/diylc-regression-data/input/v1/netlist/la_light_excl_switches.txt b/diylc-regression-data/input/v1/netlist/la_light_excl_switches.txt
index ba3704cb..d134d776 100644
--- a/diylc-regression-data/input/v1/netlist/la_light_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/la_light_excl_switches.txt
@@ -1,15 +1,9 @@
 Switch setup: [Default]
 
-	C1.2 <-> R4.1 <-> R5.1
-	C2.2 <-> R1.1
-	C3.1 <-> R7.1
-	C3.2 <-> C4.2 <-> D1.2 <-> R10.1 <-> R11.1 <-> R3.2 <-> R4.2
-	C4.1 <-> IC1.4 <-> R11.2
-	D1.1 <-> R9.2
-	IC1.1 <-> R1.2 <-> R2.1
-	IC1.2 <-> R2.2 <-> R3.1
-	IC1.5 <-> R10.2
-	IC1.6 <-> R8.1 <-> R9.1
-	IC1.7 <-> R7.2 <-> R8.2
-	R5.2 <-> R6.2
+	C1.1 <-> IC1.3 <-> IC1.7 <-> R7.2 <-> R8.2
+	C1.2 <-> R4.1 <-> R5.1 <-> R6.1
+	C2.1 <-> C2.2 <-> C4.1 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R11.2
+	C3.1 <-> D1.1 <-> R5.2 <-> R6.2 <-> R7.1 <-> R9.2
+	C3.2 <-> C4.2 <-> D1.2 <-> IC1.2 <-> IC1.6 <-> R10.1 <-> R11.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.2 <-> R8.1 <-> R9.1
+	IC1.1 <-> IC1.5 <-> R1.2 <-> R10.2 <-> R2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/la_light_incl_switches.txt b/diylc-regression-data/input/v1/netlist/la_light_incl_switches.txt
index ba3704cb..d134d776 100644
--- a/diylc-regression-data/input/v1/netlist/la_light_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/la_light_incl_switches.txt
@@ -1,15 +1,9 @@
 Switch setup: [Default]
 
-	C1.2 <-> R4.1 <-> R5.1
-	C2.2 <-> R1.1
-	C3.1 <-> R7.1
-	C3.2 <-> C4.2 <-> D1.2 <-> R10.1 <-> R11.1 <-> R3.2 <-> R4.2
-	C4.1 <-> IC1.4 <-> R11.2
-	D1.1 <-> R9.2
-	IC1.1 <-> R1.2 <-> R2.1
-	IC1.2 <-> R2.2 <-> R3.1
-	IC1.5 <-> R10.2
-	IC1.6 <-> R8.1 <-> R9.1
-	IC1.7 <-> R7.2 <-> R8.2
-	R5.2 <-> R6.2
+	C1.1 <-> IC1.3 <-> IC1.7 <-> R7.2 <-> R8.2
+	C1.2 <-> R4.1 <-> R5.1 <-> R6.1
+	C2.1 <-> C2.2 <-> C4.1 <-> IC1.4 <-> IC1.8 <-> R1.1 <-> R11.2
+	C3.1 <-> D1.1 <-> R5.2 <-> R6.2 <-> R7.1 <-> R9.2
+	C3.2 <-> C4.2 <-> D1.2 <-> IC1.2 <-> IC1.6 <-> R10.1 <-> R11.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.2 <-> R8.1 <-> R9.1
+	IC1.1 <-> IC1.5 <-> R1.2 <-> R10.2 <-> R2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/lpb_booster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/lpb_booster_excl_switches.txt
index 4abfd985..c035b989 100644
--- a/diylc-regression-data/input/v1/netlist/lpb_booster_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/lpb_booster_excl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R3.1 <-> R4.1
-	C1.2 <-> R5.1
+	C1.2 <-> C2.2 <-> R5.1
 	C2.1 <-> R2.1
 	Q1.1 <-> Q1.2 <-> R1.1
 	R1.2 <-> R4.2 <-> R5.2
diff --git a/diylc-regression-data/input/v1/netlist/lpb_booster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/lpb_booster_incl_switches.txt
index 4abfd985..c035b989 100644
--- a/diylc-regression-data/input/v1/netlist/lpb_booster_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/lpb_booster_incl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R3.1 <-> R4.1
-	C1.2 <-> R5.1
+	C1.2 <-> C2.2 <-> R5.1
 	C2.1 <-> R2.1
 	Q1.1 <-> Q1.2 <-> R1.1
 	R1.2 <-> R4.2 <-> R5.2
diff --git a/diylc-regression-data/input/v1/netlist/micro_booster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/micro_booster_excl_switches.txt
index 7fa0dec9..68f3862c 100644
--- a/diylc-regression-data/input/v1/netlist/micro_booster_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/micro_booster_excl_switches.txt
@@ -1,8 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> R2.1
+	C1.2 <-> C3.1
 	C2.1 <-> Q1.1 <-> R1.2
-	C2.2 <-> R4.1
+	C2.2 <-> R1.1 <-> R4.1
 	C3.2 <-> R2.2 <-> R3.2 <-> R4.2
 	Q1.2 <-> Q1.3 <-> R3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/micro_booster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/micro_booster_incl_switches.txt
index 7fa0dec9..68f3862c 100644
--- a/diylc-regression-data/input/v1/netlist/micro_booster_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/micro_booster_incl_switches.txt
@@ -1,8 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> R2.1
+	C1.2 <-> C3.1
 	C2.1 <-> Q1.1 <-> R1.2
-	C2.2 <-> R4.1
+	C2.2 <-> R1.1 <-> R4.1
 	C3.2 <-> R2.2 <-> R3.2 <-> R4.2
 	Q1.2 <-> Q1.3 <-> R3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/millenium2_bypass_excl_switches.txt b/diylc-regression-data/input/v1/netlist/millenium2_bypass_excl_switches.txt
index 4c83f075..9d3d4844 100644
--- a/diylc-regression-data/input/v1/netlist/millenium2_bypass_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/millenium2_bypass_excl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
 	D1.1 <-> Q1.3 <-> R2.1
-	D1.2 <-> R1.2
-	D2.1 <-> R1.1
+	D1.2 <-> D2.1 <-> R1.1 <-> R1.2
 	Q1.1 <-> Q1.2 <-> Q2.3
-	Q2.1 <-> Q2.2
+	Q2.1 <-> Q2.2 <-> R2.2
 
diff --git a/diylc-regression-data/input/v1/netlist/millenium2_bypass_incl_switches.txt b/diylc-regression-data/input/v1/netlist/millenium2_bypass_incl_switches.txt
index 4c83f075..9d3d4844 100644
--- a/diylc-regression-data/input/v1/netlist/millenium2_bypass_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/millenium2_bypass_incl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
 	D1.1 <-> Q1.3 <-> R2.1
-	D1.2 <-> R1.2
-	D2.1 <-> R1.1
+	D1.2 <-> D2.1 <-> R1.1 <-> R1.2
 	Q1.1 <-> Q1.2 <-> Q2.3
-	Q2.1 <-> Q2.2
+	Q2.1 <-> Q2.2 <-> R2.2
 
diff --git a/diylc-regression-data/input/v1/netlist/morula_excl_switches.txt b/diylc-regression-data/input/v1/netlist/morula_excl_switches.txt
index e21e2bf9..beef422f 100644
--- a/diylc-regression-data/input/v1/netlist/morula_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/morula_excl_switches.txt
@@ -1,14 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C4.1 <-> IC1.5 <-> R3.2
-	C2.1 <-> R2.1 <-> R3.1
-	C2.2 <-> C6.2 <-> D1.2 <-> IC1.3 <-> IC1.7 <-> IC1.8
-	C3.1 <-> C5.2 <-> IC1.4 <-> R2.2
+	C1.1 <-> C2.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> D1.2 <-> IC1.11 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R5.2 <-> R6.2 <-> R7.2
+	C1.2 <-> C4.1 <-> IC1.13 <-> IC1.5 <-> R3.2 <-> R5.1
+	C2.1 <-> R2.1 <-> R3.1 <-> R7.1
+	C3.1 <-> C5.2 <-> IC1.12 <-> IC1.4 <-> R2.2 <-> R4.1
 	C3.2 <-> C4.2 <-> D1.1 <-> R4.2
-	C6.1 <-> IC1.16 <-> R5.2 <-> R6.2
-	C7.1 <-> IC1.11 <-> R7.2
-	C7.2 <-> IC1.10 <-> R6.1
-	IC1.13 <-> R5.1
-	IC1.14 <-> IC1.15
+	C5.1 <-> C7.2 <-> IC1.10 <-> IC1.2 <-> R6.1
+	IC1.1 <-> IC1.9
 
diff --git a/diylc-regression-data/input/v1/netlist/morula_incl_switches.txt b/diylc-regression-data/input/v1/netlist/morula_incl_switches.txt
index e21e2bf9..beef422f 100644
--- a/diylc-regression-data/input/v1/netlist/morula_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/morula_incl_switches.txt
@@ -1,14 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C4.1 <-> IC1.5 <-> R3.2
-	C2.1 <-> R2.1 <-> R3.1
-	C2.2 <-> C6.2 <-> D1.2 <-> IC1.3 <-> IC1.7 <-> IC1.8
-	C3.1 <-> C5.2 <-> IC1.4 <-> R2.2
+	C1.1 <-> C2.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> D1.2 <-> IC1.11 <-> IC1.14 <-> IC1.15 <-> IC1.16 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R5.2 <-> R6.2 <-> R7.2
+	C1.2 <-> C4.1 <-> IC1.13 <-> IC1.5 <-> R3.2 <-> R5.1
+	C2.1 <-> R2.1 <-> R3.1 <-> R7.1
+	C3.1 <-> C5.2 <-> IC1.12 <-> IC1.4 <-> R2.2 <-> R4.1
 	C3.2 <-> C4.2 <-> D1.1 <-> R4.2
-	C6.1 <-> IC1.16 <-> R5.2 <-> R6.2
-	C7.1 <-> IC1.11 <-> R7.2
-	C7.2 <-> IC1.10 <-> R6.1
-	IC1.13 <-> R5.1
-	IC1.14 <-> IC1.15
+	C5.1 <-> C7.2 <-> IC1.10 <-> IC1.2 <-> R6.1
+	IC1.1 <-> IC1.9
 
diff --git a/diylc-regression-data/input/v1/netlist/new_clipper_excl_switches.txt b/diylc-regression-data/input/v1/netlist/new_clipper_excl_switches.txt
index a2e7e15c..048bb789 100644
--- a/diylc-regression-data/input/v1/netlist/new_clipper_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/new_clipper_excl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> C2.1 <-> C2.2 <-> D1.1 <-> D2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2
-	C1.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R5.1 <-> R6.1
+	C1.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> IC1.4 <-> IC1.5 <-> IC1.8 <-> R5.1 <-> R6.1
 	C3.1 <-> C4.1 <-> C4.2 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.1
 	C5.1 <-> R7.2
-	IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/v1/netlist/new_clipper_incl_switches.txt b/diylc-regression-data/input/v1/netlist/new_clipper_incl_switches.txt
index a2e7e15c..048bb789 100644
--- a/diylc-regression-data/input/v1/netlist/new_clipper_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/new_clipper_incl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> C2.1 <-> C2.2 <-> D1.1 <-> D2.2 <-> R1.1 <-> R1.2 <-> R2.1 <-> R2.2
-	C1.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.4 <-> IC1.8 <-> R5.1 <-> R6.1
+	C1.2 <-> C3.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> IC1.1 <-> IC1.4 <-> IC1.5 <-> IC1.8 <-> R5.1 <-> R6.1
 	C3.1 <-> C4.1 <-> C4.2 <-> IC1.2 <-> IC1.3 <-> IC1.6 <-> IC1.7 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.1
 	C5.1 <-> R7.2
-	IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/v1/netlist/octup_excl_switches.txt b/diylc-regression-data/input/v1/netlist/octup_excl_switches.txt
index 138f5df6..3f173f11 100644
--- a/diylc-regression-data/input/v1/netlist/octup_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/octup_excl_switches.txt
@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R2.2
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.1 <-> Q2.2 <-> R3.1
-	C2.2 <-> R5.1
-	C3.1 <-> Q3.3 <-> Q4.3 <-> R4.1
+	C1.1 <-> C2.1 <-> C3.1 <-> C5.1 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> Q4.1 <-> Q4.2 <-> Q4.3 <-> R2.2 <-> R3.1 <-> R4.1 <-> R8.2 <-> R9.1
+	C1.2 <-> C2.2 <-> C4.1 <-> C4.2 <-> R1.1 <-> R5.1 <-> R6.1 <-> R7.1
 	C3.2 <-> C6.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R6.2
-	C4.1 <-> R7.1
-	C4.2 <-> R6.1
-	C5.1 <-> Q3.1 <-> Q3.2 <-> Q4.1 <-> Q4.2 <-> R8.2
-	C6.1 <-> D1.2 <-> R7.2 <-> R8.1 <-> R9.2
-	Q1.1 <-> Q1.2 <-> Q2.3
+	C6.1 <-> D1.2 <-> R2.1 <-> R7.2 <-> R8.1 <-> R9.2
 
diff --git a/diylc-regression-data/input/v1/netlist/octup_incl_switches.txt b/diylc-regression-data/input/v1/netlist/octup_incl_switches.txt
index 138f5df6..3f173f11 100644
--- a/diylc-regression-data/input/v1/netlist/octup_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/octup_incl_switches.txt
@@ -1,14 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R2.2
-	C1.2 <-> R1.1
-	C2.1 <-> Q2.1 <-> Q2.2 <-> R3.1
-	C2.2 <-> R5.1
-	C3.1 <-> Q3.3 <-> Q4.3 <-> R4.1
+	C1.1 <-> C2.1 <-> C3.1 <-> C5.1 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> Q3.3 <-> Q4.1 <-> Q4.2 <-> Q4.3 <-> R2.2 <-> R3.1 <-> R4.1 <-> R8.2 <-> R9.1
+	C1.2 <-> C2.2 <-> C4.1 <-> C4.2 <-> R1.1 <-> R5.1 <-> R6.1 <-> R7.1
 	C3.2 <-> C6.2 <-> D1.1 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2 <-> R6.2
-	C4.1 <-> R7.1
-	C4.2 <-> R6.1
-	C5.1 <-> Q3.1 <-> Q3.2 <-> Q4.1 <-> Q4.2 <-> R8.2
-	C6.1 <-> D1.2 <-> R7.2 <-> R8.1 <-> R9.2
-	Q1.1 <-> Q1.2 <-> Q2.3
+	C6.1 <-> D1.2 <-> R2.1 <-> R7.2 <-> R8.1 <-> R9.2
 
diff --git a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_excl_switches.txt
index 73ff6b5a..092f8574 100644
--- a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_excl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
 	C1.2 <-> C4.1 <-> R1.2 <-> R2.2
-	C2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
-	C3.2 <-> Q1.1 <-> R3.1
+	C2.1 <-> C2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
+	C3.2 <-> Q1.1 <-> R3.1 <-> R3.2 <-> R4.1
 	C4.2 <-> R1.1
-	R3.2 <-> R4.1
 
diff --git a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_incl_switches.txt
index 73ff6b5a..092f8574 100644
--- a/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/orange_treble_bass_booster_incl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
 	C1.2 <-> C4.1 <-> R1.2 <-> R2.2
-	C2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
-	C3.2 <-> Q1.1 <-> R3.1
+	C2.1 <-> C2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.2
+	C3.2 <-> Q1.1 <-> R3.1 <-> R3.2 <-> R4.1
 	C4.2 <-> R1.1
-	R3.2 <-> R4.1
 
diff --git a/diylc-regression-data/input/v1/netlist/passive_tone_stack_excl_switches.txt b/diylc-regression-data/input/v1/netlist/passive_tone_stack_excl_switches.txt
index 1edd9c06..f5ad7c37 100644
--- a/diylc-regression-data/input/v1/netlist/passive_tone_stack_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/passive_tone_stack_excl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> P1.3
-	C1.2 <-> R1.1
+	C1.2 <-> C3.2 <-> P1.1 <-> P3.2 <-> P3.3 <-> R1.1
 	C2.1 <-> C3.1 <-> R1.2
 	C2.2 <-> P2.2
-	C3.2 <-> P1.1 <-> P3.2 <-> P3.3
 	P2.3 <-> P3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/passive_tone_stack_incl_switches.txt b/diylc-regression-data/input/v1/netlist/passive_tone_stack_incl_switches.txt
index 1edd9c06..f5ad7c37 100644
--- a/diylc-regression-data/input/v1/netlist/passive_tone_stack_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/passive_tone_stack_incl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> P1.3
-	C1.2 <-> R1.1
+	C1.2 <-> C3.2 <-> P1.1 <-> P3.2 <-> P3.3 <-> R1.1
 	C2.1 <-> C3.1 <-> R1.2
 	C2.2 <-> P2.2
-	C3.2 <-> P1.1 <-> P3.2 <-> P3.3
 	P2.3 <-> P3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/phuncgnosis_excl_switches.txt b/diylc-regression-data/input/v1/netlist/phuncgnosis_excl_switches.txt
index 44ef9bcc..0f797249 100644
--- a/diylc-regression-data/input/v1/netlist/phuncgnosis_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/phuncgnosis_excl_switches.txt
@@ -1,20 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.8 <-> R1.1 <-> R2.1 <-> R3.2 <-> R5.2
-	C1.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> D5.2 <-> IC1.4 <-> R11.1 <-> R2.2 <-> R7.2
-	C2.2 <-> IC1.3 <-> R3.1
-	C3.1 <-> IC1.1 <-> R4.1
-	C3.2 <-> D1.2 <-> D2.1
-	C4.1 <-> D2.2 <-> D3.1
-	C5.1 <-> R6.2 <-> R7.1 <-> R8.1
-	C6.1 <-> R8.2 <-> R9.1
-	C7.1 <-> C8.2 <-> R9.2
-	C7.2 <-> IC1.7 <-> R10.1
-	C8.1 <-> C9.1 <-> IC1.6 <-> R10.2
-	C9.2 <-> R11.2
-	D3.2 <-> R6.1
-	D4.1 <-> IC1.5 <-> R1.2
-	D4.2 <-> D6.1
-	D6.2 <-> D7.1
-	IC1.2 <-> R4.2 <-> R5.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> D4.2 <-> D5.1 <-> D5.2 <-> D6.1 <-> D6.2 <-> D7.1 <-> D7.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> R9.1 <-> R9.2
 
diff --git a/diylc-regression-data/input/v1/netlist/phuncgnosis_incl_switches.txt b/diylc-regression-data/input/v1/netlist/phuncgnosis_incl_switches.txt
index 44ef9bcc..0f797249 100644
--- a/diylc-regression-data/input/v1/netlist/phuncgnosis_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/phuncgnosis_incl_switches.txt
@@ -1,20 +1,4 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.8 <-> R1.1 <-> R2.1 <-> R3.2 <-> R5.2
-	C1.2 <-> C4.2 <-> C5.2 <-> D1.1 <-> D5.2 <-> IC1.4 <-> R11.1 <-> R2.2 <-> R7.2
-	C2.2 <-> IC1.3 <-> R3.1
-	C3.1 <-> IC1.1 <-> R4.1
-	C3.2 <-> D1.2 <-> D2.1
-	C4.1 <-> D2.2 <-> D3.1
-	C5.1 <-> R6.2 <-> R7.1 <-> R8.1
-	C6.1 <-> R8.2 <-> R9.1
-	C7.1 <-> C8.2 <-> R9.2
-	C7.2 <-> IC1.7 <-> R10.1
-	C8.1 <-> C9.1 <-> IC1.6 <-> R10.2
-	C9.2 <-> R11.2
-	D3.2 <-> R6.1
-	D4.1 <-> IC1.5 <-> R1.2
-	D4.2 <-> D6.1
-	D6.2 <-> D7.1
-	IC1.2 <-> R4.2 <-> R5.1
+	C1.1 <-> C1.2 <-> C2.1 <-> C2.2 <-> C3.1 <-> C3.2 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C6.1 <-> C6.2 <-> C7.1 <-> C7.2 <-> C8.1 <-> C8.2 <-> C9.1 <-> C9.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> D3.1 <-> D3.2 <-> D4.1 <-> D4.2 <-> D5.1 <-> D5.2 <-> D6.1 <-> D6.2 <-> D7.1 <-> D7.2 <-> IC1.1 <-> IC1.2 <-> IC1.3 <-> IC1.4 <-> IC1.5 <-> IC1.6 <-> IC1.7 <-> IC1.8 <-> R1.1 <-> R1.2 <-> R10.1 <-> R10.2 <-> R11.1 <-> R11.2 <-> R2.1 <-> R2.2 <-> R3.1 <-> R3.2 <-> R4.1 <-> R4.2 <-> R5.1 <-> R5.2 <-> R6.1 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> R9.1 <-> R9.2
 
diff --git a/diylc-regression-data/input/v1/netlist/piezo_preamp1_excl_switches.txt b/diylc-regression-data/input/v1/netlist/piezo_preamp1_excl_switches.txt
index db5fc3b3..a8fa6e05 100644
--- a/diylc-regression-data/input/v1/netlist/piezo_preamp1_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/piezo_preamp1_excl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.2 <-> R2.2
-	C1.2 <-> Q1.1 <-> Q1.2 <-> R3.2
+	C1.1 <-> C1.2 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> R2.2 <-> R3.2
 	C2.1 <-> C4.2 <-> R1.1 <-> R3.1 <-> R4.1
 	C3.1 <-> R5.2
 	C3.2 <-> Q1.3 <-> R4.2
-	R1.2 <-> R2.1
+	R1.2 <-> R2.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/v1/netlist/piezo_preamp1_incl_switches.txt b/diylc-regression-data/input/v1/netlist/piezo_preamp1_incl_switches.txt
index db5fc3b3..a8fa6e05 100644
--- a/diylc-regression-data/input/v1/netlist/piezo_preamp1_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/piezo_preamp1_incl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.2 <-> R2.2
-	C1.2 <-> Q1.1 <-> Q1.2 <-> R3.2
+	C1.1 <-> C1.2 <-> C2.2 <-> Q1.1 <-> Q1.2 <-> R2.2 <-> R3.2
 	C2.1 <-> C4.2 <-> R1.1 <-> R3.1 <-> R4.1
 	C3.1 <-> R5.2
 	C3.2 <-> Q1.3 <-> R4.2
-	R1.2 <-> R2.1
+	R1.2 <-> R2.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/v1/netlist/piezo_preamp_excl_switches.txt b/diylc-regression-data/input/v1/netlist/piezo_preamp_excl_switches.txt
index 8769e144..93323306 100644
--- a/diylc-regression-data/input/v1/netlist/piezo_preamp_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/piezo_preamp_excl_switches.txt
@@ -1,10 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.1 <-> Q2.3 <-> R4.3
-	C1.2 <-> R3.2 <-> R5.1
-	C2.1 <-> C3.2 <-> R7.2
-	C2.2 <-> C3.1 <-> R5.2
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R4.1 <-> R4.2 <-> R6.2
+	C1.2 <-> C2.2 <-> C3.1 <-> R3.2 <-> R5.1 <-> R5.2
+	C2.1 <-> C3.2 <-> C4.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2 <-> R3.1 <-> R4.1 <-> R4.2 <-> R6.2 <-> R7.2
 	C4.2 <-> R1.1 <-> R2.1 <-> R7.1
-	Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/piezo_preamp_incl_switches.txt b/diylc-regression-data/input/v1/netlist/piezo_preamp_incl_switches.txt
index 8769e144..93323306 100644
--- a/diylc-regression-data/input/v1/netlist/piezo_preamp_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/piezo_preamp_incl_switches.txt
@@ -1,10 +1,7 @@
 Switch setup: [Default]
 
 	C1.1 <-> Q1.1 <-> Q2.3 <-> R4.3
-	C1.2 <-> R3.2 <-> R5.1
-	C2.1 <-> C3.2 <-> R7.2
-	C2.2 <-> C3.1 <-> R5.2
-	C4.1 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R4.1 <-> R4.2 <-> R6.2
+	C1.2 <-> C2.2 <-> C3.1 <-> R3.2 <-> R5.1 <-> R5.2
+	C2.1 <-> C3.2 <-> C4.1 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2 <-> R3.1 <-> R4.1 <-> R4.2 <-> R6.2 <-> R7.2
 	C4.2 <-> R1.1 <-> R2.1 <-> R7.1
-	Q1.2 <-> Q1.3 <-> R2.2 <-> R3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/power_supply_excl_switches.txt b/diylc-regression-data/input/v1/netlist/power_supply_excl_switches.txt
index aa66d618..51ffda55 100644
--- a/diylc-regression-data/input/v1/netlist/power_supply_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/power_supply_excl_switches.txt
@@ -1,9 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> D3.2 <-> D4.2 <-> Q1.1 <-> Q1.2
-	C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> D1.1 <-> D2.1 <-> Q1.3 <-> Q2.2 <-> Q2.3
+	C1.1 <-> C3.1 <-> C5.2 <-> C6.2 <-> C8.1 <-> C9.1 <-> D3.2 <-> D4.2 <-> D7.1 <-> Q1.1 <-> Q1.2
+	C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> D1.1 <-> D2.1 <-> D6.2 <-> Q1.3 <-> Q2.2 <-> Q2.3
 	C2.1 <-> C4.1 <-> C7.1 <-> D1.2 <-> D4.1 <-> D6.1 <-> D7.2 <-> Q2.1
-	C3.1 <-> C5.2
 	C6.1 <-> C7.2 <-> C8.2 <-> C9.2 <-> D2.2 <-> D3.1
-	C6.2 <-> C8.1 <-> C9.1 <-> D7.1
 
diff --git a/diylc-regression-data/input/v1/netlist/power_supply_incl_switches.txt b/diylc-regression-data/input/v1/netlist/power_supply_incl_switches.txt
index aa66d618..51ffda55 100644
--- a/diylc-regression-data/input/v1/netlist/power_supply_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/power_supply_incl_switches.txt
@@ -1,9 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> D3.2 <-> D4.2 <-> Q1.1 <-> Q1.2
-	C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> D1.1 <-> D2.1 <-> Q1.3 <-> Q2.2 <-> Q2.3
+	C1.1 <-> C3.1 <-> C5.2 <-> C6.2 <-> C8.1 <-> C9.1 <-> D3.2 <-> D4.2 <-> D7.1 <-> Q1.1 <-> Q1.2
+	C1.2 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> D1.1 <-> D2.1 <-> D6.2 <-> Q1.3 <-> Q2.2 <-> Q2.3
 	C2.1 <-> C4.1 <-> C7.1 <-> D1.2 <-> D4.1 <-> D6.1 <-> D7.2 <-> Q2.1
-	C3.1 <-> C5.2
 	C6.1 <-> C7.2 <-> C8.2 <-> C9.2 <-> D2.2 <-> D3.1
-	C6.2 <-> C8.1 <-> C9.1 <-> D7.1
 
diff --git a/diylc-regression-data/input/v1/netlist/rambler_excl_switches.txt b/diylc-regression-data/input/v1/netlist/rambler_excl_switches.txt
index e653b528..b58c82d0 100644
--- a/diylc-regression-data/input/v1/netlist/rambler_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/rambler_excl_switches.txt
@@ -7,7 +7,6 @@ Switch setup: [Default]
 	C3.1 <-> Gain.2 <-> Gain.3
 	D1.1 <-> D2.2
 	D1.2 <-> JRC386D.3 <-> VR1.1 <-> VR1.3
-	D1.2 <-> VR1.3
 	D2.1 <-> Octave.1
 	Gain.1 <-> R1.2
 	JRC386D.1 <-> JRC386D.5 <-> R1.1
diff --git a/diylc-regression-data/input/v1/netlist/rambler_incl_switches.txt b/diylc-regression-data/input/v1/netlist/rambler_incl_switches.txt
index e653b528..b58c82d0 100644
--- a/diylc-regression-data/input/v1/netlist/rambler_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/rambler_incl_switches.txt
@@ -7,7 +7,6 @@ Switch setup: [Default]
 	C3.1 <-> Gain.2 <-> Gain.3
 	D1.1 <-> D2.2
 	D1.2 <-> JRC386D.3 <-> VR1.1 <-> VR1.3
-	D1.2 <-> VR1.3
 	D2.1 <-> Octave.1
 	Gain.1 <-> R1.2
 	JRC386D.1 <-> JRC386D.5 <-> R1.1
diff --git a/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_excl_switches.txt b/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_excl_switches.txt
index 285143c6..1b9756ed 100644
--- a/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_excl_switches.txt
@@ -1,9 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> R3.1
-	C1.2 <-> Q1.3 <-> R2.1
+	C1.2 <-> C4.1 <-> Q1.3 <-> R2.1
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1
 	C2.2 <-> C3.2 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2
 	C3.1 <-> R2.2
-	C4.2 <-> R5.1
+	C4.2 <-> R1.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_incl_switches.txt b/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_incl_switches.txt
index 285143c6..1b9756ed 100644
--- a/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/rangemaster_npn_modified_incl_switches.txt
@@ -1,9 +1,9 @@
 Switch setup: [Default]
 
 	C1.1 <-> R3.1
-	C1.2 <-> Q1.3 <-> R2.1
+	C1.2 <-> C4.1 <-> Q1.3 <-> R2.1
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R4.1
 	C2.2 <-> C3.2 <-> R1.2 <-> R3.2 <-> R4.2 <-> R5.2
 	C3.1 <-> R2.2
-	C4.2 <-> R5.1
+	C4.2 <-> R1.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_excl_switches.txt
index 4420b091..ab45f1d4 100644
--- a/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_excl_switches.txt
@@ -1,24 +1,13 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.9 <-> R1.1
-	C1.2 <-> R2.2
-	C10.1 <-> IC1.1 <-> R14.1
-	C10.2 <-> C5.2 <-> D3.2 <-> IC1.3 <-> IC1.8 <-> R1.2
-	C2.1 <-> C8.1 <-> IC1.10 <-> R3.2
-	C2.2 <-> R4.2
-	C3.1 <-> R6.1
-	C3.2 <-> D1.1 <-> D2.1 <-> IC1.16 <-> R7.1
-	C4.1 <-> R8.2
-	C4.2 <-> D1.2 <-> D2.2 <-> IC1.15 <-> R7.2
-	C5.1 <-> R10.1 <-> R8.1 <-> R9.1
-	C6.1 <-> IC1.7
-	C6.2 <-> C7.2 <-> IC1.6 <-> R10.2
-	C7.1 <-> R11.1
-	C8.2 <-> R13.2
-	C9.1 <-> IC1.4 <-> R12.2
-	D3.1 <-> R14.2
-	IC1.11 <-> R2.1 <-> R3.1
-	IC1.12 <-> R5.2
-	IC1.14 <-> R4.1 <-> R5.1
-	IC1.5 <-> R11.2 <-> R12.1 <-> R13.1
+	C1.1 <-> C10.1 <-> IC1.1 <-> IC1.9 <-> R1.1 <-> R14.1
+	C1.2 <-> C2.2 <-> D3.1 <-> R14.2 <-> R2.2 <-> R4.2
+	C10.2 <-> C3.2 <-> C5.2 <-> D1.1 <-> D2.1 <-> D3.2 <-> IC1.11 <-> IC1.16 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R3.1 <-> R7.1
+	C2.1 <-> C8.1 <-> C9.2 <-> IC1.10 <-> IC1.2 <-> R3.2
+	C3.1 <-> C5.1 <-> R10.1 <-> R6.1 <-> R8.1 <-> R9.1
+	C4.1 <-> C7.1 <-> R11.1 <-> R8.2
+	C4.2 <-> C6.1 <-> D1.2 <-> D2.2 <-> IC1.15 <-> IC1.7 <-> R7.2
+	C6.2 <-> C7.2 <-> IC1.14 <-> IC1.6 <-> R10.2 <-> R4.1 <-> R5.1 <-> R6.2
+	C8.2 <-> IC1.13 <-> IC1.5 <-> R11.2 <-> R12.1 <-> R13.1 <-> R13.2
+	C9.1 <-> IC1.12 <-> IC1.4 <-> R12.2 <-> R5.2
 
diff --git a/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_incl_switches.txt
index 4420b091..ab45f1d4 100644
--- a/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/rog_ubescreamer_vero_incl_switches.txt
@@ -1,24 +1,13 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.9 <-> R1.1
-	C1.2 <-> R2.2
-	C10.1 <-> IC1.1 <-> R14.1
-	C10.2 <-> C5.2 <-> D3.2 <-> IC1.3 <-> IC1.8 <-> R1.2
-	C2.1 <-> C8.1 <-> IC1.10 <-> R3.2
-	C2.2 <-> R4.2
-	C3.1 <-> R6.1
-	C3.2 <-> D1.1 <-> D2.1 <-> IC1.16 <-> R7.1
-	C4.1 <-> R8.2
-	C4.2 <-> D1.2 <-> D2.2 <-> IC1.15 <-> R7.2
-	C5.1 <-> R10.1 <-> R8.1 <-> R9.1
-	C6.1 <-> IC1.7
-	C6.2 <-> C7.2 <-> IC1.6 <-> R10.2
-	C7.1 <-> R11.1
-	C8.2 <-> R13.2
-	C9.1 <-> IC1.4 <-> R12.2
-	D3.1 <-> R14.2
-	IC1.11 <-> R2.1 <-> R3.1
-	IC1.12 <-> R5.2
-	IC1.14 <-> R4.1 <-> R5.1
-	IC1.5 <-> R11.2 <-> R12.1 <-> R13.1
+	C1.1 <-> C10.1 <-> IC1.1 <-> IC1.9 <-> R1.1 <-> R14.1
+	C1.2 <-> C2.2 <-> D3.1 <-> R14.2 <-> R2.2 <-> R4.2
+	C10.2 <-> C3.2 <-> C5.2 <-> D1.1 <-> D2.1 <-> D3.2 <-> IC1.11 <-> IC1.16 <-> IC1.3 <-> IC1.8 <-> R1.2 <-> R2.1 <-> R3.1 <-> R7.1
+	C2.1 <-> C8.1 <-> C9.2 <-> IC1.10 <-> IC1.2 <-> R3.2
+	C3.1 <-> C5.1 <-> R10.1 <-> R6.1 <-> R8.1 <-> R9.1
+	C4.1 <-> C7.1 <-> R11.1 <-> R8.2
+	C4.2 <-> C6.1 <-> D1.2 <-> D2.2 <-> IC1.15 <-> IC1.7 <-> R7.2
+	C6.2 <-> C7.2 <-> IC1.14 <-> IC1.6 <-> R10.2 <-> R4.1 <-> R5.1 <-> R6.2
+	C8.2 <-> IC1.13 <-> IC1.5 <-> R11.2 <-> R12.1 <-> R13.1 <-> R13.2
+	C9.1 <-> IC1.12 <-> IC1.4 <-> R12.2 <-> R5.2
 
diff --git a/diylc-regression-data/input/v1/netlist/ruby1_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby1_excl_switches.txt
index 5ffba7bd..35f6f93a 100644
--- a/diylc-regression-data/input/v1/netlist/ruby1_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/ruby1_excl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R2.2
-	C2.1 <-> IC1.7
-	C2.2 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1
-	C3.1 <-> IC1.6
+	C1.1 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q1.3 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.2
+	C3.1 <-> IC1.2 <-> IC1.6
 	C4.1 <-> R3.1
-	C5.1 <-> IC1.8 <-> R3.2
+	IC1.1 <-> IC1.5
 	Q1.1 <-> Q1.2 <-> R1.2
 
diff --git a/diylc-regression-data/input/v1/netlist/ruby1_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby1_incl_switches.txt
index 5ffba7bd..35f6f93a 100644
--- a/diylc-regression-data/input/v1/netlist/ruby1_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/ruby1_incl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R2.2
-	C2.1 <-> IC1.7
-	C2.2 <-> C3.2 <-> C4.2 <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1
-	C3.1 <-> IC1.6
+	C1.1 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q1.3 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.2
+	C3.1 <-> IC1.2 <-> IC1.6
 	C4.1 <-> R3.1
-	C5.1 <-> IC1.8 <-> R3.2
+	IC1.1 <-> IC1.5
 	Q1.1 <-> Q1.2 <-> R1.2
 
diff --git a/diylc-regression-data/input/v1/netlist/ruby3_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby3_excl_switches.txt
index dadce826..a7fa11c1 100644
--- a/diylc-regression-data/input/v1/netlist/ruby3_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/ruby3_excl_switches.txt
@@ -6,5 +6,4 @@ Switch setup: [Default]
 	C3.1 <-> IC1.6
 	C4.1 <-> IC1.7 <-> Q1.1
 	C5.1 <-> IC1.8 <-> R1.2
-	IC1.8 <-> R1.2
 
diff --git a/diylc-regression-data/input/v1/netlist/ruby3_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby3_incl_switches.txt
index dadce826..a7fa11c1 100644
--- a/diylc-regression-data/input/v1/netlist/ruby3_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/ruby3_incl_switches.txt
@@ -6,5 +6,4 @@ Switch setup: [Default]
 	C3.1 <-> IC1.6
 	C4.1 <-> IC1.7 <-> Q1.1
 	C5.1 <-> IC1.8 <-> R1.2
-	IC1.8 <-> R1.2
 
diff --git a/diylc-regression-data/input/v1/netlist/ruby_excl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby_excl_switches.txt
index 0ea08516..564e7ccd 100644
--- a/diylc-regression-data/input/v1/netlist/ruby_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/ruby_excl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R2.2
-	C2.1 <-> C5.1 <-> IC1.7 <-> R3.1
-	C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1
-	C3.1 <-> IC1.6
+	C1.1 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q1.3 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.1
+	C3.1 <-> IC1.2 <-> IC1.6
 	C4.1 <-> R3.2
+	IC1.1 <-> IC1.5
 	Q1.1 <-> Q1.2 <-> R1.2
 
diff --git a/diylc-regression-data/input/v1/netlist/ruby_incl_switches.txt b/diylc-regression-data/input/v1/netlist/ruby_incl_switches.txt
index 0ea08516..564e7ccd 100644
--- a/diylc-regression-data/input/v1/netlist/ruby_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/ruby_incl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> Q1.3 <-> R2.2
-	C2.1 <-> C5.1 <-> IC1.7 <-> R3.1
-	C2.2 <-> C3.2 <-> C4.2 <-> C5.2 <-> IC1.3 <-> IC1.4 <-> R1.1 <-> R2.1
-	C3.1 <-> IC1.6
+	C1.1 <-> C2.1 <-> C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8 <-> Q1.3 <-> R1.1 <-> R2.1 <-> R2.2 <-> R3.1
+	C3.1 <-> IC1.2 <-> IC1.6
 	C4.1 <-> R3.2
+	IC1.1 <-> IC1.5
 	Q1.1 <-> Q1.2 <-> R1.2
 
diff --git a/diylc-regression-data/input/v1/netlist/shaka_hv_excl_switches.txt b/diylc-regression-data/input/v1/netlist/shaka_hv_excl_switches.txt
index ba9a73da..9d8a0b0d 100644
--- a/diylc-regression-data/input/v1/netlist/shaka_hv_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/shaka_hv_excl_switches.txt
@@ -7,7 +7,6 @@ Switch setup: [Default]
 	C3.1 <-> Q1.3 <-> R6.1
 	C3.2 <-> C6.2 <-> C7.1 <-> R1.1 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2
 	C4.1 <-> IC1.2 <-> R8.1
-	C4.1 <-> R8.1
 	C5.1 <-> Q1.1 <-> VR2.2 <-> VR2.3
 	C7.2 <-> R8.2
 	R3.2 <-> R4.1 <-> R5.1
diff --git a/diylc-regression-data/input/v1/netlist/shaka_hv_incl_switches.txt b/diylc-regression-data/input/v1/netlist/shaka_hv_incl_switches.txt
index ba9a73da..9d8a0b0d 100644
--- a/diylc-regression-data/input/v1/netlist/shaka_hv_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/shaka_hv_incl_switches.txt
@@ -7,7 +7,6 @@ Switch setup: [Default]
 	C3.1 <-> Q1.3 <-> R6.1
 	C3.2 <-> C6.2 <-> C7.1 <-> R1.1 <-> R4.2 <-> R5.2 <-> R6.2 <-> R7.2
 	C4.1 <-> IC1.2 <-> R8.1
-	C4.1 <-> R8.1
 	C5.1 <-> Q1.1 <-> VR2.2 <-> VR2.3
 	C7.2 <-> R8.2
 	R3.2 <-> R4.1 <-> R5.1
diff --git a/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_excl_switches.txt b/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_excl_switches.txt
index 3127fca9..23db2e08 100644
--- a/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_excl_switches.txt
@@ -1,14 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C2.2 <-> Q1.3 <-> R2.2
-	C2.1 <-> C4.1 <-> R2.1 <-> R3.1
-	C3.1 <-> R3.2 <-> R4.1
-	C3.2 <-> R4.2 <-> R6.2
-	C4.2 <-> Q2.3 <-> R5.1
-	C5.2 <-> C6.1 <-> R5.2 <-> R6.1
-	C7.1 <-> R7.1
-	C7.2 <-> R8.1
-	C8.1 <-> R7.2 <-> R8.2
+	C1.1 <-> C6.2 <-> R1.1
+	C1.2 <-> C2.2 <-> C4.2 <-> C5.1 <-> Q1.3 <-> Q2.3 <-> R2.2 <-> R5.1
+	C2.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> R2.1 <-> R3.1 <-> R5.2 <-> R6.1 <-> R7.1
+	C3.1 <-> C8.1 <-> R3.2 <-> R4.1 <-> R7.2 <-> R8.2
+	C3.2 <-> C7.2 <-> R4.2 <-> R6.2 <-> R8.1
 	Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2
 
diff --git a/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_incl_switches.txt b/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_incl_switches.txt
index 3127fca9..23db2e08 100644
--- a/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/shin-ei_fy-2_fuzzmaster_with_scoop_mod_incl_switches.txt
@@ -1,14 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> C2.2 <-> Q1.3 <-> R2.2
-	C2.1 <-> C4.1 <-> R2.1 <-> R3.1
-	C3.1 <-> R3.2 <-> R4.1
-	C3.2 <-> R4.2 <-> R6.2
-	C4.2 <-> Q2.3 <-> R5.1
-	C5.2 <-> C6.1 <-> R5.2 <-> R6.1
-	C7.1 <-> R7.1
-	C7.2 <-> R8.1
-	C8.1 <-> R7.2 <-> R8.2
+	C1.1 <-> C6.2 <-> R1.1
+	C1.2 <-> C2.2 <-> C4.2 <-> C5.1 <-> Q1.3 <-> Q2.3 <-> R2.2 <-> R5.1
+	C2.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> C7.1 <-> R2.1 <-> R3.1 <-> R5.2 <-> R6.1 <-> R7.1
+	C3.1 <-> C8.1 <-> R3.2 <-> R4.1 <-> R7.2 <-> R8.2
+	C3.2 <-> C7.2 <-> R4.2 <-> R6.2 <-> R8.1
 	Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2
 
diff --git a/diylc-regression-data/input/v1/netlist/signal_tracer_vero_excl_switches.txt b/diylc-regression-data/input/v1/netlist/signal_tracer_vero_excl_switches.txt
index d9f2f40f..87b3e3f4 100644
--- a/diylc-regression-data/input/v1/netlist/signal_tracer_vero_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/signal_tracer_vero_excl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R1.1
+	C1.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.1
 	C2.1 <-> R1.2
 	Q1.1 <-> Q2.3
-	Q2.1 <-> Q2.2
 
diff --git a/diylc-regression-data/input/v1/netlist/signal_tracer_vero_incl_switches.txt b/diylc-regression-data/input/v1/netlist/signal_tracer_vero_incl_switches.txt
index d9f2f40f..87b3e3f4 100644
--- a/diylc-regression-data/input/v1/netlist/signal_tracer_vero_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/signal_tracer_vero_incl_switches.txt
@@ -1,7 +1,6 @@
 Switch setup: [Default]
 
-	C1.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> R1.1
+	C1.2 <-> D1.2 <-> Q1.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.1
 	C2.1 <-> R1.2
 	Q1.1 <-> Q2.3
-	Q2.1 <-> Q2.2
 
diff --git a/diylc-regression-data/input/v1/netlist/siliface2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/siliface2_excl_switches.txt
index 88dd192a..0a0c68c2 100644
--- a/diylc-regression-data/input/v1/netlist/siliface2_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/siliface2_excl_switches.txt
@@ -1,11 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R2.2 <-> R3.2
+	C1.1 <-> C4.1 <-> C4.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> VR1.1 <-> VR1.2
 	C1.2 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> R5.2 <-> R6.2
-	C2.1 <-> R1.2 <-> R6.1
-	C2.2 <-> C6.1 <-> Q1.3 <-> R4.1
-	C3.1 <-> VR1.3
-	C3.2 <-> Q2.3 <-> R2.1
-	C4.1 <-> R3.1 <-> VR1.1 <-> VR1.2
-	C5.1 <-> C6.2 <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R5.1
+	C2.1 <-> C3.2 <-> Q2.3 <-> R1.2 <-> R2.1 <-> R6.1
+	C2.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R4.1 <-> R4.2 <-> R5.1
+	C3.1 <-> R1.1 <-> VR1.3
 
diff --git a/diylc-regression-data/input/v1/netlist/siliface2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/siliface2_incl_switches.txt
index 88dd192a..0a0c68c2 100644
--- a/diylc-regression-data/input/v1/netlist/siliface2_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/siliface2_incl_switches.txt
@@ -1,11 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R2.2 <-> R3.2
+	C1.1 <-> C4.1 <-> C4.2 <-> R2.2 <-> R3.1 <-> R3.2 <-> VR1.1 <-> VR1.2
 	C1.2 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> R5.2 <-> R6.2
-	C2.1 <-> R1.2 <-> R6.1
-	C2.2 <-> C6.1 <-> Q1.3 <-> R4.1
-	C3.1 <-> VR1.3
-	C3.2 <-> Q2.3 <-> R2.1
-	C4.1 <-> R3.1 <-> VR1.1 <-> VR1.2
-	C5.1 <-> C6.2 <-> Q2.1 <-> Q2.2 <-> R4.2 <-> R5.1
+	C2.1 <-> C3.2 <-> Q2.3 <-> R1.2 <-> R2.1 <-> R6.1
+	C2.2 <-> C5.1 <-> C6.1 <-> C6.2 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R4.1 <-> R4.2 <-> R5.1
+	C3.1 <-> R1.1 <-> VR1.3
 
diff --git a/diylc-regression-data/input/v1/netlist/simple_3_band_eq_excl_switches.txt b/diylc-regression-data/input/v1/netlist/simple_3_band_eq_excl_switches.txt
index c163c95d..c3c9c2dd 100644
--- a/diylc-regression-data/input/v1/netlist/simple_3_band_eq_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/simple_3_band_eq_excl_switches.txt
@@ -1,9 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> P1.1
+	C1.1 <-> P2.1 <-> P3.3 <-> R1.1
+	C1.2 <-> C3.2 <-> P1.1 <-> P2.2
 	C2.1 <-> C3.1 <-> R1.2
 	C2.2 <-> P1.3 <-> P3.1 <-> P3.2
-	C3.2 <-> P2.2
-	P2.1 <-> P3.3
 
diff --git a/diylc-regression-data/input/v1/netlist/simple_3_band_eq_incl_switches.txt b/diylc-regression-data/input/v1/netlist/simple_3_band_eq_incl_switches.txt
index c163c95d..c3c9c2dd 100644
--- a/diylc-regression-data/input/v1/netlist/simple_3_band_eq_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/simple_3_band_eq_incl_switches.txt
@@ -1,9 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> P1.1
+	C1.1 <-> P2.1 <-> P3.3 <-> R1.1
+	C1.2 <-> C3.2 <-> P1.1 <-> P2.2
 	C2.1 <-> C3.1 <-> R1.2
 	C2.2 <-> P1.3 <-> P3.1 <-> P3.2
-	C3.2 <-> P2.2
-	P2.1 <-> P3.3
 
diff --git a/diylc-regression-data/input/v1/netlist/smooth_drive_excl_switches.txt b/diylc-regression-data/input/v1/netlist/smooth_drive_excl_switches.txt
index 87e59903..7f6e48aa 100644
--- a/diylc-regression-data/input/v1/netlist/smooth_drive_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/smooth_drive_excl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
-	C1.2 <-> C2.1 <-> IC1.3
-	C2.2 <-> C3.2 <-> C4.2 <-> IC1.4
-	C3.1 <-> IC1.5 <-> R1.2
-	C4.1 <-> IC1.7
-	C5.1 <-> IC1.8
+	C1.1 <-> C1.2 <-> C2.1 <-> C4.1 <-> IC1.3 <-> IC1.7
+	C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.4 <-> IC1.8
+	C3.1 <-> IC1.1 <-> IC1.5 <-> R1.1 <-> R1.2
+	IC1.2 <-> IC1.6
 
diff --git a/diylc-regression-data/input/v1/netlist/smooth_drive_incl_switches.txt b/diylc-regression-data/input/v1/netlist/smooth_drive_incl_switches.txt
index 87e59903..7f6e48aa 100644
--- a/diylc-regression-data/input/v1/netlist/smooth_drive_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/smooth_drive_incl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
-	C1.2 <-> C2.1 <-> IC1.3
-	C2.2 <-> C3.2 <-> C4.2 <-> IC1.4
-	C3.1 <-> IC1.5 <-> R1.2
-	C4.1 <-> IC1.7
-	C5.1 <-> IC1.8
+	C1.1 <-> C1.2 <-> C2.1 <-> C4.1 <-> IC1.3 <-> IC1.7
+	C2.2 <-> C3.2 <-> C4.2 <-> C5.1 <-> C5.2 <-> IC1.4 <-> IC1.8
+	C3.1 <-> IC1.1 <-> IC1.5 <-> R1.1 <-> R1.2
+	IC1.2 <-> IC1.6
 
diff --git a/diylc-regression-data/input/v1/netlist/soapdodger2_excl_switches.txt b/diylc-regression-data/input/v1/netlist/soapdodger2_excl_switches.txt
index 7a486eae..06971716 100644
--- a/diylc-regression-data/input/v1/netlist/soapdodger2_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/soapdodger2_excl_switches.txt
@@ -1,19 +1,12 @@
 Switch setup: [Default]
 
 	Attack.1 <-> S1.1
-	Attack.2 <-> C1.1
-	Attack.3 <-> C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> R2.2 <-> R8.2 <-> Volume.3
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2
-	C2.1 <-> R3.1 <-> R4.2
-	C3.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.2 <-> S2.2
-	C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R5.2
-	C4.1 <-> R7.1 <-> S2.1
-	C4.2 <-> C5.1 <-> R7.2 <-> R8.1 <-> Tone.1 <-> Tone.3
+	Attack.2 <-> C1.1 <-> C1.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 <-> S2.4 <-> S2.5 <-> Volume.1
+	Attack.3 <-> C2.2 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R2.2 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> S2.1 <-> S2.2 <-> Tone.1 <-> Tone.3 <-> Volume.3
+	C2.1 <-> C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R4.2 <-> R5.2
 	C6.1 <-> Tone.2
-	C6.2 <-> S2.4
 	C7.1 <-> S2.3
 	C7.2 <-> S2.6
-	D1.1 <-> D2.2 <-> S2.5 <-> Volume.1
 	S1.3 <-> S1.6
 	S1.4 <-> Volume.2
 
diff --git a/diylc-regression-data/input/v1/netlist/soapdodger2_incl_switches.txt b/diylc-regression-data/input/v1/netlist/soapdodger2_incl_switches.txt
index 03ca94a2..0d1ed670 100644
--- a/diylc-regression-data/input/v1/netlist/soapdodger2_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/soapdodger2_incl_switches.txt
@@ -1,25 +1,14 @@
 Switch setup: [S1.ON1:S2.ON1, S1.ON2:S2.ON1]
 
-	Attack.2 <-> C1.1
-	Attack.3 <-> C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> R2.2 <-> R8.2 <-> Volume.3
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2
-	C2.1 <-> R3.1 <-> R4.2
-	C3.1 <-> C4.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.2 <-> R7.1
-	C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R5.2
-	C4.2 <-> C5.1 <-> R7.2 <-> R8.1 <-> Tone.1 <-> Tone.3
+	Attack.2 <-> C1.1 <-> C1.2 <-> C6.2 <-> D1.1 <-> D2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 <-> Volume.1
+	Attack.3 <-> C2.2 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R2.2 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> Tone.1 <-> Tone.3 <-> Volume.3
+	C2.1 <-> C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R4.2 <-> R5.2
 	C6.1 <-> Tone.2
-	C6.2 <-> D1.1 <-> D2.2 <-> Volume.1
 
 Switch setup: [S1.ON1:S2.ON2, S1.ON2:S2.ON2]
 
-	Attack.2 <-> C1.1
-	Attack.3 <-> C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> R2.2 <-> R8.2 <-> Volume.3
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2
-	C2.1 <-> R3.1 <-> R4.2
-	C3.1 <-> C7.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.2
-	C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R5.2
-	C4.1 <-> R7.1
-	C4.2 <-> C5.1 <-> R7.2 <-> R8.1 <-> Tone.1 <-> Tone.3
+	Attack.2 <-> C1.1 <-> C1.2 <-> C6.2 <-> C7.2 <-> D1.1 <-> D2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2 <-> Volume.1
+	Attack.3 <-> C2.2 <-> C3.1 <-> C4.1 <-> C4.2 <-> C5.1 <-> C5.2 <-> C7.1 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R2.2 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2 <-> R7.1 <-> R7.2 <-> R8.1 <-> R8.2 <-> Tone.1 <-> Tone.3 <-> Volume.3
+	C2.1 <-> C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R4.2 <-> R5.2
 	C6.1 <-> Tone.2
-	C7.2 <-> D1.1 <-> D2.2 <-> Volume.1
 
diff --git a/diylc-regression-data/input/v1/netlist/soapdodger_excl_switches.txt b/diylc-regression-data/input/v1/netlist/soapdodger_excl_switches.txt
index c29889cc..d0bd5b05 100644
--- a/diylc-regression-data/input/v1/netlist/soapdodger_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/soapdodger_excl_switches.txt
@@ -1,13 +1,9 @@
 Switch setup: [Default]
 
-	Attack.1 <-> C2.2 <-> D1.2 <-> D2.1 <-> R2.2 <-> Volume.1
-	Attack.2 <-> C1.1
+	Attack.1 <-> Attack.2 <-> C1.1 <-> C1.2 <-> C2.2 <-> C4.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R2.2 <-> R3.2 <-> Volume.1 <-> Volume.3
 	Attack.3 <-> S1.1
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2
-	C2.1 <-> R3.1 <-> R4.2
-	C3.1 <-> C4.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.2
-	C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R5.2
-	C4.2 <-> D1.1 <-> D2.2 <-> Volume.3
+	C2.1 <-> C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R4.2 <-> R5.2
+	C3.1 <-> C4.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2
 	S1.3 <-> S1.6
 	S1.4 <-> Volume.2
 
diff --git a/diylc-regression-data/input/v1/netlist/soapdodger_incl_switches.txt b/diylc-regression-data/input/v1/netlist/soapdodger_incl_switches.txt
index 0f1ba0f5..613af1ce 100644
--- a/diylc-regression-data/input/v1/netlist/soapdodger_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/soapdodger_incl_switches.txt
@@ -1,10 +1,6 @@
 Switch setup: [S1.ON1, S1.ON2]
 
-	Attack.1 <-> C2.2 <-> D1.2 <-> D2.1 <-> R2.2 <-> Volume.1
-	Attack.2 <-> C1.1
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R3.2
-	C2.1 <-> R3.1 <-> R4.2
-	C3.1 <-> C4.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.2
-	C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R5.2
-	C4.2 <-> D1.1 <-> D2.2 <-> Volume.3
+	Attack.1 <-> Attack.2 <-> C1.1 <-> C1.2 <-> C2.2 <-> C4.2 <-> D1.1 <-> D1.2 <-> D2.1 <-> D2.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R2.2 <-> R3.2 <-> Volume.1 <-> Volume.3
+	C2.1 <-> C3.2 <-> Q1.1 <-> Q2.2 <-> Q2.3 <-> R3.1 <-> R4.2 <-> R5.2
+	C3.1 <-> C4.1 <-> Q2.1 <-> R4.1 <-> R5.1 <-> R6.1 <-> R6.2
 
diff --git a/diylc-regression-data/input/v1/netlist/sonic_disto_excl_switches.txt b/diylc-regression-data/input/v1/netlist/sonic_disto_excl_switches.txt
index 560d97b5..3aa82eb2 100644
--- a/diylc-regression-data/input/v1/netlist/sonic_disto_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/sonic_disto_excl_switches.txt
@@ -1,25 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2 <-> R16.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.1
-	C1.2 <-> C11.2 <-> C14.2 <-> C7.2 <-> C8.2 <-> D1.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R12.1 <-> R18.1 <-> R19.1 <-> R2.2 <-> R6.1
-	C10.1 <-> R17.1
-	C10.2 <-> R18.2
-	C11.1 <-> R15.2
-	C12.1 <-> IC1.8 <-> R16.2
-	C13.1 <-> IC1.6 <-> R14.2
-	C14.1 <-> D1.2 <-> IC1.5 <-> R1.1 <-> Rled.1
-	C2.1 <-> R3.2
-	C2.2 <-> R19.2
-	C3.1 <-> C5.1 <-> IC1.2 <-> R7.1
-	C3.2 <-> R5.2
-	C4.1 <-> Q1.1 <-> Q1.2 <-> R6.2
-	C4.2 <-> IC1.3 <-> R8.2
-	C5.2 <-> C6.1 <-> IC1.1
-	C6.2 <-> R10.2
-	C7.1 <-> D2.1 <-> D3.2 <-> R10.1 <-> R11.1 <-> R13.1
-	C8.1 <-> R13.2
-	C9.1 <-> R11.2
-	C9.2 <-> R12.2
-	IC1.7 <-> R14.1 <-> R15.1
-	Q1.3 <-> R3.1 <-> R4.2
+	C1.1 <-> R1.2 <-> R16.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.1 <-> Rled.2
+	C1.2 <-> C11.2 <-> C12.1 <-> C12.2 <-> C14.2 <-> C3.2 <-> C7.2 <-> C8.1 <-> C8.2 <-> D1.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> IC1.8 <-> Q1.3 <-> R12.1 <-> R13.2 <-> R16.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R5.2 <-> R6.1
+	C10.1 <-> C10.2 <-> C11.1 <-> C14.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> D1.2 <-> IC1.1 <-> IC1.5 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R15.2 <-> R17.1 <-> R18.2 <-> R6.2 <-> Rled.1
+	C13.1 <-> C13.2 <-> C2.2 <-> C3.1 <-> C5.1 <-> C7.1 <-> D2.1 <-> D3.2 <-> IC1.2 <-> IC1.6 <-> R10.1 <-> R11.1 <-> R13.1 <-> R14.2 <-> R19.2 <-> R7.1
+	C2.1 <-> C4.2 <-> IC1.3 <-> IC1.7 <-> R14.1 <-> R15.1 <-> R17.2 <-> R3.2 <-> R8.2
+	C6.2 <-> C9.1 <-> C9.2 <-> R10.2 <-> R11.2 <-> R12.2 <-> R7.2
 
diff --git a/diylc-regression-data/input/v1/netlist/sonic_disto_incl_switches.txt b/diylc-regression-data/input/v1/netlist/sonic_disto_incl_switches.txt
index 560d97b5..3aa82eb2 100644
--- a/diylc-regression-data/input/v1/netlist/sonic_disto_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/sonic_disto_incl_switches.txt
@@ -1,25 +1,9 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.2 <-> R16.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.1
-	C1.2 <-> C11.2 <-> C14.2 <-> C7.2 <-> C8.2 <-> D1.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> R12.1 <-> R18.1 <-> R19.1 <-> R2.2 <-> R6.1
-	C10.1 <-> R17.1
-	C10.2 <-> R18.2
-	C11.1 <-> R15.2
-	C12.1 <-> IC1.8 <-> R16.2
-	C13.1 <-> IC1.6 <-> R14.2
-	C14.1 <-> D1.2 <-> IC1.5 <-> R1.1 <-> Rled.1
-	C2.1 <-> R3.2
-	C2.2 <-> R19.2
-	C3.1 <-> C5.1 <-> IC1.2 <-> R7.1
-	C3.2 <-> R5.2
-	C4.1 <-> Q1.1 <-> Q1.2 <-> R6.2
-	C4.2 <-> IC1.3 <-> R8.2
-	C5.2 <-> C6.1 <-> IC1.1
-	C6.2 <-> R10.2
-	C7.1 <-> D2.1 <-> D3.2 <-> R10.1 <-> R11.1 <-> R13.1
-	C8.1 <-> R13.2
-	C9.1 <-> R11.2
-	C9.2 <-> R12.2
-	IC1.7 <-> R14.1 <-> R15.1
-	Q1.3 <-> R3.1 <-> R4.2
+	C1.1 <-> R1.2 <-> R16.1 <-> R2.1 <-> R4.1 <-> R5.1 <-> R8.1 <-> Rled.2
+	C1.2 <-> C11.2 <-> C12.1 <-> C12.2 <-> C14.2 <-> C3.2 <-> C7.2 <-> C8.1 <-> C8.2 <-> D1.1 <-> D2.2 <-> D3.1 <-> IC1.4 <-> IC1.8 <-> Q1.3 <-> R12.1 <-> R13.2 <-> R16.2 <-> R18.1 <-> R19.1 <-> R2.2 <-> R3.1 <-> R4.2 <-> R5.2 <-> R6.1
+	C10.1 <-> C10.2 <-> C11.1 <-> C14.1 <-> C4.1 <-> C5.2 <-> C6.1 <-> D1.2 <-> IC1.1 <-> IC1.5 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R15.2 <-> R17.1 <-> R18.2 <-> R6.2 <-> Rled.1
+	C13.1 <-> C13.2 <-> C2.2 <-> C3.1 <-> C5.1 <-> C7.1 <-> D2.1 <-> D3.2 <-> IC1.2 <-> IC1.6 <-> R10.1 <-> R11.1 <-> R13.1 <-> R14.2 <-> R19.2 <-> R7.1
+	C2.1 <-> C4.2 <-> IC1.3 <-> IC1.7 <-> R14.1 <-> R15.1 <-> R17.2 <-> R3.2 <-> R8.2
+	C6.2 <-> C9.1 <-> C9.2 <-> R10.2 <-> R11.2 <-> R12.2 <-> R7.2
 
diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_excl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_excl_switches.txt
index b7e36d0e..17382325 100644
--- a/diylc-regression-data/input/v1/netlist/sparkle_boost_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_excl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1
+	C1.1 <-> C2.2 <-> R1.1
+	C1.2 <-> C3.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.1
 	C2.1 <-> R3.1
 	C3.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
-	C3.2 <-> R4.1
 	R1.2 <-> R2.2 <-> R3.2 <-> R4.2
 
diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_incl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_incl_switches.txt
index b7e36d0e..17382325 100644
--- a/diylc-regression-data/input/v1/netlist/sparkle_boost_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_incl_switches.txt
@@ -1,9 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
-	C1.2 <-> Q1.2 <-> Q1.3 <-> R2.1
+	C1.1 <-> C2.2 <-> R1.1
+	C1.2 <-> C3.2 <-> Q1.2 <-> Q1.3 <-> R2.1 <-> R4.1
 	C2.1 <-> R3.1
 	C3.1 <-> Q1.1 <-> VR1.2 <-> VR1.3
-	C3.2 <-> R4.1
 	R1.2 <-> R2.2 <-> R3.2 <-> R4.2
 
diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_excl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_excl_switches.txt
index 141e5cfc..60e80999 100644
--- a/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_excl_switches.txt
@@ -2,7 +2,6 @@ Switch setup: [Default]
 
 	C1.1 <-> R1.2
 	C1.2 <-> Q1.3 <-> R2.2
-	C1.2 <-> R2.2
 	C2.1 <-> R3.2
 	C3.1 <-> Q1.1 <-> Q1.2 <-> VR1.3
 	C3.2 <-> R4.1
diff --git a/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_incl_switches.txt b/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_incl_switches.txt
index 141e5cfc..60e80999 100644
--- a/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/sparkle_boost_pcb_incl_switches.txt
@@ -2,7 +2,6 @@ Switch setup: [Default]
 
 	C1.1 <-> R1.2
 	C1.2 <-> Q1.3 <-> R2.2
-	C1.2 <-> R2.2
 	C2.1 <-> R3.2
 	C3.1 <-> Q1.1 <-> Q1.2 <-> VR1.3
 	C3.2 <-> R4.1
diff --git a/diylc-regression-data/input/v1/netlist/super_hard_on_excl_switches.txt b/diylc-regression-data/input/v1/netlist/super_hard_on_excl_switches.txt
index 57a2c24f..e0601ec4 100644
--- a/diylc-regression-data/input/v1/netlist/super_hard_on_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/super_hard_on_excl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> R1.2 <-> R2.1
 	C1.2 <-> R3.1 <-> R5.1
-	C2.2 <-> D1.2 <-> Q1.3 <-> R3.2 <-> R4.2
-	C3.1 <-> R2.2 <-> R4.1
-	C3.2 <-> R5.2
+	C2.1 <-> C2.2 <-> D1.2 <-> Q1.3 <-> R3.2 <-> R4.2
+	C3.1 <-> C3.2 <-> R2.2 <-> R4.1 <-> R5.2
 	D1.1 <-> Q1.1 <-> Q1.2
-	R1.2 <-> R2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/super_hard_on_incl_switches.txt b/diylc-regression-data/input/v1/netlist/super_hard_on_incl_switches.txt
index 57a2c24f..e0601ec4 100644
--- a/diylc-regression-data/input/v1/netlist/super_hard_on_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/super_hard_on_incl_switches.txt
@@ -1,10 +1,8 @@
 Switch setup: [Default]
 
-	C1.1 <-> R1.1
+	C1.1 <-> R1.1 <-> R1.2 <-> R2.1
 	C1.2 <-> R3.1 <-> R5.1
-	C2.2 <-> D1.2 <-> Q1.3 <-> R3.2 <-> R4.2
-	C3.1 <-> R2.2 <-> R4.1
-	C3.2 <-> R5.2
+	C2.1 <-> C2.2 <-> D1.2 <-> Q1.3 <-> R3.2 <-> R4.2
+	C3.1 <-> C3.2 <-> R2.2 <-> R4.1 <-> R5.2
 	D1.1 <-> Q1.1 <-> Q1.2
-	R1.2 <-> R2.1
 
diff --git a/diylc-regression-data/input/v1/netlist/tb_mk2_pro_excl_switches.txt b/diylc-regression-data/input/v1/netlist/tb_mk2_pro_excl_switches.txt
index c0e41260..8cf3838e 100644
--- a/diylc-regression-data/input/v1/netlist/tb_mk2_pro_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/tb_mk2_pro_excl_switches.txt
@@ -2,11 +2,9 @@ Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R1.1
 	C1.2 <-> C4.1
-	C2.1 <-> C3.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2
+	C2.1 <-> C3.1 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R5.1 <-> R6.2
 	C2.2 <-> C4.2 <-> R2.1 <-> R3.1 <-> R5.2
-	C5.2 <-> R5.1 <-> R6.2
-	C6.1 <-> Q2.3 <-> R4.1
-	C6.2 <-> R2.2
-	Q3.1 <-> Q3.2 <-> R4.2
+	C3.2 <-> C6.2 <-> R2.2
+	C5.1 <-> C6.1 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R4.1 <-> R4.2
 	Q3.3 <-> R3.2
 
diff --git a/diylc-regression-data/input/v1/netlist/tb_mk2_pro_incl_switches.txt b/diylc-regression-data/input/v1/netlist/tb_mk2_pro_incl_switches.txt
index c0e41260..8cf3838e 100644
--- a/diylc-regression-data/input/v1/netlist/tb_mk2_pro_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/tb_mk2_pro_incl_switches.txt
@@ -2,11 +2,9 @@ Switch setup: [Default]
 
 	C1.1 <-> Q1.3 <-> R1.1
 	C1.2 <-> C4.1
-	C2.1 <-> C3.1 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2
+	C2.1 <-> C3.1 <-> C5.2 <-> Q1.1 <-> Q1.2 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R5.1 <-> R6.2
 	C2.2 <-> C4.2 <-> R2.1 <-> R3.1 <-> R5.2
-	C5.2 <-> R5.1 <-> R6.2
-	C6.1 <-> Q2.3 <-> R4.1
-	C6.2 <-> R2.2
-	Q3.1 <-> Q3.2 <-> R4.2
+	C3.2 <-> C6.2 <-> R2.2
+	C5.1 <-> C6.1 <-> Q2.3 <-> Q3.1 <-> Q3.2 <-> R4.1 <-> R4.2
 	Q3.3 <-> R3.2
 
diff --git a/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_excl_switches.txt b/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_excl_switches.txt
index c8780db9..7a53fe06 100644
--- a/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_excl_switches.txt
@@ -1,8 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> R1.1 <-> R2.2
-	C2.2 <-> C3.2 <-> Q2.3 <-> R3.2
-	C3.1 <-> C4.2 <-> Q1.3 <-> R4.2
+	C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> Q1.3 <-> R4.2
+	C2.2 <-> C3.2 <-> C5.2 <-> Q2.3 <-> R3.2
 	C4.1 <-> R1.2
 	C5.1 <-> Q2.1 <-> Q2.2
 	Q1.1 <-> Q1.2 <-> R3.1
diff --git a/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_incl_switches.txt b/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_incl_switches.txt
index c8780db9..7a53fe06 100644
--- a/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/tonebender_mk2_reissue_incl_switches.txt
@@ -1,8 +1,8 @@
 Switch setup: [Default]
 
 	C1.1 <-> R1.1 <-> R2.2
-	C2.2 <-> C3.2 <-> Q2.3 <-> R3.2
-	C3.1 <-> C4.2 <-> Q1.3 <-> R4.2
+	C1.2 <-> C2.1 <-> C3.1 <-> C4.2 <-> Q1.3 <-> R4.2
+	C2.2 <-> C3.2 <-> C5.2 <-> Q2.3 <-> R3.2
 	C4.1 <-> R1.2
 	C5.1 <-> Q2.1 <-> Q2.2
 	Q1.1 <-> Q1.2 <-> R3.1
diff --git a/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_excl_switches.txt b/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_excl_switches.txt
index dce22b56..738352e5 100644
--- a/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_excl_switches.txt
@@ -1,14 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> R2.2
-	C1.2 <-> Q1.3 <-> R7.1
-	C2.1 <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R9.2
-	C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R8.2
-	C3.1 <-> Q2.1 <-> R4.1 <-> R6.1
+	C1.1 <-> C2.1 <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R2.2 <-> R9.2
+	C1.2 <-> C4.2 <-> Q1.3 <-> R11.2 <-> R7.1
+	C2.2 <-> C3.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R4.1 <-> R6.1 <-> R8.2
 	C3.2 <-> C4.1 <-> D1.1 <-> D2.2
-	C4.2 <-> R11.2
 	C5.1 <-> R5.2 <-> R6.2
-	Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2
-	R1.1 <-> R2.1
-	R7.2 <-> R8.1 <-> R9.1
+	Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.1
+	R1.1 <-> R2.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_incl_switches.txt b/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_incl_switches.txt
index dce22b56..738352e5 100644
--- a/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/univox_squarewave_fuzz_incl_switches.txt
@@ -1,14 +1,10 @@
 Switch setup: [Default]
 
-	C1.1 <-> R2.2
-	C1.2 <-> Q1.3 <-> R7.1
-	C2.1 <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R9.2
-	C2.2 <-> C5.2 <-> D1.2 <-> D2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R8.2
-	C3.1 <-> Q2.1 <-> R4.1 <-> R6.1
+	C1.1 <-> C2.1 <-> Q2.2 <-> Q2.3 <-> R10.1 <-> R2.2 <-> R9.2
+	C1.2 <-> C4.2 <-> Q1.3 <-> R11.2 <-> R7.1
+	C2.2 <-> C3.1 <-> C5.2 <-> D1.2 <-> D2.1 <-> Q2.1 <-> R1.2 <-> R10.2 <-> R3.2 <-> R4.1 <-> R6.1 <-> R8.2
 	C3.2 <-> C4.1 <-> D1.1 <-> D2.2
-	C4.2 <-> R11.2
 	C5.1 <-> R5.2 <-> R6.2
-	Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2
-	R1.1 <-> R2.1
-	R7.2 <-> R8.1 <-> R9.1
+	Q1.1 <-> Q1.2 <-> R3.1 <-> R4.2 <-> R7.2 <-> R8.1 <-> R9.1
+	R1.1 <-> R2.1 <-> R5.1
 
diff --git a/diylc-regression-data/input/v1/netlist/voltage_doubler_excl_switches.txt b/diylc-regression-data/input/v1/netlist/voltage_doubler_excl_switches.txt
index 856354dd..d9436bbf 100644
--- a/diylc-regression-data/input/v1/netlist/voltage_doubler_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/voltage_doubler_excl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.2
-	C1.2 <-> D1.1 <-> D2.2
-	C2.1 <-> D1.2
-	C2.2 <-> DP.1 <-> IC1.3 <-> IC1.8
+	C1.1 <-> IC1.2 <-> IC1.6
+	C1.2 <-> C2.1 <-> D1.1 <-> D1.2 <-> D2.2
+	C2.2 <-> DP.1 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8
 	D2.1 <-> DP.2 <-> IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/v1/netlist/voltage_doubler_incl_switches.txt b/diylc-regression-data/input/v1/netlist/voltage_doubler_incl_switches.txt
index 856354dd..d9436bbf 100644
--- a/diylc-regression-data/input/v1/netlist/voltage_doubler_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/voltage_doubler_incl_switches.txt
@@ -1,8 +1,7 @@
 Switch setup: [Default]
 
-	C1.1 <-> IC1.2
-	C1.2 <-> D1.1 <-> D2.2
-	C2.1 <-> D1.2
-	C2.2 <-> DP.1 <-> IC1.3 <-> IC1.8
+	C1.1 <-> IC1.2 <-> IC1.6
+	C1.2 <-> C2.1 <-> D1.1 <-> D1.2 <-> D2.2
+	C2.2 <-> DP.1 <-> IC1.3 <-> IC1.4 <-> IC1.7 <-> IC1.8
 	D2.1 <-> DP.2 <-> IC1.1 <-> IC1.5
 
diff --git a/diylc-regression-data/input/v1/netlist/vox_treble_booster_excl_switches.txt b/diylc-regression-data/input/v1/netlist/vox_treble_booster_excl_switches.txt
index b2bc5efb..8b0f00bc 100644
--- a/diylc-regression-data/input/v1/netlist/vox_treble_booster_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/vox_treble_booster_excl_switches.txt
@@ -5,6 +5,6 @@ Switch setup: [Default]
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1
 	C2.2 <-> R4.2 <-> R5.2 <-> R6.2
 	C3.1 <-> R3.2
-	R1.1 <-> R2.1
+	C3.2 <-> R1.1 <-> R2.1
 	R2.2 <-> R3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/vox_treble_booster_incl_switches.txt b/diylc-regression-data/input/v1/netlist/vox_treble_booster_incl_switches.txt
index b2bc5efb..8b0f00bc 100644
--- a/diylc-regression-data/input/v1/netlist/vox_treble_booster_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/vox_treble_booster_incl_switches.txt
@@ -5,6 +5,6 @@ Switch setup: [Default]
 	C2.1 <-> Q1.1 <-> Q1.2 <-> R5.1
 	C2.2 <-> R4.2 <-> R5.2 <-> R6.2
 	C3.1 <-> R3.2
-	R1.1 <-> R2.1
+	C3.2 <-> R1.1 <-> R2.1
 	R2.2 <-> R3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/wooly_mastodon_excl_switches.txt b/diylc-regression-data/input/v1/netlist/wooly_mastodon_excl_switches.txt
index 04078028..23a32d26 100644
--- a/diylc-regression-data/input/v1/netlist/wooly_mastodon_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/wooly_mastodon_excl_switches.txt
@@ -1,15 +1,11 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.2 <-> Q1.3 <-> R2.2
-	C2.1 <-> C4.1 <-> Output.3 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> Wool.2 <-> Wool.3
-	C3.1 <-> C5.2 <-> R4.1
+	C1.1 <-> C2.2 <-> C6.2 <-> Pinch.2 <-> Pinch.3 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2
+	C1.2 <-> C6.1 <-> Q2.3 <-> R3.1 <-> Wool.1
+	C2.1 <-> C3.1 <-> C4.1 <-> C5.2 <-> Output.3 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R4.1 <-> Wool.2 <-> Wool.3
 	C3.2 <-> EQ.1 <-> R5.2
 	C4.2 <-> EQ.3 <-> R6.2
-	C5.1 <-> R5.1 <-> R6.1
-	C6.1 <-> Wool.1
-	C6.2 <-> Pinch.2 <-> Pinch.3 <-> Q2.1 <-> Q2.2 <-> R1.2
+	C5.1 <-> R3.2 <-> R4.2 <-> R5.1 <-> R6.1
 	EQ.2 <-> Output.2
 	Pinch.1 <-> R2.1
-	Q2.3 <-> R3.1
-	R3.2 <-> R4.2
 
diff --git a/diylc-regression-data/input/v1/netlist/wooly_mastodon_incl_switches.txt b/diylc-regression-data/input/v1/netlist/wooly_mastodon_incl_switches.txt
index 04078028..23a32d26 100644
--- a/diylc-regression-data/input/v1/netlist/wooly_mastodon_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/wooly_mastodon_incl_switches.txt
@@ -1,15 +1,11 @@
 Switch setup: [Default]
 
-	C1.1 <-> C2.2 <-> Q1.3 <-> R2.2
-	C2.1 <-> C4.1 <-> Output.3 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> Wool.2 <-> Wool.3
-	C3.1 <-> C5.2 <-> R4.1
+	C1.1 <-> C2.2 <-> C6.2 <-> Pinch.2 <-> Pinch.3 <-> Q1.3 <-> Q2.1 <-> Q2.2 <-> R1.2 <-> R2.2
+	C1.2 <-> C6.1 <-> Q2.3 <-> R3.1 <-> Wool.1
+	C2.1 <-> C3.1 <-> C4.1 <-> C5.2 <-> Output.3 <-> Q1.1 <-> Q1.2 <-> R1.1 <-> R4.1 <-> Wool.2 <-> Wool.3
 	C3.2 <-> EQ.1 <-> R5.2
 	C4.2 <-> EQ.3 <-> R6.2
-	C5.1 <-> R5.1 <-> R6.1
-	C6.1 <-> Wool.1
-	C6.2 <-> Pinch.2 <-> Pinch.3 <-> Q2.1 <-> Q2.2 <-> R1.2
+	C5.1 <-> R3.2 <-> R4.2 <-> R5.1 <-> R6.1
 	EQ.2 <-> Output.2
 	Pinch.1 <-> R2.1
-	Q2.3 <-> R3.1
-	R3.2 <-> R4.2
 
diff --git a/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_excl_switches.txt b/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_excl_switches.txt
index c095aa64..100ccd6b 100644
--- a/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_excl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_excl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
+	C1.1 <-> C2.1 <-> R2.1 <-> R3.1
 	C1.2 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.2
 	C2.2 <-> Q1.1 <-> R3.2
 	R1.2 <-> R4.2
-	R2.1 <-> R3.1
 
diff --git a/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_incl_switches.txt b/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_incl_switches.txt
index c095aa64..100ccd6b 100644
--- a/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_incl_switches.txt
+++ b/diylc-regression-data/input/v1/netlist/yuns_rocket_boost_incl_switches.txt
@@ -1,7 +1,7 @@
 Switch setup: [Default]
 
+	C1.1 <-> C2.1 <-> R2.1 <-> R3.1
 	C1.2 <-> Q1.2 <-> Q1.3 <-> R1.1 <-> R2.2
 	C2.2 <-> Q1.1 <-> R3.2
 	R1.2 <-> R4.2
-	R2.1 <-> R3.1
 
diff --git a/diylc-regression-data/input/v1/png/12v_supply.png b/diylc-regression-data/input/v1/png/12v_supply.png
index 960187a8..a54703bd 100644
Binary files a/diylc-regression-data/input/v1/png/12v_supply.png and b/diylc-regression-data/input/v1/png/12v_supply.png differ
diff --git a/diylc-regression-data/input/v1/png/9V_supply_regulated.png b/diylc-regression-data/input/v1/png/9V_supply_regulated.png
index dc57277b..1fa045bd 100644
Binary files a/diylc-regression-data/input/v1/png/9V_supply_regulated.png and b/diylc-regression-data/input/v1/png/9V_supply_regulated.png differ
diff --git a/diylc-regression-data/input/v1/png/axis_face_silicon_v3.png b/diylc-regression-data/input/v1/png/axis_face_silicon_v3.png
index a984b7a7..ee8fdcad 100644
Binary files a/diylc-regression-data/input/v1/png/axis_face_silicon_v3.png and b/diylc-regression-data/input/v1/png/axis_face_silicon_v3.png differ
diff --git a/diylc-regression-data/input/v1/png/b_blender.png b/diylc-regression-data/input/v1/png/b_blender.png
index 2b4b21da..94803042 100644
Binary files a/diylc-regression-data/input/v1/png/b_blender.png and b/diylc-regression-data/input/v1/png/b_blender.png differ
diff --git a/diylc-regression-data/input/v1/png/blues_breaker.png b/diylc-regression-data/input/v1/png/blues_breaker.png
index 3c2b0eeb..0f40f67b 100644
Binary files a/diylc-regression-data/input/v1/png/blues_breaker.png and b/diylc-regression-data/input/v1/png/blues_breaker.png differ
diff --git a/diylc-regression-data/input/v1/png/boss_oc-2_tb.png b/diylc-regression-data/input/v1/png/boss_oc-2_tb.png
index da0f761a..52b14ddf 100644
Binary files a/diylc-regression-data/input/v1/png/boss_oc-2_tb.png and b/diylc-regression-data/input/v1/png/boss_oc-2_tb.png differ
diff --git a/diylc-regression-data/input/v1/png/drive_master_tone_bb.png b/diylc-regression-data/input/v1/png/drive_master_tone_bb.png
index 85903e58..b0a3726a 100644
Binary files a/diylc-regression-data/input/v1/png/drive_master_tone_bb.png and b/diylc-regression-data/input/v1/png/drive_master_tone_bb.png differ
diff --git a/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png b/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png
index 81e0acbc..fa89d4ce 100644
Binary files a/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png and b/diylc-regression-data/input/v1/png/mi_audio_crunch_box.png differ
diff --git a/diylc-regression-data/input/v1/png/slacktrem.png b/diylc-regression-data/input/v1/png/slacktrem.png
index 63bd8384..89a22dd3 100644
Binary files a/diylc-regression-data/input/v1/png/slacktrem.png and b/diylc-regression-data/input/v1/png/slacktrem.png differ
diff --git a/diylc-regression-data/reports/2022-11-24T18_46_47.260-V4_34_0.csv b/diylc-regression-data/reports/2022-11-24T18_46_47.260-V4_34_0.csv
new file mode 100644
index 00000000..99d18144
--- /dev/null
+++ b/diylc-regression-data/reports/2022-11-24T18_46_47.260-V4_34_0.csv
@@ -0,0 +1,17 @@
+OK,Failed,Total Time,Avg Time
+0,12,15625,1302
+
+
+File,Status,Message,Time
+IIc+.diy,FAILED,Images do not match!,4974
+deacy.diy,FAILED,Images do not match!,1567
+jfet boost.diy,FAILED,,0
+lp switch + pots.diy,FAILED,,0
+rangemaster.diy,FAILED,Images do not match!,442
+ruby.diy,FAILED,Images do not match!,629
+slo2.diy,FAILED,Images do not match!,3731
+splitter2.diy,FAILED,,0
+standard strat.diy,FAILED,,0
+tda1521a-2.diy,FAILED,Images do not match!,1659
+timmy7.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,2623
+travelcaster3 (new format).diy,FAILED,,0
diff --git a/diylc-regression-data/reports/2022-11-24T20_50_02.385-V4_34_0.csv b/diylc-regression-data/reports/2022-11-24T20_50_02.385-V4_34_0.csv
new file mode 100644
index 00000000..19593acd
--- /dev/null
+++ b/diylc-regression-data/reports/2022-11-24T20_50_02.385-V4_34_0.csv
@@ -0,0 +1,39 @@
+OK,Failed,Total Time,Avg Time
+0,34,174365,5128
+
+
+File,Status,Message,Time
+2555X BOARD LAYOUT RESaddTSRELAYnew.diy,FAILED,Netlists do not match without switches,26557
+6Y6 Express 2.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,8051
+ALU board with interface.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,3024
+AllTube Schem.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,11946
+Blue 7.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,1420
+BrownfaceReverb Schematic 2.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,5069
+Bus decoder board (RL,Z2,Z1,Z0).diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,2879
+DR18Tagstrip.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,17709
+Deluxe_Micro_EF80_Layout.diy,FAILED,,0
+Fender_Bassman_5F6_5F6A.diy,FAILED,,0
+Ibanez Balance-Master Mod.diy,FAILED,,0
+LM386 Voltage Converter.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,3796
+LargeBandMaster.diy,FAILED,Netlists do not match without switches,42525
+Lectrolab schematic.diy,FAILED,,0
+PCF DI Cable Diagram.diy,FAILED,,0
+ProTremoVerb Schematic.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,3022
+RAM board 2.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,2951
+RR2104_Master_Volume_6V6_Schematic.diy,FAILED,,0
+Radio Amp Noval.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,2994
+Register board (LSB).diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,2825
+Rix 18 watt.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,1370
+Rix AC15 Xlite.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,1012
+Rix Baby Blue.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,1119
+Rix Bassman.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,2777
+Rix JD stout.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,923
+Rix Junior AB763.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,1281
+Rix Junior.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,1182
+Rix Plexi 6V6.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,1750
+Rix Pro Jr.diy,FAILED,Images do not match!;Netlists do not match with switches;Netlists do not match without switches,1199
+Silvertone 1484 v6f.diy,FAILED,Images do not match!,16551
+Stack Pointer board.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,2115
+Synth Oscllator_v1.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,2831
+Thunderbolt Mk3.diy,FAILED,Netlists do not match with switches;Netlists do not match without switches,667
+dist_layout.diy,FAILED,Images do not match!,4820
diff --git a/diylc/diylc-swing/RegressionTestRunner.launch b/diylc/diylc-swing/RegressionTestRunner.launch
index fd6e2fd5..03b095db 100644
--- a/diylc/diylc-swing/RegressionTestRunner.launch
+++ b/diylc/diylc-swing/RegressionTestRunner.launch
@@ -9,7 +9,7 @@
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.diylc.RegressionTestRunner"/>
 <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="diylc-swing"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="&quot;C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc-regression-data&quot; TEST diy-fever"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="&quot;C:\Users\bancika\Documents\GitHub\diy-layout-creator\diylc-regression-data&quot; PREPARE"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="diylc-swing"/>
 <stringAttribute key="yk-options" value="&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>
 </launchConfiguration>
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index 68b8515b..4302820b 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ