diff --git a/client/public/stylesheets/olympus.css b/client/public/stylesheets/olympus.css
index 0995cf05..32b97909 100644
--- a/client/public/stylesheets/olympus.css
+++ b/client/public/stylesheets/olympus.css
@@ -655,5 +655,5 @@ body[data-hide-naval] #unit-visibility-control-naval {
     transform: translateX(var(--height));
 }
 
-[data-coalition=blue] {background-color: var(--primary-blue) !important}
-[data-coalition=red] {background-color:var(--primary-red)!important}
\ No newline at end of file
+[data-coalition=blue], [data-active-coalition=blue] {background-color: var(--primary-blue)}
+[data-coalition=red], [data-active-coalition=red] {background-color:var(--primary-red)}
\ No newline at end of file
diff --git a/client/src/index.ts b/client/src/index.ts
index d86d691a..8cae197c 100644
--- a/client/src/index.ts
+++ b/client/src/index.ts
@@ -248,7 +248,7 @@ export function getConnectionStatusPanel() {
 
 export function setActiveCoalition(newActiveCoalition: string) {
     activeCoalition = newActiveCoalition;
-    document.querySelectorAll('[data-coalition]').forEach((element: any) => {element.setAttribute("data-coalition", activeCoalition)});
+    document.querySelectorAll('[data-active-coalition]').forEach((element: any) => {element.setAttribute("data-active-coalition", activeCoalition)});
 }
 
 export function getActiveCoalition() {
diff --git a/client/views/contextmenu.ejs b/client/views/contextmenu.ejs
index cead9fcc..1482020f 100644
--- a/client/views/contextmenu.ejs
+++ b/client/views/contextmenu.ejs
@@ -2,13 +2,13 @@
     <div class="ol-panel">
         <label id="context-menu-switch" class="toggle" for="context-menu-toggle">
             <input class="toggle-input" name="" type="checkbox" id="context-menu-toggle">
-            <div data-coalition="blue" class="toggle-fill"></div>
+            <div data-active-coalition="blue" class="toggle-fill"></div>
         </label>
         
         <div id="unit-spawn" class="ol-group">
-            <button data-coalition="blue" id="unit-spawn-aircraft" title="Spawn aircraft" data-on-click="contextMenuShow"
+            <button data-active-coalition="blue" id="unit-spawn-aircraft" title="Spawn aircraft" data-on-click="contextMenuShow"
                 data-on-click-params='{ "unitType": "aircraft" }'></button>
-            <button data-coalition="blue" id="unit-spawn-ground" title="Spawn ground unit" data-on-click="contextMenuShow"
+            <button data-active-coalition="blue" id="unit-spawn-ground" title="Spawn ground unit" data-on-click="contextMenuShow"
                 data-on-click-params='{ "unitType": "ground" }'></button>
         </div>
     </div>
@@ -39,6 +39,6 @@
                 </div>
             </div>
         </div>
-        <button id="deploy-unit-button" title="" data-coalition="blue" data-on-click="contextMenuDeployUnit">Deploy units</button>
+        <button id="deploy-unit-button" title="" data-active-coalition="blue" data-on-click="contextMenuDeployUnit">Deploy units</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/core/include/unitsmanager.h b/src/core/include/unitsmanager.h
index 98e7d828..84802445 100644
--- a/src/core/include/unitsmanager.h
+++ b/src/core/include/unitsmanager.h
@@ -11,7 +11,6 @@ public:
 	~UnitsManager();
 
 	Unit* getUnit(int ID);
-	void expireMeasures();
 	void updateExportData(lua_State* L);
 	void updateMissionData(json::value missionData);
 	void getData(json::value& answer, int time);
diff --git a/src/core/src/core.cpp b/src/core/src/core.cpp
index e02ecf43..38a6aaca 100644
--- a/src/core/src/core.cpp
+++ b/src/core/src/core.cpp
@@ -67,7 +67,6 @@ extern "C" DllExport int coreFrame(lua_State* L)
     {
         if (unitsManager != nullptr)
         {
-            unitsManager->expireMeasures();
             unitsManager->updateExportData(L);
         }
         before = std::chrono::system_clock::now();
diff --git a/src/core/src/server.cpp b/src/core/src/server.cpp
index 9aded60b..10ed3ff8 100644
--- a/src/core/src/server.cpp
+++ b/src/core/src/server.cpp
@@ -78,8 +78,9 @@ void Server::handle_get(http_request request)
         {
             if (path[0] == UNITS_URI)
             {
-                wstring fragment = uri::decode(request.relative_uri().fragment())
-                unitsManager->getData(answer);
+                wstring fragment = uri::decode(request.relative_uri().fragment());
+                log(fragment);
+                //unitsManager->getData(answer);
             }
             else if (path[0] == LOGS_URI)
             {
diff --git a/src/core/src/unitsmanager.cpp b/src/core/src/unitsmanager.cpp
index ce7d933f..a32dcb75 100644
--- a/src/core/src/unitsmanager.cpp
+++ b/src/core/src/unitsmanager.cpp
@@ -32,16 +32,6 @@ Unit* UnitsManager::getUnit(int ID)
 	}
 }
 
-
-void UnitsManager::expireMeasures()
-{
-	/* Decrement the time to live of all measures and remove stale measures */
-	for (auto const& p : units)
-	{
-		p.second->expireMeasures();
-	}
-}
-
 void UnitsManager::updateExportData(lua_State* L)
 {
 	map<int, json::value> unitJSONs = getAllUnits(L);