diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index d5efaa8f22f..77df6da4f8f 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -106,6 +106,7 @@ if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey='';
 if (empty($dolibarr_main_limit_users)) $dolibarr_main_limit_users=0;
 if (empty($dolibarr_mailing_limit_sendbyweb)) $dolibarr_mailing_limit_sendbyweb=0;
 if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode=0; // For debug in php strict mode
+// TODO Multicompany Remove this. Useless.
 if (empty($multicompany_transverse_mode)) $multicompany_transverse_mode=0;
 if (empty($multicompany_force_entity)) $multicompany_force_entity=0; // To force entity in login page
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f7081340f8a..202a7c0dfb1 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -584,6 +584,7 @@ if (! defined('NOLOGIN'))
         }
 
         // Create entity cookie, just used for login page
+        // TODO Multicompany Move this into hook
         if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_COOKIE_ENABLED) && isset($_POST["entity"]))
         {
             include_once DOL_DOCUMENT_ROOT.'/core/class/cookie.class.php';
@@ -754,6 +755,7 @@ else
 $heightforframes=52;
 
 // Switch to another entity
+// TODO Multicompany Remove this
 if (! empty($conf->multicompany->enabled) && GETPOST('action') == 'switchentity')
 {
     if ($mc->switchEntity(GETPOST('entity','int')) > 0)
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 41bfa6d3a91..b62ee1c9371 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -75,6 +75,7 @@ if (! empty($dolibarr_main_document_root_alt))
 }
 
 // Set properties specific to multicompany
+// TODO Multicompany Remove this. Useless. Var should be read when required.
 $conf->multicompany->transverse_mode = empty($multicompany_transverse_mode)?'':$multicompany_transverse_mode;		// Force Multi-Company transverse mode
 $conf->multicompany->force_entity = empty($multicompany_force_entity)?'':(int) $multicompany_force_entity;			// Force entity in login page
 
@@ -141,6 +142,7 @@ if (! defined('NOREQUIREDB'))
 	{
 		$conf->entity = DOLENTITY;
 	}
+	// TODO Multicompany Remove this.
 	else if (! empty($conf->multicompany->force_entity) && is_int($conf->multicompany->force_entity)) // To force entity in login page
 	{
 		$conf->entity = $conf->multicompany->force_entity;