From 8600fcaa611f56e54f5f14b98eed4ad952c3be3a Mon Sep 17 00:00:00 2001
From: jelgerjansen <jelgerjansen@hotmail.com>
Date: Fri, 7 Feb 2025 12:02:51 +0100
Subject: [PATCH] Remove some more (obsolete) import statements

---
 .../Examples/StrobeInfoManager_offset.mo      |  6 ++++-
 .../Examples/ZoneLwGainDistribution.mo        |  6 ++++-
 .../Examples/HysteresisRelease_Cooling.mo     | 11 +++++++--
 .../Examples/HysteresisRelease_Heating.mo     | 11 +++++++--
 .../Distribution/AC/Components/Grid_3P.mo     |  7 +++---
 .../AC/Components/MvLvTransformer_1P.mo       | 23 +++++++++++++------
 .../AC/Components/MvLvTransformer_3P.mo       | 23 +++++++++++++------
 .../AC/Examples/Components/Transformer.mo     | 12 ++++++++--
 .../AC/Examples/TestGridGeneral1PEq.mo        |  8 +++++--
 .../Electric/Distribution/AC/Grid_1PEq.mo     | 23 +++++++++++++------
 .../Electric/Distribution/AC/Grid_3P.mo       | 23 +++++++++++++------
 .../Distribution/DC/Examples/TestGridDC.mo    | 12 ++++++++--
 .../Electric/Distribution/DC/GridDCGeneral.mo | 12 ++++++++--
 .../Examples/Components/Transformer.mo        | 12 ++++++++--
 .../Examples/TestGridAndPVFromFile.mo         |  7 +++++-
 .../Examples/TestGridAndPVSystemGeneral.mo    |  7 +++++-
 .../PvVoltageCtrlGeneral_InputVGrid_MovAvg.mo | 12 ++++++++--
 IDEAS/Experimental/Electric/package.mo        |  2 --
 .../Examples/ThreeWayValveSwitch.mo           |  6 ++++-
 IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo    |  2 +-
 IDEAS/Templates/Interfaces/package.mo         |  2 --
 IDEAS/Utilities/File/test.mo                  |  1 -
 22 files changed, 170 insertions(+), 58 deletions(-)
diff --git a/IDEAS/BoundaryConditions/Examples/StrobeInfoManager_offset.mo b/IDEAS/BoundaryConditions/Examples/StrobeInfoManager_offset.mo
index 78bfb1b40e..983d7d3ce0 100644
--- a/IDEAS/BoundaryConditions/Examples/StrobeInfoManager_offset.mo
+++ b/IDEAS/BoundaryConditions/Examples/StrobeInfoManager_offset.mo
@@ -1,7 +1,6 @@
 within IDEAS.BoundaryConditions.Examples;
 model StrobeInfoManager_offset
   "Unit test for SimInfoManager with time offset on read data"
-  import IDEAS;
   extends Modelica.Icons.Example;
   inner IDEAS.BoundaryConditions.Occupants.Extern.StrobeInfoManager strobe(
     nOcc=10,
@@ -26,6 +25,11 @@ model StrobeInfoManager_offset
     Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
 December 20, 2017 by Bram van der Heijde:<br/>
 First implementation.
 </li>
diff --git a/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/Examples/ZoneLwGainDistribution.mo b/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/Examples/ZoneLwGainDistribution.mo
index daacc2e399..f64cfd1220 100644
--- a/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/Examples/ZoneLwGainDistribution.mo
+++ b/IDEAS/Buildings/Components/BaseClasses/RadiativeHeatTransfer/Examples/ZoneLwGainDistribution.mo
@@ -1,6 +1,5 @@
 within IDEAS.Buildings.Components.BaseClasses.RadiativeHeatTransfer.Examples;
 model ZoneLwGainDistribution
-  import IDEAS;
   extends Modelica.Icons.Example;
   Modelica.Blocks.Sources.Ramp ramDir(
     duration=1,
@@ -90,6 +89,11 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
 January 19, 2017 by Filip Jorissen:<br/>
 First implementation
 </li>
diff --git a/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Cooling.mo b/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Cooling.mo
index b9f658da8d..cab6a86749 100644
--- a/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Cooling.mo
+++ b/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Cooling.mo
@@ -1,7 +1,6 @@
 within IDEAS.Controls.Discrete.Examples;
 model HysteresisRelease_Cooling
   "Example model for hysteresis with variable uLow and uHigh"
-  import IDEAS;
   extends Modelica.Icons.Example;
   IDEAS.Controls.Discrete.HysteresisRelease con(revert=false)
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
@@ -94,7 +93,15 @@ This example can be simulated with the \"simulate and plot\" command in the Comm
 </p>
 </html>", revisions="<html>
 <ul>
-<li>November 2014, Roel De Coninck and Damien Picard</li>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
+November, 2014, by Roel De Coninck and Damien Picard:<br/>
+First implementation.
+</li>
 </ul>
 </html>"));
 end HysteresisRelease_Cooling;
diff --git a/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Heating.mo b/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Heating.mo
index ca5e25775b..438ca174dc 100644
--- a/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Heating.mo
+++ b/IDEAS/Controls/Discrete/Examples/HysteresisRelease_Heating.mo
@@ -1,7 +1,6 @@
 within IDEAS.Controls.Discrete.Examples;
 model HysteresisRelease_Heating
   "Example model for hysteresis with variable uLow and uHigh"
-  import IDEAS;
   extends Modelica.Icons.Example;
   IDEAS.Controls.Discrete.HysteresisRelease con(revert=true)
     annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
@@ -94,7 +93,15 @@ temperature of the capacity between uLow and uHigh. This example can be simulate
 </p>
 </html>", revisions="<html>
 <ul>
-<li>November 2014, Roel De Coninck and Damien Picard</li>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
+November, 2014, by Roel De Coninck and Damien Picard:<br/>
+First implementation.
+</li>
 </ul>
 </html>"));
 end HysteresisRelease_Heating;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo b/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo
index 30f40a569b..38d1aa0ccb 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Components/Grid_3P.mo
@@ -41,7 +41,7 @@ protected
       Z) for i in 1:3};
   parameter Modelica.Units.SI.Reactance[3,Nodes] X3={Modelica.ComplexMath.imag(
       Z) for i in 1:3};
-  //  parameter Modelica.Units.SI.ComplexVoltage[3] Vsource3={Vsource*(cos(c.pi*2*i/3)+MCM.j*sin(c.pi*2*i/6)) for i in 1:3};
+  //  parameter Modelica.Units.SI.ComplexVoltage[3] Vsource3={Vsource*(cos(c.pi*2*i/3)+Modelica.ComplexMath.j*sin(c.pi*2*i/6)) for i in 1:3};
 
   //Absolute voltages at the nodes
   output Modelica.Units.SI.Voltage Vabs[3,Nodes];
@@ -163,11 +163,12 @@ equation
           color={85,170,255},
           smooth=Smooth.Bezier,
           pattern=LinePattern.Dash)}),
-    Documentation(revisions="<html>
+Documentation(revisions="<html>
 <ul>
 <li>
-February 4, 2025, by Jelger Jansen:<br/>
+February 7, 2025, by Jelger Jansen:<br/>
 Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
 </li>
 </ul>
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_1P.mo b/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_1P.mo
index 9743b8aff2..fa1c459b3f 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_1P.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_1P.mo
@@ -15,12 +15,12 @@ model MvLvTransformer_1P
     "Grid frequency: should normally not be changed when simulating belgian grids!";
   parameter Modelica.Units.SI.ComplexVoltage VSource=230 + 0*Modelica.ComplexMath.j
     "Voltage" annotation (choices(
-      choice=(230*1) + 0*MCM.j "100% at HVpin of transformer",
-      choice=(230*1.02) + 0*MCM.j "102% at HVpin of transformer",
-      choice=(230*1.05) + 0*MCM.j "105% at HVpin of transformer",
-      choice=(230*1.1) + 0*MCM.j "110% at HVpin of transformer",
-      choice=(230*0.95) + 0*MCM.j "95% at HVpin of transformer",
-      choice=(230*0.9) + 0*MCM.j "90% at HVpin of transformer"));
+      choice=(230*1) + 0* Modelica.ComplexMath.j "100% at HVpin of transformer",
+      choice=(230*1.02) + 0* Modelica.ComplexMath.j "102% at HVpin of transformer",
+      choice=(230*1.05) + 0* Modelica.ComplexMath.j "105% at HVpin of transformer",
+      choice=(230*1.1) + 0* Modelica.ComplexMath.j "110% at HVpin of transformer",
+      choice=(230*0.95) + 0* Modelica.ComplexMath.j "95% at HVpin of transformer",
+      choice=(230*0.9) + 0* Modelica.ComplexMath.j "90% at HVpin of transformer"));
 
   final parameter Modelica.Units.SI.HeatFlowRate traLosQRef=transformer.P0 +
       Modelica.ComplexMath.real(transformer.Zd)*(transformer.Sn/3/
@@ -212,5 +212,14 @@ equation
           points={{50,-60},{80,-60},{80,40},{140,40}},
           color={85,170,255},
           smooth=Smooth.None,
-          pattern=LinePattern.Dash)}));
+          pattern=LinePattern.Dash)}),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end MvLvTransformer_1P;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_3P.mo b/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_3P.mo
index 6484791dd1..d9feedf706 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_3P.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Components/MvLvTransformer_3P.mo
@@ -15,12 +15,12 @@ model MvLvTransformer_3P
     "Grid frequency: should normally not be changed when simulating belgian grids!";
   parameter Modelica.Units.SI.ComplexVoltage VSource=230 + 0*Modelica.ComplexMath.j
     "Voltage" annotation (choices(
-      choice=(230*1) + 0*MCM.j "100% at HVpin of transformer",
-      choice=(230*1.02) + 0*MCM.j "102% at HVpin of transformer",
-      choice=(230*1.05) + 0*MCM.j "105% at HVpin of transformer",
-      choice=(230*1.1) + 0*MCM.j "110% at HVpin of transformer",
-      choice=(230*0.95) + 0*MCM.j "95% at HVpin of transformer",
-      choice=(230*0.9) + 0*MCM.j "90% at HVpin of transformer"));
+      choice=(230*1) + 0* Modelica.ComplexMath.j "100% at HVpin of transformer",
+      choice=(230*1.02) + 0* Modelica.ComplexMath.j "102% at HVpin of transformer",
+      choice=(230*1.05) + 0* Modelica.ComplexMath.j "105% at HVpin of transformer",
+      choice=(230*1.1) + 0* Modelica.ComplexMath.j "110% at HVpin of transformer",
+      choice=(230*0.95) + 0* Modelica.ComplexMath.j "95% at HVpin of transformer",
+      choice=(230*0.9) + 0* Modelica.ComplexMath.j "90% at HVpin of transformer"));
 
   final parameter Modelica.Units.SI.HeatFlowRate traLosQRef=transformer.P0 +
       Modelica.ComplexMath.real(transformer.Zd)*(transformer.Sn/3/
@@ -316,5 +316,14 @@ Small changes.
         Line(
           points={{-60,-2},{-64,-10},{-68,-10},{-74,10}},
           color={0,0,0},
-          smooth=Smooth.None)}));
+          smooth=Smooth.None)})),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end MvLvTransformer_3P;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Examples/Components/Transformer.mo b/IDEAS/Experimental/Electric/Distribution/AC/Examples/Components/Transformer.mo
index 5d146d3bdc..f2e2d10b0c 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Examples/Components/Transformer.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Examples/Components/Transformer.mo
@@ -1,6 +1,5 @@
 within IDEAS.Experimental.Electric.Distribution.AC.Examples.Components;
 model Transformer
-  import IDEAS;
 
   parameter Modelica.Units.SI.Temperature THsRef=326.6;
   parameter Modelica.Units.SI.Temperature TToRef=314.44;
@@ -36,5 +35,14 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}), graphics));
+            -100},{100,100}}), graphics),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+</ul>
+</html>"));
 end Transformer;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Examples/TestGridGeneral1PEq.mo b/IDEAS/Experimental/Electric/Distribution/AC/Examples/TestGridGeneral1PEq.mo
index 74288e1a62..0eae639d5d 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Examples/TestGridGeneral1PEq.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Examples/TestGridGeneral1PEq.mo
@@ -1,7 +1,6 @@
 within IDEAS.Experimental.Electric.Distribution.AC.Examples;
 model TestGridGeneral1PEq
-  import IDEAS;
-    extends Modelica.Icons.Example;
+  extends Modelica.Icons.Example;
   IDEAS.Experimental.Electric.Distribution.AC.Examples.Components.SinePower
     risingflankSingle1(amplitude=12000)
     annotation (Placement(transformation(extent={{40,0},{60,20}})));
@@ -27,6 +26,11 @@ equation
             graphics), Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
 May 22, 2022, by Filip Jorissen:<br/>
 Removed experiment annotation to avoid failing OMC tests.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Grid_1PEq.mo b/IDEAS/Experimental/Electric/Distribution/AC/Grid_1PEq.mo
index 873494567a..0ed94a0c98 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Grid_1PEq.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Grid_1PEq.mo
@@ -13,12 +13,12 @@ public
 
   parameter Modelica.Units.SI.ComplexVoltage VSource=230 + 0*Modelica.ComplexMath.j
     "Voltage" annotation (choices(
-      choice=(230*1) + 0*MCM.j "100% at HVpin of transformer",
-      choice=(230*1.02) + 0*MCM.j "102% at HVpin of transformer",
-      choice=(230*1.05) + 0*MCM.j "105% at HVpin of transformer",
-      choice=(230*1.1) + 0*MCM.j "110% at HVpin of transformer",
-      choice=(230*0.95) + 0*MCM.j "95% at HVpin of transformer",
-      choice=(230*0.9) + 0*MCM.j "90% at HVpin of transformer"));
+      choice=(230*1) + 0* Modelica.ComplexMath.j "100% at HVpin of transformer",
+      choice=(230*1.02) + 0* Modelica.ComplexMath.j "102% at HVpin of transformer",
+      choice=(230*1.05) + 0* Modelica.ComplexMath.j "105% at HVpin of transformer",
+      choice=(230*1.1) + 0* Modelica.ComplexMath.j "110% at HVpin of transformer",
+      choice=(230*0.95) + 0* Modelica.ComplexMath.j "95% at HVpin of transformer",
+      choice=(230*0.9) + 0* Modelica.ComplexMath.j "90% at HVpin of transformer"));
 
 Components.MvLvTransformer_1P transformer_MvLv(transformer=transformer, traTCal=
         traTCal)
@@ -108,5 +108,14 @@ equation
         Line(
           points={{-100,-60},{-42,20},{0,44}},
           color={85,170,255},
-          smooth=Smooth.Bezier)}));
+          smooth=Smooth.Bezier)})),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end Grid_1PEq;
diff --git a/IDEAS/Experimental/Electric/Distribution/AC/Grid_3P.mo b/IDEAS/Experimental/Electric/Distribution/AC/Grid_3P.mo
index 10b1f7da72..5e40b45388 100644
--- a/IDEAS/Experimental/Electric/Distribution/AC/Grid_3P.mo
+++ b/IDEAS/Experimental/Electric/Distribution/AC/Grid_3P.mo
@@ -13,12 +13,12 @@ public
 
   parameter Modelica.Units.SI.ComplexVoltage VSource=230 + 0*Modelica.ComplexMath.j
     "Voltage" annotation (choices(
-      choice=(230*1) + 0*MCM.j "100% at HVpin of transformer",
-      choice=(230*1.02) + 0*MCM.j "102% at HVpin of transformer",
-      choice=(230*1.05) + 0*MCM.j "105% at HVpin of transformer",
-      choice=(230*1.1) + 0*MCM.j "110% at HVpin of transformer",
-      choice=(230*0.95) + 0*MCM.j "95% at HVpin of transformer",
-      choice=(230*0.9) + 0*MCM.j "90% at HVpin of transformer"));
+      choice=(230*1) + 0* Modelica.ComplexMath.j "100% at HVpin of transformer",
+      choice=(230*1.02) + 0* Modelica.ComplexMath.j "102% at HVpin of transformer",
+      choice=(230*1.05) + 0* Modelica.ComplexMath.j "105% at HVpin of transformer",
+      choice=(230*1.1) + 0* Modelica.ComplexMath.j "110% at HVpin of transformer",
+      choice=(230*0.95) + 0* Modelica.ComplexMath.j "95% at HVpin of transformer",
+      choice=(230*0.9) + 0* Modelica.ComplexMath.j "90% at HVpin of transformer"));
 
   /***Everything related to the transfomer***/
     Components.MvLvTransformer_3P transformer_MvLv(transformer=transformer, traTCal=
@@ -129,5 +129,14 @@ equation
         Line(
           points={{-100,60},{-42,12},{0,36}},
           color={0,0,0},
-          smooth=Smooth.Bezier)}));
+          smooth=Smooth.Bezier)})),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+</ul>
+</html>"));
 end Grid_3P;
diff --git a/IDEAS/Experimental/Electric/Distribution/DC/Examples/TestGridDC.mo b/IDEAS/Experimental/Electric/Distribution/DC/Examples/TestGridDC.mo
index 80974692f2..32c70518d0 100644
--- a/IDEAS/Experimental/Electric/Distribution/DC/Examples/TestGridDC.mo
+++ b/IDEAS/Experimental/Electric/Distribution/DC/Examples/TestGridDC.mo
@@ -1,6 +1,5 @@
 within IDEAS.Experimental.Electric.Distribution.DC.Examples;
 model TestGridDC
-  import IDEAS;
 extends Modelica.Icons.Example;
   IDEAS.Experimental.Electric.Distribution.DC.GridDCGeneral gridGeneralDC(
       redeclare
@@ -33,5 +32,14 @@ equation
       color={0,0,255},
       smooth=Smooth.None));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}})));
+            -100},{100,100}})),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+</ul>
+</html>"));
 end TestGridDC;
diff --git a/IDEAS/Experimental/Electric/Distribution/DC/GridDCGeneral.mo b/IDEAS/Experimental/Electric/Distribution/DC/GridDCGeneral.mo
index c8f3fa79c0..4cb48c0afd 100644
--- a/IDEAS/Experimental/Electric/Distribution/DC/GridDCGeneral.mo
+++ b/IDEAS/Experimental/Electric/Distribution/DC/GridDCGeneral.mo
@@ -1,6 +1,5 @@
 within IDEAS.Experimental.Electric.Distribution.DC;
 model GridDCGeneral
-  import IDEAS;
 
 replaceable parameter Data.Interfaces.DirectCurrent.GridType grid
     "Choose a grid Layout" annotation (choicesAllMatching=true);
@@ -92,5 +91,14 @@ annotation(Icon(graphics={
           points={{48,20},{48,0},{96,0}},
           color={0,0,255},
           smooth=Smooth.None)}),                                    Diagram(
-        graphics));
+        graphics),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+</ul>
+</html>"));
 end GridDCGeneral;
diff --git a/IDEAS/Experimental/Electric/Distribution/Examples/Components/Transformer.mo b/IDEAS/Experimental/Electric/Distribution/Examples/Components/Transformer.mo
index eda347326f..889b905b07 100644
--- a/IDEAS/Experimental/Electric/Distribution/Examples/Components/Transformer.mo
+++ b/IDEAS/Experimental/Electric/Distribution/Examples/Components/Transformer.mo
@@ -1,6 +1,5 @@
 within IDEAS.Experimental.Electric.Distribution.Examples.Components;
 model Transformer
-  import IDEAS;
 
   parameter Modelica.Units.SI.Temperature THsRef=326.6;
   parameter Modelica.Units.SI.Temperature TToRef=314.44;
@@ -36,5 +35,14 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}), graphics));
+            -100},{100,100}}), graphics),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+</ul>
+</html>"));
 end Transformer;
diff --git a/IDEAS/Experimental/Electric/Examples/TestGridAndPVFromFile.mo b/IDEAS/Experimental/Electric/Examples/TestGridAndPVFromFile.mo
index 3fcaab090d..b4c03a6d66 100644
--- a/IDEAS/Experimental/Electric/Examples/TestGridAndPVFromFile.mo
+++ b/IDEAS/Experimental/Electric/Examples/TestGridAndPVFromFile.mo
@@ -10,7 +10,7 @@ extends Modelica.Icons.Example;
   Photovoltaics.PvSystemGeneralFromFile pVFromFilePQ(numPha=3, PNom=5000)
     annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
   IDEAS.Experimental.Electric.Distribution.AC.Grid_3P gridGeneral(
-    VSource=(230*1.02) + 0*MCM.j,
+    VSource=(230*1.02) + 0*Modelica.ComplexMath.j,
     redeclare Data.Grids.Ieee34_AL120                grid,
     redeclare Data.TransformerImp.Transfo_100kVA transformer,
     traTCal=true)
@@ -23,6 +23,11 @@ equation
   annotation (Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 May 22, 2022, by Filip Jorissen:<br/>
 Removed experiment annotation to avoid failing OMC tests.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">
diff --git a/IDEAS/Experimental/Electric/Examples/TestGridAndPVSystemGeneral.mo b/IDEAS/Experimental/Electric/Examples/TestGridAndPVSystemGeneral.mo
index b31214a254..ce8cfdc5ae 100644
--- a/IDEAS/Experimental/Electric/Examples/TestGridAndPVSystemGeneral.mo
+++ b/IDEAS/Experimental/Electric/Examples/TestGridAndPVSystemGeneral.mo
@@ -8,7 +8,7 @@ extends Modelica.Icons.Example;
   inner IDEAS.BoundaryConditions.SimInfoManager sim
     annotation (Placement(transformation(extent={{-100,80},{-80,100}})));
   Distribution.AC.Grid_3P                             gridGeneral(
-    VSource=(230*1.02) + 0*MCM.j,
+    VSource=(230*1.02) + 0*Modelica.ComplexMath.j,
     redeclare Data.Grids.Ieee34_AL120                grid,
     redeclare Data.TransformerImp.Transfo_100kVA transformer,
     traTCal=true)
@@ -21,6 +21,11 @@ equation
   annotation (Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Added <code>Modelica.ComplexMath.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/Experimental/Electric/package.mo.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
+</li>
+<li>
 May 22, 2022, by Filip Jorissen:<br/>
 Removed experiment annotation to avoid failing OMC tests.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1254\">
diff --git a/IDEAS/Experimental/Electric/Photovoltaics/Components/PvVoltageCtrlGeneral_InputVGrid_MovAvg.mo b/IDEAS/Experimental/Electric/Photovoltaics/Components/PvVoltageCtrlGeneral_InputVGrid_MovAvg.mo
index ad98a48493..33b1bde9fa 100644
--- a/IDEAS/Experimental/Electric/Photovoltaics/Components/PvVoltageCtrlGeneral_InputVGrid_MovAvg.mo
+++ b/IDEAS/Experimental/Electric/Photovoltaics/Components/PvVoltageCtrlGeneral_InputVGrid_MovAvg.mo
@@ -1,7 +1,6 @@
 within IDEAS.Experimental.Electric.Photovoltaics.Components;
 model PvVoltageCtrlGeneral_InputVGrid_MovAvg
   "Basic controller based on moving average, with fixed shut down time, with RealInput for grid voltage"
-  import IDEAS;
 
   extends Modelica.Blocks.Icons.Block;
 
@@ -61,5 +60,14 @@ equation
       points={{-100,-60},{-64,-60},{-64,-42},{-26,-42}},
       color={0,0,127},
       smooth=Smooth.None));
-  annotation (Diagram(graphics));
+  annotation (Diagram(graphics),
+Documentation(revisions="<html>
+<ul>
+<li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+</ul>
+</html>"));
 end PvVoltageCtrlGeneral_InputVGrid_MovAvg;
diff --git a/IDEAS/Experimental/Electric/package.mo b/IDEAS/Experimental/Electric/package.mo
index da9dba0947..c36972b39c 100644
--- a/IDEAS/Experimental/Electric/package.mo
+++ b/IDEAS/Experimental/Electric/package.mo
@@ -1,7 +1,5 @@
 within IDEAS.Experimental;
 package Electric "Electrical in-home and feeder systems"
-import MCM = Modelica.ComplexMath;
-
 
 extends Modelica.Icons.Package;
 
diff --git a/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/ThreeWayValveSwitch.mo b/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/ThreeWayValveSwitch.mo
index c18b377e9a..f6f498c609 100644
--- a/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/ThreeWayValveSwitch.mo
+++ b/IDEAS/Fluid/Actuators/Valves/Simplified/Examples/ThreeWayValveSwitch.mo
@@ -1,6 +1,5 @@
 within IDEAS.Fluid.Actuators.Valves.Simplified.Examples;
 model ThreeWayValveSwitch "Test the new component ThreeWayValveSwitch"
-  import IDEAS;
   extends Modelica.Icons.Example;
   package Medium = Modelica.Media.Water.ConstantPropertyLiquidWater;
 
@@ -85,6 +84,11 @@ equation
     Documentation(revisions="<html>
 <ul>
 <li>
+February 7, 2025, by Jelger Jansen:<br/>
+Removed <code>import IDEAS</code> statement.
+See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a>.
+</li>
+<li>
 October 30, 2024, by Lucas Verleyen:<br/>
 Updates according to <a href=\"https://github.com/ibpsa/modelica-ibpsa/tree/8ed71caee72b911a1d9b5a76e6cb7ed809875e1e\">IBPSA</a>.<br/>
 See <a href=\"https://github.com/open-ideas/IDEAS/pull/1383\">#1383</a> 
diff --git a/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo b/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo
index 1c19417a2f..37d2a42e5e 100644
--- a/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo
+++ b/IDEAS/Fluid/Taps/Interfaces/BalancedTap.mo
@@ -1,7 +1,6 @@
 within IDEAS.Fluid.Taps.Interfaces;
 partial model BalancedTap "partial DHW model"
   extends Modelica.Icons.ObsoleteModel;
-  import IDEAS;
 
   parameter Modelica.Units.SI.Temperature TDHWSet(max=273.15 + 60) = 273.15 +
     45 "DHW temperature setpoint";
@@ -193,6 +192,7 @@ An example of this model is given in
 <li>
 February 4, 2025, by Jelger Jansen:<br/>
 Added <code>Modelica.Units.</code> to one or multiple parameter(s) due to the removal of <code>import</code> in IDEAS/package.mo.
+Removed <code>import IDEAS</code> statement.
 See <a href=\"https://github.com/open-ideas/IDEAS/issues/1415\">#1415</a> .
 </li>
 <li>
diff --git a/IDEAS/Templates/Interfaces/package.mo b/IDEAS/Templates/Interfaces/package.mo
index 6f3e4e47a1..c8437675a4 100644
--- a/IDEAS/Templates/Interfaces/package.mo
+++ b/IDEAS/Templates/Interfaces/package.mo
@@ -1,8 +1,6 @@
 within IDEAS.Templates;
 package Interfaces "Partials"
 
-
 extends Modelica.Icons.InterfacesPackage;
-import      Modelica.Units.SI;
 
 end Interfaces;
diff --git a/IDEAS/Utilities/File/test.mo b/IDEAS/Utilities/File/test.mo
index 13053df587..da774cb4aa 100644
--- a/IDEAS/Utilities/File/test.mo
+++ b/IDEAS/Utilities/File/test.mo
@@ -1,6 +1,5 @@
 within IDEAS.Utilities.File;
 model test
-  import IDEAS;
   parameter String name = "example.mo";
   parameter String savePath=Modelica.Utilities.Files.loadResource("modelica://IDEAS/Fluid/HeatExchangers/GroundHeatExchangers/Borefield/Data/BorefieldData/");
   parameter String sha1=IDEAS.Utilities.File.sha1(savePath + name);
