diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 2fd7a71..1355d49 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
-	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="dre [NBDELP3561-04C]" ModDate="2023-09-21T10:09:58" LanguageVersion="2014.1.3.596" />
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="dre [NBDELP3561-04C]" ModDate="2023-09-21T11:20:22" LanguageVersion="2014.1.3.596" />
 	<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
 		<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
 			<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -3453,6 +3453,41 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 							</SET>
 						</WHILELOOP>
 					</FUNCTION>
+					<FUNCTION Id="RDK:1119726" Name="CleanUPCPs">
+						<GROUP Id="RDK:1092891" Name="Local Variables" SubType="VarSet" IncludeDate="0">
+							<VAR Id="RDK:1092894" Name="LinksToRemove" Type="string[]" />
+						</GROUP>
+						<FOREACHLOOP Id="RDK:1081551" ItemVarRef="link" ByRefMode="True">
+							<PAR Name="ArrayValueExp">
+								<EXP><![CDATA[$=$Shape_Prototype.links]]></EXP>
+							</PAR>
+							<PAR Name="ExitCondExp">
+								<EXP><![CDATA[$V$]]></EXP>
+							</PAR>
+							<IFTHENELSE Id="RDK:1081552">
+								<VALUECONDITION Value="true" Oper="OR">
+									<EXP><![CDATA[$=$Count(FilterByFieldValue(FilterByFieldValue(Shape_Prototype.KreiselDefinition.M_Strecke, "id", StrBefore(link, "_")), "aktiv", false))>0
+]]></EXP>
+								</VALUECONDITION>
+								<VALUECONDITION Value="true">
+									<EXP><![CDATA[$=$Count(FilterByFieldValue(FilterByFieldValue(Shape_Prototype.KreiselDefinition.S_Strecke, "id", StrBefore(link, "_")), "aktiv", false))>0
+]]></EXP>
+								</VALUECONDITION>
+								<GROUP Id="RDK:1081553" SubType="Then">
+									<REMOVE_ADD Id="RDK:1081567" ListRef="ShapeList" Expr="Me.source=&quot;link-line&quot; &#xA;And&#xA;((Me.shapeFromId=StrAfter(link, &quot;;&quot;) And Me.shapeToId=Shape_Prototype.id)&#xA;OR&#xA;(Me.shapeToId=StrAfter(link, &quot;;&quot;) AND Me.shapeFromId=Shape_Prototype.id))&#xA;&#xA;">
+										<EXP />
+									</REMOVE_ADD>
+									<REMOVE_ADD Id="RDK:1081569" ListRef="ShapeList" Expr="Me.family=&quot;Weiche&quot; &#xA;And&#xA;((Me.shapeFromId=StrAfter(link, &quot;;&quot;) And Me.shapeToId=Shape_Prototype.id)&#xA;OR&#xA;(Me.shapeToId=StrAfter(link, &quot;;&quot;) AND Me.shapeFromId=Shape_Prototype.id))&#xA;">
+										<EXP />
+									</REMOVE_ADD>
+									<REMOVE_ADD Id="RDK:1106048" ListRef="ShapeList[&quot;id=&quot;+Shape_Prototype.id].links">
+										<EXP><![CDATA[$=$IndexOf(ShapeList["id="+Shape_Prototype.id].links, link)]]></EXP>
+									</REMOVE_ADD>
+								</GROUP>
+								<GROUP Id="RDK:1081554" SubType="Else" />
+							</IFTHENELSE>
+						</FOREACHLOOP>
+					</FUNCTION>
 				</GROUP>
 				<FUNCTION Id="RDK:900059" Name="GetPlanquadratPosition">
 					<GROUP Id="RDK:900057" Name="Local Variables" SubType="VarSet" IncludeDate="0">
@@ -4745,38 +4780,16 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2)
 								</PAR>
 								<PAR Name="Options" />
 							</CALLFUNCTION>
-							<GROUP Id="RDK:1081548" Name="CleanUPCPs" SubType="Generic">
-								<FOREACHLOOP Id="RDK:1081551" ItemVarRef="link" ByRefMode="True">
-									<PAR Name="ArrayValueExp">
-										<EXP><![CDATA[$=$Shape_Prototype.links]]></EXP>
-									</PAR>
-									<PAR Name="ExitCondExp">
-										<EXP><![CDATA[$V$]]></EXP>
-									</PAR>
-									<IFTHENELSE Id="RDK:1081552">
-										<VALUECONDITION Value="true" Oper="OR">
-											<EXP><![CDATA[$=$Count(FilterByFieldValue(FilterByFieldValue(Shape_Prototype.KreiselDefinition.M_Strecke, "id", StrBefore(link, "_")), "aktiv", false))>0
-]]></EXP>
-										</VALUECONDITION>
-										<VALUECONDITION Value="true">
-											<EXP><![CDATA[$=$Count(FilterByFieldValue(FilterByFieldValue(Shape_Prototype.KreiselDefinition.S_Strecke, "id", StrBefore(link, "_")), "aktiv", false))>0
-]]></EXP>
-										</VALUECONDITION>
-										<GROUP Id="RDK:1081553" SubType="Then">
-											<REMOVE_ADD Id="RDK:1081567" ListRef="ShapeList" Expr="Me.source=&quot;link-line&quot; &#xA;And&#xA;(Me.shapeFromId=StrAfter(link, &quot;;&quot;)&#xA;OR&#xA;Me.shapeToId=StrAfter(link, &quot;;&quot;))&#xA;">
-												<EXP />
-											</REMOVE_ADD>
-											<REMOVE_ADD Id="RDK:1081569" ListRef="ShapeList" Expr="Me.source=&quot;s_weiche_aktiv&quot; &#xA;And&#xA;(Me.shapeFromId=StrAfter(link, &quot;;&quot;)&#xA;OR&#xA;Me.shapeToId=StrAfter(link, &quot;;&quot;))&#xA;">
-												<EXP />
-											</REMOVE_ADD>
-											<REMOVE_ADD Id="RDK:1081571" Suppressed="True" ListRef="Shape_Prototype.links" Value="$=$link">
-												<EXP />
-											</REMOVE_ADD>
-										</GROUP>
-										<GROUP Id="RDK:1081554" SubType="Else" />
-									</IFTHENELSE>
-								</FOREACHLOOP>
-							</GROUP>
+							<CALLFUNCTION Id="RDK:1119727">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$CleanUPCPs]]></EXP>
+								</PAR>
+								<PAR Name="InputExp" />
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
 							<GROUP Id="RDK:629944" Name="Group" SubType="Generic">
 								<VALUECONDITION Value="true">
 									<EXP><![CDATA[$=$Param.Input="OnDoubleclick"]]></EXP>