diff --git a/OMCompiler/Compiler/NFFrontEnd/NFInst.mo b/OMCompiler/Compiler/NFFrontEnd/NFInst.mo
index d218ac6f51e..5b654351c52 100644
--- a/OMCompiler/Compiler/NFFrontEnd/NFInst.mo
+++ b/OMCompiler/Compiler/NFFrontEnd/NFInst.mo
@@ -126,6 +126,8 @@ algorithm
   end if;
 
   System.setUsesCardinality(false);
+  System.setHasOverconstrainedConnectors(false);
+  System.setHasStreamConnectors(false);
 
   // Create a root node from the given top-level classes.
   top := makeTopNode(program);
diff --git a/OMCompiler/Compiler/NFFrontEnd/NFTyping.mo b/OMCompiler/Compiler/NFFrontEnd/NFTyping.mo
index 7e23e883ebf..d7dd13da8db 100644
--- a/OMCompiler/Compiler/NFFrontEnd/NFTyping.mo
+++ b/OMCompiler/Compiler/NFFrontEnd/NFTyping.mo
@@ -395,6 +395,10 @@ algorithm
     end for;
 
     connectorTy := ComplexType.CONNECTOR(pots, flows, streams);
+
+    if not listEmpty(streams) then
+      System.setHasStreamConnectors(true);
+    end if;
   end if;
 end makeConnectorType;
 
@@ -2159,14 +2163,6 @@ algorithm
           typeComponentSections(InstNode.resolveOuter(c), origin);
         end for;
 
-        // we need to update the ClassTree and add the expandable virtual components from the connects
-        if System.getHasExpandableConnectors() then
-          // collect the expandable virtual components from the connect equations
-
-          // create the components inside the existing expandable connectors
-        end if;
-
-
         InstNode.updateClass(typed_cls, classNode);
       then
         ();