diff --git a/libs/python/agent/agent/callbacks/telemetry.py b/libs/python/agent/agent/callbacks/telemetry.py
index 00e49a05..bdb3fd4c 100644
--- a/libs/python/agent/agent/callbacks/telemetry.py
+++ b/libs/python/agent/agent/callbacks/telemetry.py
@@ -7,12 +7,18 @@ import uuid
 from typing import List, Dict, Any, Optional, Union
 
 from .base import AsyncCallbackHandler
-from ..telemetry import (
+from core.telemetry import (
     record_event,
     is_telemetry_enabled,
-    SYSTEM_INFO,
 )
 
+import platform
+
+SYSTEM_INFO = {
+    "os": platform.system().lower(),
+    "os_version": platform.release(),
+    "python_version": platform.python_version(),
+}
 
 class TelemetryCallback(AsyncCallbackHandler):
     """
diff --git a/libs/python/agent/agent/telemetry.py b/libs/python/agent/agent/telemetry.py
deleted file mode 100644
index 6769ebb5..00000000
--- a/libs/python/agent/agent/telemetry.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""Agent telemetry for tracking anonymous usage and feature usage."""
-
-from core.telemetry import (
-    record_event,
-    increment as increment_counter,
-    get_telemetry_client,
-    flush,
-    is_telemetry_enabled,
-    is_telemetry_globally_disabled,
-)
-
-import platform
-
-SYSTEM_INFO = {
-    "os": platform.system().lower(),
-    "os_version": platform.release(),
-    "python_version": platform.python_version(),
-}
-
-__all__ = [
-    "record_event",
-    "increment_counter",
-    "get_telemetry_client",
-    "flush",
-    "is_telemetry_enabled",
-    "is_telemetry_globally_disabled",
-    "SYSTEM_INFO",
-]
\ No newline at end of file
diff --git a/libs/python/computer/computer/computer.py b/libs/python/computer/computer/computer.py
index 854a6cce..b7bd9466 100644
--- a/libs/python/computer/computer/computer.py
+++ b/libs/python/computer/computer/computer.py
@@ -9,10 +9,18 @@ import re
 from .logger import Logger, LogLevel
 import json
 import logging
-from .telemetry import record_computer_initialization
+from core.telemetry import is_telemetry_enabled, record_event
 import os
 from . import helpers
 
+import platform
+
+SYSTEM_INFO = {
+    "os": platform.system().lower(),
+    "os_version": platform.release(),
+    "python_version": platform.python_version(),
+}
+
 # Import provider related modules
 from .providers.base import VMProviderType
 from .providers.factory import VMProviderFactory
@@ -183,8 +191,8 @@ class Computer:
         self.use_host_computer_server = use_host_computer_server
 
         # Record initialization in telemetry (if enabled)
-        if telemetry_enabled:
-            record_computer_initialization()
+        if telemetry_enabled and is_telemetry_enabled():
+            record_event("computer_initialized", SYSTEM_INFO)
         else:
             self.logger.debug("Telemetry disabled - skipping initialization tracking")
 
diff --git a/libs/python/computer/computer/telemetry.py b/libs/python/computer/computer/telemetry.py
deleted file mode 100644
index 5c7f67a1..00000000
--- a/libs/python/computer/computer/telemetry.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""Computer telemetry for tracking anonymous usage and feature usage."""
-
-import platform
-from core.telemetry import increment, is_telemetry_enabled, record_event
-
-SYSTEM_INFO = {
-    "os": platform.system().lower(),
-    "os_version": platform.release(),
-    "python_version": platform.python_version(),
-}
-
-__all__ = [
-    "increment",
-    "is_telemetry_enabled",
-    "record_event",
-    "record_computer_initialization",
-]
-
-
-def record_computer_initialization() -> None:
-    if not is_telemetry_enabled():
-        return
-    record_event("computer_initialized", SYSTEM_INFO)
\ No newline at end of file