diff --git a/build b/build
index efee1f88..eb13855b 100644
--- a/build
+++ b/build
@@ -1 +1 @@
-78
\ No newline at end of file
+79
\ No newline at end of file
diff --git a/src/RESTObjects/RESTAPI_GWobjects.cpp b/src/RESTObjects/RESTAPI_GWobjects.cpp
index c38d33fd..8a09d271 100644
--- a/src/RESTObjects/RESTAPI_GWobjects.cpp
+++ b/src/RESTObjects/RESTAPI_GWobjects.cpp
@@ -11,11 +11,7 @@
 
 #include "Daemon.h"
 #ifdef TIP_GATEWAY_SERVICE
-#ifdef USE_MEDUSA_CLIENT
-#include <medusa/GlobalSystem.h>
-#else
 #include "AP_WS_Server.h"
-#endif
 #include "StorageService.h"
 #include "CapabilitiesCache.h"
 #include "RADIUSSessionTracker.h"
@@ -35,7 +31,6 @@ namespace OpenWifi::GWObjects {
 		field_to_json(Obj, "serialNumber", SerialNumber);
 #ifdef TIP_GATEWAY_SERVICE
 		field_to_json(Obj, "deviceType", CapabilitiesCache::instance()->GetPlatform(Compatible));
-		field_to_json(Obj, "hasRADIUSSessions", RADIUSSessionTracker()->HasSessions(SerialNumber));
 		field_to_json(Obj, "blackListed", StorageService()->IsBlackListed(Utils::MACToInt(SerialNumber)));
 #endif
 		field_to_json(Obj, "macAddress", MACAddress);
@@ -303,9 +298,7 @@ namespace OpenWifi::GWObjects {
         field_to_json(Obj, "compatible", Compatible);
 
 #ifdef TIP_GATEWAY_SERVICE
-#ifndef USE_MEDUSA_CLIENT
 		hasRADIUSSessions = RADIUSSessionTracker()->HasSessions(SerialNumber);
-#endif
 #endif
 		field_to_json(Obj, "hasRADIUSSessions", hasRADIUSSessions );
 		field_to_json(Obj, "hasGPS", hasGPS);
diff --git a/src/TelemetryStream.cpp b/src/TelemetryStream.cpp
index 9667c95d..b2d0271d 100644
--- a/src/TelemetryStream.cpp
+++ b/src/TelemetryStream.cpp
@@ -111,7 +111,6 @@ namespace OpenWifi {
 					}
 				} break;
 				case TelemetryNotification::NotificationType::unregister: {
-					std::lock_guard G(Mutex_);
 
 					auto client = Clients_.find(Notification->Data_);
 					if (client != Clients_.end()) {