diff --git a/src/main/java/ui/eln/ELNPortTerminal.java b/src/main/java/ui/eln/ELNPortTerminal.java
index 5618d9ef8dbecb305d109e639dba58578844f8dc..1b45a1ed8cc03532313b1a1525fd63e061005785 100644
--- a/src/main/java/ui/eln/ELNPortTerminal.java
+++ b/src/main/java/ui/eln/ELNPortTerminal.java
@@ -86,7 +86,7 @@ public class ELNPortTerminal extends TGCScalableWithInternalComponent implements
 
 		moveable = false;
 		editable = true;
-		removable = true;
+		removable = false;
 		userResizable = false;
 
 		setValue("");
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java b/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
index 3af0c836d3ca35bd979a532811f48b10bfc7179a..5285825269d68a6155c3c15b5f164b50ddbda67f 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentCapacitor.java
@@ -733,11 +733,7 @@ public class ELNComponentCapacitor extends TGCScalableWithInternalComponent	impl
 	}
 
 	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
-		if (tgc instanceof ELNPortTerminal) {
-			return tgc instanceof ELNPortTerminal;
-		} else {
-			return true;
-		}
+		return tgc instanceof ELNPortTerminal;
 	}
 
 	public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java b/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
index d45222cf80d2e47f5d6f914dde17a93698bde585..ea065c544f8caafcf7d21481af9bb03e9ab22ee0 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIdealTransformer.java
@@ -1265,11 +1265,7 @@ public class ELNComponentIdealTransformer extends
 	}
 
 	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
-		if (tgc instanceof ELNPortTerminal) {
-			return tgc instanceof ELNPortTerminal;
-		} else {
-			return true;
-		}
+		return tgc instanceof ELNPortTerminal;
 	}
 
 	public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
index d0b808c68b9216709c1552d1eef21a516a57170e..2fa0c2ab9e20d215ec2d6fc03be6bcfe565e502e 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentCurrentSource.java
@@ -953,11 +953,7 @@ public class ELNComponentIndependentCurrentSource extends TGCScalableWithInterna
 	}
 
 	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
-		if (tgc instanceof ELNPortTerminal) {
-			return tgc instanceof ELNPortTerminal;
-		} else {
-			return true;
-		}
+		return tgc instanceof ELNPortTerminal;
 	}
 
 	public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
index 20d0d14ff85481ab6cca870aca62ae83680d8a40..1b53f373003e3535d03f6d5ab983bddd76c9d411 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentIndependentVoltageSource.java
@@ -1097,11 +1097,7 @@ public class ELNComponentIndependentVoltageSource extends
 	}
 
 	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
-		if (tgc instanceof ELNPortTerminal) {
-			return tgc instanceof ELNPortTerminal;
-		} else {
-			return true;
-		}
+		return tgc instanceof ELNPortTerminal;
 	}
 
 	public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java b/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
index c2d20528bf9949ae42912799ebab81bb834e3bf3..bbb5784c04b64a50b9dae69f6e93de0949f8c17c 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentInductor.java
@@ -758,11 +758,7 @@ public class ELNComponentInductor extends TGCScalableWithInternalComponent imple
 	}
 	
 	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
-		if (tgc instanceof ELNPortTerminal) {
-			return tgc instanceof ELNPortTerminal;
-		} else {
-			return true;
-		}
+		return tgc instanceof ELNPortTerminal;
 	}
 
 	public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java b/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
index 3f29e61e61c9a57368f1cfdaf683929a5d95b39d..87b9ff8ab24ca113ec377c395d4bfb00456c6cb0 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentResistor.java
@@ -710,11 +710,7 @@ public class ELNComponentResistor extends TGCScalableWithInternalComponent imple
 	}
 
 	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
-		if (tgc instanceof ELNPortTerminal) {
-			return tgc instanceof ELNPortTerminal;
-		} else {
-			return true;
-		}
+		return tgc instanceof ELNPortTerminal;
 	}
 
 	public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java b/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
index 74b8b3ae994563e7f416ed53fe686e8faaa33e4b..ce0d07df4de7f2cf2c0e59478737f22d94d3be10 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentTransmissionLine.java
@@ -1124,11 +1124,7 @@ public class ELNComponentTransmissionLine extends
 	}
 
 	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
-		if (tgc instanceof ELNPortTerminal) {
-			return tgc instanceof ELNPortTerminal;
-		} else {
-			return true;
-		}
+		return tgc instanceof ELNPortTerminal;
 	}
 
 	public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
index be2e935bab58dda68823edbd26ccedb43f2658af..f989a7e6d09304397acb03558f3f7a79c8268833 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledCurrentSource.java
@@ -1422,11 +1422,7 @@ public class ELNComponentVoltageControlledCurrentSource extends
 	}
 
 	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
-		if (tgc instanceof ELNPortTerminal) {
-			return tgc instanceof ELNPortTerminal;
-		} else {
-			return true;
-		}
+		return tgc instanceof ELNPortTerminal;
 	}
 
 	public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {
diff --git a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
index 93a5b22f19f7fa05d21853760535ddc9bb23df63..062209cb2d85d4a483fd73e4565704487ef57b02 100644
--- a/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
+++ b/src/main/java/ui/eln/sca_eln/ELNComponentVoltageControlledVoltageSource.java
@@ -1395,11 +1395,7 @@ public class ELNComponentVoltageControlledVoltageSource extends
 	}
 
 	public boolean acceptSwallowedTGComponent(TGComponent tgc) {
-		if (tgc instanceof ELNPortTerminal) {
-			return tgc instanceof ELNPortTerminal;
-		} else {
-			return true;
-		}
+		return tgc instanceof ELNPortTerminal;
 	}
 
 	public boolean addSwallowedTGComponent(TGComponent tgc, int x, int y) {