diff --git a/.gitmodules b/.gitmodules
index 6e7fee94b8bcf314383366792a7b4d75fd307c30..253754f3c01f23e12a67517a11f3b64fadd07fb4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,10 +16,6 @@
 [submodule "matlab/particles"]
 	path = matlab/particles
 	url = https://git.dynare.org/Dynare/particles.git
-[submodule "matlab/modules/dates"]
-	path = matlab/modules/dates
-	url =  git@gitlab.com:McModelTeam/dates.git
-	branch = master
 [submodule "matlab/modules/dseries"]
 	path = matlab/modules/dseries
 	url = git@gitlab.com:McModelTeam/dseries.git
diff --git a/matlab/dynare_config.m b/matlab/dynare_config.m
index 012b6e0e353f1ffb4dae3188761e349042b048ce..141b2296cbfeda2e1f10b92d01bb4ca035628de5 100644
--- a/matlab/dynare_config.m
+++ b/matlab/dynare_config.m
@@ -247,7 +247,7 @@ if verbose
     skipline()
 end
 
-% Initialization of the dates and dseries classes (recursive).
-initialize_dseries_toolbox;
+% Initialization of the dates and dseries classes.
+initialize_dseries_class;
 
 cd(origin);
diff --git a/matlab/modules/dates b/matlab/modules/dates
deleted file mode 160000
index 5db5eb444d923ac74a553899b8dbfcc1cb6faa7a..0000000000000000000000000000000000000000
--- a/matlab/modules/dates
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5db5eb444d923ac74a553899b8dbfcc1cb6faa7a
diff --git a/matlab/modules/dseries b/matlab/modules/dseries
index 8815162b01df27c8fe8a342dc348353822856987..c295bff84f3884176676a1384efdffc239b726f2 160000
--- a/matlab/modules/dseries
+++ b/matlab/modules/dseries
@@ -1 +1 @@
-Subproject commit 8815162b01df27c8fe8a342dc348353822856987
+Subproject commit c295bff84f3884176676a1384efdffc239b726f2