diff --git a/esp32/include/system_service.h b/esp32/include/system_service.h
index 7da7c73..673822b 100644
--- a/esp32/include/system_service.h
+++ b/esp32/include/system_service.h
@@ -17,15 +17,11 @@ esp_err_t handleReset(PsychicRequest *request);
 esp_err_t handleRestart(PsychicRequest *request);
 esp_err_t handleSleep(PsychicRequest *request);
 esp_err_t getStatus(PsychicRequest *request);
-// esp_err_t getMetrics(PsychicRequest *request);
 
 void reset();
 void restart();
 void sleep();
 void status(JsonObject &root);
-void metrics(JsonObject &root);
-
-void emitMetrics(Websocket &socket);
 
 const char *resetReason(esp_reset_reason_t reason);
 } // namespace system_service
\ No newline at end of file
diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp
index 60018f4..0f86512 100644
--- a/esp32/src/main.cpp
+++ b/esp32/src/main.cpp
@@ -54,8 +54,6 @@ void setupServer() {
               [&](PsychicRequest *request, JsonVariant &json) { return system_service::handleRestart(request); });
     server.on("/api/system/sleep", HTTP_POST,
               [&](PsychicRequest *request, JsonVariant &json) { return system_service::handleSleep(request); });
-    // server.on("/api/system/metrics", HTTP_GET,
-    //           [&](PsychicRequest *request) { return system_service::getMetrics(request); });
 #if USE_CAMERA
     server.on("/api/camera/still", HTTP_GET,
               [&](PsychicRequest *request) { return cameraService.cameraStill(request); });
diff --git a/esp32/src/system_service.cpp b/esp32/src/system_service.cpp
index 76b8f2d..03d6ed4 100644
--- a/esp32/src/system_service.cpp
+++ b/esp32/src/system_service.cpp
@@ -26,13 +26,6 @@ esp_err_t getStatus(PsychicRequest *request) {
     return response.send();
 }
 
-// esp_err_t getMetrics(PsychicRequest *request) {
-//     PsychicJsonResponse response = PsychicJsonResponse(request, false);
-//     JsonObject root = response.getRoot();
-//     metrics(root);
-//     return response.send();
-// }
-
 void reset() {
     ESP_LOGI(TAG, "Resetting device");
     File root = ESP_FS.open(FS_CONFIG_DIRECTORY);
@@ -110,32 +103,6 @@ void status(JsonObject &root) {
     root["uptime"] = esp_timer_get_time() / 1000000;
 }
 
-void metrics(socket_message_WebsocketMessage *msg) {
-    msg->which_message = socket_message_WebsocketMessage_analytics_tag;
-
-    msg->message.analytics.uptime = esp_timer_get_time() / 1000000;
-    msg->message.analytics.free_heap = ESP.getFreeHeap();
-    msg->message.analytics.total_heap = ESP.getHeapSize();
-    msg->message.analytics.min_free_heap = ESP.getMinFreeHeap();
-    msg->message.analytics.max_alloc_heap = ESP.getMaxAllocHeap();
-    msg->message.analytics.fs_used = ESP_FS.usedBytes();
-    msg->message.analytics.fs_total = ESP_FS.totalBytes();
-    msg->message.analytics.core_temp = temperatureRead();
-}
-
-void emitMetrics(Websocket &socket) {
-    // if (!socket.hasSubscribers(EVENT_ANALYTICS)) return;
-
-    // TODO: redo -1 as static
-    socket.send_wsm_by_function(metrics, -1);
-
-    // JsonDocument doc;
-    // JsonObject root = doc.to<JsonObject>();
-    // system_service::metrics(root);
-    // JsonVariant data = doc.as<JsonVariant>();
-    // socket.emit(EVENT_ANALYTICS, data);
-}
-
 const char *resetReason(esp_reset_reason_t reason) {
     switch (reason) {
         case ESP_RST_UNKNOWN: return "Reset reason can not be determined";