diff --git a/.CI/installLibraries.mos b/.CI/installLibraries.mos
index d9606f9..58a7098 100644
--- a/.CI/installLibraries.mos
+++ b/.CI/installLibraries.mos
@@ -6,15 +6,7 @@ if not installPackage(Modelica, "3.1.0", exactMatch=true) then
     print("Modelica 3.1.0 " + getErrorString() + "\n");
     exit(1);
 end if;
-if not installPackage(Modelica, "4.1.0-beta.om", exactMatch=true) then
-    print("Modelica 4.1.0-beta.om" + getErrorString() + "\n");
-    exit(1);
-end if;
-if not installPackage(ModelicaServices, "4.1.0-beta.om", exactMatch=true) then
-    print("ModelicaServices 4.1.0-beta.om" + getErrorString() + "\n");
-    exit(1);
-end if;
-for v in {"3.2.1","3.2.2","3.2.3","4.0.0","4.1.0-beta.om","trunk"} loop
+for v in {"3.2.1","3.2.2","3.2.3","4.0.0","4.1.0","trunk"} loop
   if not installPackage(ModelicaTest, v, exactMatch=true) then
     print("ModelicaTest " + v + " " + getErrorString() + "\n");
     exit(1);
diff --git a/configs/conf.json b/configs/conf.json
index 51dce44..c9141fe 100644
--- a/configs/conf.json
+++ b/configs/conf.json
@@ -6,17 +6,15 @@
     "referenceFileNameDelimiter":"/",
     "referenceFileNameExtraName":"$ClassName",
     "referenceFiles":"$MSLREFERENCE/MAP-LIB_ReferenceResults/v4.1.0",
-    "extraCustomCommands":["if not setCommandLineOptions(\"--std=3.3\") then exit(1); end if;"],
     "optlevel":"-Os -march=native"
   },
   {
     "library":"Modelica",
-    "libraryVersion":"4.1.0-beta.om",
+    "libraryVersion":"4.1.0",
     "referenceFileExtension":"csv",
     "referenceFileNameDelimiter":"/",
     "referenceFileNameExtraName":"$ClassName",
     "referenceFiles":"$MSLREFERENCE/MAP-LIB_ReferenceResults/v4.1.0",
-    "extraCustomCommands":["if not setCommandLineOptions(\"--std=3.3\") then exit(1); end if;"],
     "optlevel":"-Os -march=native"
   },
   {
@@ -46,18 +44,16 @@
     "referenceFileExtension":"csv",
     "referenceFileNameDelimiter":"/",
     "referenceFileNameExtraName":"$ClassName",
-    "referenceFiles":"$MSLREFERENCE/MAP-LIB_ReferenceResults/v4.0.0",
-    "extraCustomCommands":["if not setCommandLineOptions(\"--std=3.3\") then exit(1); end if;"],
+    "referenceFiles":"$MSLREFERENCE/MAP-LIB_ReferenceResults/v4.1.0",
     "optlevel":"-Os -march=native"
   },
   {
     "library":"ModelicaTest",
-    "libraryVersion":"4.1.0-beta.om",
+    "libraryVersion":"4.1.0",
     "referenceFileExtension":"csv",
     "referenceFileNameDelimiter":"/",
     "referenceFileNameExtraName":"$ClassName",
     "referenceFiles":"$MSLREFERENCE/MAP-LIB_ReferenceResults/v4.1.0",
-    "extraCustomCommands":["if not setCommandLineOptions(\"--std=3.3\") then exit(1); end if;"],
     "optlevel":"-Os -march=native"
   },
   {
@@ -67,7 +63,6 @@
     "referenceFileNameDelimiter":"/",
     "referenceFileNameExtraName":"$ClassName",
     "referenceFiles":"$MSLREFERENCE/MAP-LIB_ReferenceResults/v4.0.0",
-    "extraCustomCommands":["if not setCommandLineOptions(\"--std=3.3\") then exit(1); end if;"],
     "optlevel":"-Os -march=native"
   },
   {