diff --git a/monkey/monkey_island/cc/resources/reporting/report.py b/monkey/monkey_island/cc/resources/reporting/report.py
index f1b95607f..546f944a3 100644
--- a/monkey/monkey_island/cc/resources/reporting/report.py
+++ b/monkey/monkey_island/cc/resources/reporting/report.py
@@ -5,6 +5,7 @@ from flask import jsonify
 
 from monkey_island.cc.resources.auth.auth import jwt_required
 from monkey_island.cc.services.reporting.report import ReportService
+from monkey_island.cc.services.zero_trust.monkey_finding_service import MonkeyFindingService
 from monkey_island.cc.services.zero_trust.zero_trust_service import \
     ZeroTrustService
 
@@ -35,6 +36,6 @@ class Report(flask_restful.Resource):
             elif report_data == REPORT_DATA_PRINCIPLES_STATUS:
                 return jsonify(ZeroTrustService.get_principles_status())
             elif report_data == REPORT_DATA_FINDINGS:
-                return jsonify(ZeroTrustService.get_all_monkey_findings())
+                return jsonify(MonkeyFindingService.get_all_monkey_findings())
 
         flask_restful.abort(http.client.NOT_FOUND)
diff --git a/monkey/monkey_island/cc/services/zero_trust/zero_trust_service.py b/monkey/monkey_island/cc/services/zero_trust/zero_trust_service.py
index 613132a54..75af0da0a 100644
--- a/monkey/monkey_island/cc/services/zero_trust/zero_trust_service.py
+++ b/monkey/monkey_island/cc/services/zero_trust/zero_trust_service.py
@@ -1,7 +1,3 @@
-from typing import List
-
-from bson.objectid import ObjectId
-
 import common.common_consts.zero_trust_consts as zero_trust_consts
 from monkey_island.cc.models.zero_trust.finding import Finding