diff --git a/analytics-service/src/main/java/com/posthub/analytics/dto/UserEvent.java b/analytics-service/src/main/java/com/posthub/analytics/dto/UserEvent.java
index 39f8655..d2cab04 100644
--- a/analytics-service/src/main/java/com/posthub/analytics/dto/UserEvent.java
+++ b/analytics-service/src/main/java/com/posthub/analytics/dto/UserEvent.java
@@ -26,7 +26,6 @@ public class UserEvent {
         USER_CREATED,
         CHAT_CREATED,
         CHAT_DELETED,
-        QUERY_SENT,
-        RAG_CONTEXT_HIT
+        QUERY_SENT
     }
 }
diff --git a/analytics-service/src/main/java/com/posthub/analytics/service/AnalyticsService.java b/analytics-service/src/main/java/com/posthub/analytics/service/AnalyticsService.java
index 9456b77..d3f5bda 100644
--- a/analytics-service/src/main/java/com/posthub/analytics/service/AnalyticsService.java
+++ b/analytics-service/src/main/java/com/posthub/analytics/service/AnalyticsService.java
@@ -65,12 +65,6 @@ public class AnalyticsService {
                     daily.setTotalTokensUsed(daily.getTotalTokensUsed() + event.getTokensUsed());
                 }
             }
-            case RAG_CONTEXT_HIT -> {
-                daily.setTotalRagHits(daily.getTotalRagHits() + 1);
-                if (event.getDocumentsFound() != null) {
-                    daily.setTotalDocumentsFound(daily.getTotalDocumentsFound() + event.getDocumentsFound());
-                }
-            }
         }
 
         dailyStatsRepository.save(daily);
@@ -93,7 +87,6 @@ public class AnalyticsService {
                     userStats.setTotalTokensUsed(userStats.getTotalTokensUsed() + event.getTokensUsed());
                 }
             }
-            case RAG_CONTEXT_HIT -> userStats.setTotalRagHits(userStats.getTotalRagHits() + 1);
             default -> { /* no user-level aggregation needed */ }
         }
 
diff --git a/rag-service/src/main/java/com/balex/rag/controller/ChatEntryController.java b/rag-service/src/main/java/com/balex/rag/controller/ChatEntryController.java
index c43b1ba..1b9be88 100644
--- a/rag-service/src/main/java/com/balex/rag/controller/ChatEntryController.java
+++ b/rag-service/src/main/java/com/balex/rag/controller/ChatEntryController.java
@@ -41,8 +41,7 @@ public class ChatEntryController {
 
         eventPublisher.publishQuerySent(
                 chat.getIdOwner().toString(),
-                chatId.toString(),
-                0);  // TODO: add tokensUsed when usage info is available from Groq response
+                chatId.toString());
 
         return ResponseEntity.ok(entry);
     }
diff --git a/rag-service/src/main/java/com/balex/rag/model/dto/UserEvent.java b/rag-service/src/main/java/com/balex/rag/model/dto/UserEvent.java
index e8c111b..93f1101 100644
--- a/rag-service/src/main/java/com/balex/rag/model/dto/UserEvent.java
+++ b/rag-service/src/main/java/com/balex/rag/model/dto/UserEvent.java
@@ -22,8 +22,6 @@ public class UserEvent {
     private EventType type;
     private String userId;
     private String chatId;
-    private Integer tokensUsed;
-    private Integer documentsFound;
 
     @Builder.Default
     private Instant timestamp = Instant.now();
diff --git a/rag-service/src/main/java/com/balex/rag/service/EventPublisher.java b/rag-service/src/main/java/com/balex/rag/service/EventPublisher.java
index dd90ac8..3d5825c 100644
--- a/rag-service/src/main/java/com/balex/rag/service/EventPublisher.java
+++ b/rag-service/src/main/java/com/balex/rag/service/EventPublisher.java
@@ -6,7 +6,7 @@ public interface EventPublisher {
 
     void publishChatDeleted(String userId, String chatId);
 
-    void publishQuerySent(String userId, String chatId, int tokensUsed);
+    void publishQuerySent(String userId, String chatId);
 
     void publishUserCreated(String userId);
 }
\ No newline at end of file
diff --git a/rag-service/src/main/java/com/balex/rag/service/impl/EventPublisherImpl.java b/rag-service/src/main/java/com/balex/rag/service/impl/EventPublisherImpl.java
index 0c59bc2..042c377 100644
--- a/rag-service/src/main/java/com/balex/rag/service/impl/EventPublisherImpl.java
+++ b/rag-service/src/main/java/com/balex/rag/service/impl/EventPublisherImpl.java
@@ -38,12 +38,11 @@ public class EventPublisherImpl implements EventPublisher {
     }
 
     @Override
-    public void publishQuerySent(String userId, String chatId, int tokensUsed) {
+    public void publishQuerySent(String userId, String chatId) {
         publish(UserEvent.builder()
                 .type(EventType.QUERY_SENT)
                 .userId(userId)
                 .chatId(chatId)
-                .tokensUsed(tokensUsed)
                 .build());
     }