diff --git a/datamodels/2.x/authent-cas/model.authent-cas.php b/datamodels/2.x/authent-cas/model.authent-cas.php
deleted file mode 100644
index ccca9daf7..000000000
--- a/datamodels/2.x/authent-cas/model.authent-cas.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// PHP Data Model definition file
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you use supply a datamodel.xxxx.xml file with your module
-// the this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module
-
diff --git a/datamodels/2.x/authent-cas/module.authent-cas.php b/datamodels/2.x/authent-cas/module.authent-cas.php
index 826c160c1..b17b6a32b 100644
--- a/datamodels/2.x/authent-cas/module.authent-cas.php
+++ b/datamodels/2.x/authent-cas/module.authent-cas.php
@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.authent-cas.php',
 			'vendor/autoload.php',
 			'src/CASLoginExtension.php',
 		),
diff --git a/datamodels/2.x/authent-ldap/model.authent-ldap.php b/datamodels/2.x/authent-ldap/model.authent-ldap.php
deleted file mode 100755
index d00d176a0..000000000
--- a/datamodels/2.x/authent-ldap/model.authent-ldap.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-// PHP Data Model definition file
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you provide a datamodel.xxxx.xml file with your module,
-// this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0 and later) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module
\ No newline at end of file
diff --git a/datamodels/2.x/authent-ldap/module.authent-ldap.php b/datamodels/2.x/authent-ldap/module.authent-ldap.php
index 5aa7230bc..223dc13ec 100755
--- a/datamodels/2.x/authent-ldap/module.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/module.authent-ldap.php
@@ -27,7 +27,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.authent-ldap.php',
 		),
 		'data.struct' => array(
 			//'data.struct.authent-ldap.xml',
diff --git a/datamodels/2.x/combodo-backoffice-darkmoon-theme/model.combodo-backoffice-darkmoon-theme.php b/datamodels/2.x/combodo-backoffice-darkmoon-theme/model.combodo-backoffice-darkmoon-theme.php
deleted file mode 100644
index ccca9daf7..000000000
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/model.combodo-backoffice-darkmoon-theme.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// PHP Data Model definition file
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you use supply a datamodel.xxxx.xml file with your module
-// the this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module
-
diff --git a/datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php b/datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
index c14a6ba69..4f1859e6a 100644
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.combodo-backoffice-darkmoon-theme.php'
 		),
 		'webservice' => array(
 			
diff --git a/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php b/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
index dd10680a4..c686976d3 100644
--- a/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
@@ -42,7 +42,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.combodo-db-tools.php',
 			'src/Service/DBToolsUtils.php',
             'src/Service/DBAnalyzerUtils.php',
 		),
diff --git a/datamodels/2.x/itop-attachments/module.itop-attachments.php b/datamodels/2.x/itop-attachments/module.itop-attachments.php
index c6c84d2c1..b54a1fc39 100644
--- a/datamodels/2.x/itop-attachments/module.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/module.itop-attachments.php
@@ -37,7 +37,6 @@ SetupWebPage::AddModule(
 		//
 		'datamodel' => array(
 			'vendor/autoload.php',
-			'model.itop-attachments.php',
 			'main.itop-attachments.php',
 			'renderers.itop-attachments.php',
 		),
diff --git a/datamodels/2.x/itop-backup/module.itop-backup.php b/datamodels/2.x/itop-backup/module.itop-backup.php
index 4fab74dbf..9876d97bb 100644
--- a/datamodels/2.x/itop-backup/module.itop-backup.php
+++ b/datamodels/2.x/itop-backup/module.itop-backup.php
@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
 		//
 		'datamodel' => array(
 			'main.itop-backup.php',
-			'model.itop-backup.php',
 		),
 		'webservice' => array(
 			//'webservices.itop-backup.php',
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/model.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/model.itop-bridge-cmdb-services.php
deleted file mode 100644
index 7f28f3258..000000000
--- a/datamodels/2.x/itop-bridge-cmdb-services/model.itop-bridge-cmdb-services.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2013-2023 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-// This file may be amended with XML snippets
-
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php b/datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php
index 4c4c02b86..aefb8e215 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php
@@ -25,7 +25,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-bridge-cmdb-services.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
 		),
 		'webservice' => array(
 			
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/model.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/model.itop-bridge-cmdb-ticket.php
deleted file mode 100644
index 7f28f3258..000000000
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/model.itop-bridge-cmdb-ticket.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2013-2023 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-// This file may be amended with XML snippets
-
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
index 06455599e..6cb2a4f2d 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
@@ -25,7 +25,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-bridge-cmdb-ticket.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
 		),
 		'webservice' => array(
 			
diff --git a/datamodels/2.x/itop-bridge-endusers-devices-services/model.itop-bridge-endusers-devices-services.php b/datamodels/2.x/itop-bridge-endusers-devices-services/model.itop-bridge-endusers-devices-services.php
deleted file mode 100644
index 7f28f3258..000000000
--- a/datamodels/2.x/itop-bridge-endusers-devices-services/model.itop-bridge-endusers-devices-services.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2013-2023 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-// This file may be amended with XML snippets
-
diff --git a/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php b/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php
index c594e5b40..6ebdc093c 100644
--- a/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php
+++ b/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php
@@ -27,7 +27,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-bridge-endusers-devices-services.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
 		),
 		'webservice' => array(
 
diff --git a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/model.itop-bridge-virtualization-mgmt-services.php b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/model.itop-bridge-virtualization-mgmt-services.php
deleted file mode 100644
index 7f28f3258..000000000
--- a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/model.itop-bridge-virtualization-mgmt-services.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2013-2023 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-// This file may be amended with XML snippets
-
diff --git a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php
index 1604e2645..938f31027 100644
--- a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php
+++ b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php
@@ -26,7 +26,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-bridge-virtualization-mgmt-services.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
 		),
 		'webservice' => array(
 
diff --git a/datamodels/2.x/itop-bridge-virtualization-storage/model.itop-bridge-virtualization-storage.php b/datamodels/2.x/itop-bridge-virtualization-storage/model.itop-bridge-virtualization-storage.php
deleted file mode 100644
index ec8c00c2c..000000000
--- a/datamodels/2.x/itop-bridge-virtualization-storage/model.itop-bridge-virtualization-storage.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * @copyright   Copyright (C) 2010-2023 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you provide a datamodel.xxxx.xml file with your module,
-// this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0 and later) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php b/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
index cfa1a7436..56f7fc97e 100644
--- a/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
+++ b/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-bridge-virtualization-storage.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-change-mgmt.xml',
diff --git a/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
index e27196905..a865c8ec8 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
@@ -22,7 +22,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-change-mgmt-itil.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-change-mgmt.xml',
diff --git a/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
index 49d8639ae..5eae2023a 100755
--- a/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-change-mgmt.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-change-mgmt.xml',
diff --git a/datamodels/2.x/itop-config/module.itop-config.php b/datamodels/2.x/itop-config/module.itop-config.php
index 1432b28ba..cb7620e29 100644
--- a/datamodels/2.x/itop-config/module.itop-config.php
+++ b/datamodels/2.x/itop-config/module.itop-config.php
@@ -19,7 +19,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-config.php',
 			'src/Validator/ConfigNodesVisitor.php',
 			'src/Validator/iTopConfigAstValidator.php',
 			'src/Validator/iTopConfigSyntaxValidator.php',
diff --git a/datamodels/2.x/itop-core-update/module.itop-core-update.php b/datamodels/2.x/itop-core-update/module.itop-core-update.php
index c48960510..383314e27 100644
--- a/datamodels/2.x/itop-core-update/module.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/module.itop-core-update.php
@@ -43,7 +43,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => [
-			'model.itop-core-update.php',
 			'src/Service/RunTimeEnvironmentCoreUpdater.php',
 			'src/Service/CoreUpdater.php',
 			'src/Controller/UpdateController.php',
diff --git a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php b/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
index c889e3c99..2089734a8 100755
--- a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
+++ b/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
@@ -35,10 +35,7 @@ SetupWebPage::AddModule(
 
 		// Components
 		//
-		'datamodel' => array(
-			'model.itop-datacenter-mgmt.php',
-			
-		),
+		'datamodel' => array(),
 		'webservice' => array(
 			
 		),
diff --git a/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php b/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
index c2848202b..030263b91 100644
--- a/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
+++ b/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
@@ -44,7 +44,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-endusers-devices.php'
 		),
 		'webservice' => array(
 			
diff --git a/datamodels/2.x/itop-faq-light/module.itop-faq-light.php b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
index 618ba84f0..0b39eefef 100755
--- a/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
@@ -22,7 +22,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-faq-light.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-knownerror-mgmt.xml',
diff --git a/datamodels/2.x/itop-files-information/model.itop-files-information.php b/datamodels/2.x/itop-files-information/model.itop-files-information.php
deleted file mode 100644
index b46c9ef0f..000000000
--- a/datamodels/2.x/itop-files-information/model.itop-files-information.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * @copyright   Copyright (C) 2010-2023 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
- 
diff --git a/datamodels/2.x/itop-files-information/module.itop-files-information.php b/datamodels/2.x/itop-files-information/module.itop-files-information.php
index 0469102d6..fd9d606ec 100644
--- a/datamodels/2.x/itop-files-information/module.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/module.itop-files-information.php
@@ -41,7 +41,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-		    'model.itop-files-information.php',
             'src/Service/FilesInformation.php',
             'src/Service/FilesInformationException.php',
 			'src/Service/FilesInformationUtils.php',
diff --git a/datamodels/2.x/itop-full-itil/module.itop-full-itil.php b/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
index e895e123d..e9e37d8ed 100644
--- a/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
+++ b/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
@@ -23,8 +23,7 @@ SetupWebPage::AddModule(
 		'auto_select' => 'SetupInfo::ModuleIsSelected("itop-request-mgmt-itil") && SetupInfo::ModuleIsSelected("itop-incident-mgmt-itil")',
 		// Components
 		//
-		'datamodel' => array(//'model.itop-portal-full-itil.php'
-		),
+		'datamodel' => array(),
 		'webservice' => array(),
 		'data.struct' => array(// add your 'structure' definition XML files here,
 		),
diff --git a/datamodels/2.x/itop-hub-connector/model.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/model.itop-hub-connector.php
deleted file mode 100644
index ccca9daf7..000000000
--- a/datamodels/2.x/itop-hub-connector/model.itop-hub-connector.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// PHP Data Model definition file
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you use supply a datamodel.xxxx.xml file with your module
-// the this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module
-
diff --git a/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php b/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
index 0ed305346..a40f39db8 100644
--- a/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
@@ -25,7 +25,6 @@ SetupWebPage::AddModule(
 		'datamodel' => array(
 			'menus.php',
 		    'hubnewsroomprovider.class.inc.php',
-		    'model.itop-hub-connector.php'
 		),
 		'webservice' => array(
 			
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
index 385270255..3159af6c5 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-incident-mgmt-itil.php',
 		),
 		'data.struct' => array(
 
diff --git a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
index 6b9fe0706..a545f0686 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-knownerror-mgmt.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-knownerror-mgmt.xml',
diff --git a/datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php b/datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php
index 131628248..123e33a13 100644
--- a/datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php
@@ -24,7 +24,6 @@ SetupWebPage::AddModule(
 		//
 		'datamodel' => array(
 			'vendor/autoload.php',
-			'model.itop-oauth-client.php', // Contains the PHP code generated by the "compilation" of datamodel.remote-authent-oauth.xml
 			'src/Service/PopupMenuExtension.php',
 			'src/Service/ApplicationUIExtension.php',
 		),
diff --git a/datamodels/2.x/itop-portal-base/model.itop-portal-base.php b/datamodels/2.x/itop-portal-base/model.itop-portal-base.php
deleted file mode 100644
index 7f28f3258..000000000
--- a/datamodels/2.x/itop-portal-base/model.itop-portal-base.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2013-2023 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-// This file may be amended with XML snippets
-
diff --git a/datamodels/2.x/itop-portal-base/module.itop-portal-base.php b/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
index da150e2e4..968fa6b2e 100644
--- a/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
@@ -34,7 +34,6 @@ SetupWebPage::AddModule(
 		// Note: The autoloader is there instead of portal/config/bootstrap.php in order to be available for other modules with a dependency on this one.
 		// eg. If a module has a class extending \Combodo\iTop\Portal\Controller\AbstractController, it needs to find it even if the portal kernel is not loaded.
 		'portal/vendor/autoload.php',
-		'model.itop-portal-base.php',
 	),
 	'webservice' => array(
 	//'webservices.itop-portal-base.php',
diff --git a/datamodels/2.x/itop-portal/model.itop-portal.php b/datamodels/2.x/itop-portal/model.itop-portal.php
deleted file mode 100644
index 7f28f3258..000000000
--- a/datamodels/2.x/itop-portal/model.itop-portal.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2013-2023 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-// This file may be amended with XML snippets
-
diff --git a/datamodels/2.x/itop-portal/module.itop-portal.php b/datamodels/2.x/itop-portal/module.itop-portal.php
index b876c1e8e..ef5c23260 100644
--- a/datamodels/2.x/itop-portal/module.itop-portal.php
+++ b/datamodels/2.x/itop-portal/module.itop-portal.php
@@ -33,7 +33,6 @@ SetupWebPage::AddModule(
 	// Components
 	'datamodel' => array(
 		'main.itop-portal.php',
-		'model.itop-portal.php',
 	),
 	'webservice' => array(
 	//'webservices.itop-portal.php',
diff --git a/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
index 1a7125503..0e028a5d7 100755
--- a/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-problem-mgmt.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-problem-mgmt.xml',
diff --git a/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php b/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
index 563d72954..9f91ca4bc 100755
--- a/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
+++ b/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
@@ -36,7 +36,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-profiles-itil.php',
 		),
 		'webservice' => array(
 			//'webservices.itop-profiles-itil.php',
diff --git a/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
index a47882a31..370a2efe4 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-request-mgmt-itil.php',
 			'main.itop-request-mgmt-itil.php',
 		),
 		'data.struct' => array(
diff --git a/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
index f79552607..ce4354bd6 100755
--- a/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-request-mgmt.php',
 			'main.itop-request-mgmt.php',
 		),
 		'data.struct' => array(
diff --git a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
index 709453596..de09dd1e6 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
@@ -22,7 +22,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-service-mgmt-provider.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-service-mgmt.xml',
diff --git a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
index 614c18539..d6100109c 100755
--- a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
@@ -22,7 +22,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-service-mgmt.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-service-mgmt.xml',
diff --git a/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php b/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
index 81a840a10..c7de27fa2 100755
--- a/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
@@ -36,7 +36,7 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'main.itop-sla-computation.php'
+			'main.itop-sla-computation.php',
 		),
 		'webservice' => array(
 			
diff --git a/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php b/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
index 7cd9481a3..6827ad95f 100644
--- a/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
+++ b/datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
@@ -44,7 +44,6 @@
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-storage-mgmt.php'
 		),
 		'webservice' => array(
 			
diff --git a/datamodels/2.x/itop-structure/module.itop-structure.php b/datamodels/2.x/itop-structure/module.itop-structure.php
index 008c50f70..e6591f90f 100644
--- a/datamodels/2.x/itop-structure/module.itop-structure.php
+++ b/datamodels/2.x/itop-structure/module.itop-structure.php
@@ -22,7 +22,6 @@ SetupWebPage::AddModule(
 		//
 		'datamodel' => array(
 			'main.itop-structure.php',
-			'model.itop-structure.php',
 		),
 		'data.struct' => array(
 		),
diff --git a/datamodels/2.x/itop-themes-compat/model.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/model.itop-themes-compat.php
deleted file mode 100644
index ccc1b539e..000000000
--- a/datamodels/2.x/itop-themes-compat/model.itop-themes-compat.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// PHP Data Model definition file
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you provide a datamodel.xxxx.xml file with your module,
-// this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0 and later) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module
-
diff --git a/datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php b/datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php
index e226b1dea..9e0088dfa 100644
--- a/datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php
+++ b/datamodels/2.x/itop-themes-compat/module.itop-themes-compat.php
@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-themes-compat.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-themes-compat.xml
 		),
 		'webservice' => array(
 			
diff --git a/datamodels/2.x/itop-tickets/module.itop-tickets.php b/datamodels/2.x/itop-tickets/module.itop-tickets.php
index c43586e43..3f9bd5bdc 100755
--- a/datamodels/2.x/itop-tickets/module.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/module.itop-tickets.php
@@ -23,7 +23,6 @@ SetupWebPage::AddModule(
 		//
 		'datamodel' => array(
 			'main.itop-tickets.php',
-			'model.itop-tickets.php',
 		),
 		'data.struct' => array(
 	//		'data.struct.ta-actions.xml',
diff --git a/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php b/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
index 5ea307ead..11e716d29 100644
--- a/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
+++ b/datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
@@ -34,7 +34,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-virtualization-mgmt.php'
 		),
 		'webservice' => array(
 			
diff --git a/datamodels/2.x/itop-welcome-itil/model.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/model.itop-welcome-itil.php
deleted file mode 100644
index 7f28f3258..000000000
--- a/datamodels/2.x/itop-welcome-itil/model.itop-welcome-itil.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Copyright (C) 2013-2023 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-// This file may be amended with XML snippets
-
diff --git a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
index de31a0d56..54cd99414 100755
--- a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
+++ b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
@@ -21,7 +21,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-welcome-itil.php',
 		),
 		'webservice' => array(
 			//'webservices.itop-welcome-itil.php',