diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/middleware.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/middleware.ts
index d1b9a2cde4b31..bcfd6b96c9eb8 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/middleware.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/middleware.ts
@@ -70,7 +70,6 @@ export const hostMiddlewareFactory: ImmutableMiddlewareFactory<HostState> = core
           type: 'serverReturnedHostDetails',
           payload: response,
         });
-        // FIXME: once we have the API implementation in place, we should call it parallel with the above api call and then dispatch this with the results of the second call
         dispatch({
           type: 'serverReturnedHostPolicyResponse',
           payload: {
diff --git a/x-pack/plugins/endpoint/server/routes/alerts/list/lib/index.ts b/x-pack/plugins/endpoint/server/routes/alerts/list/lib/index.ts
index 92bd07a813d26..114251820ce4b 100644
--- a/x-pack/plugins/endpoint/server/routes/alerts/list/lib/index.ts
+++ b/x-pack/plugins/endpoint/server/routes/alerts/list/lib/index.ts
@@ -60,8 +60,6 @@ export const getRequestData = async (
     reqData.fromIndex = reqData.pageIndex * reqData.pageSize;
   }
 
-  // See: https://github.com/elastic/elasticsearch-js/issues/662
-  // and https://github.com/elastic/endpoint-app-team/issues/221
   if (
     reqData.searchBefore !== undefined &&
     reqData.searchBefore[0] === '' &&
diff --git a/x-pack/plugins/endpoint/server/routes/metadata/index.ts b/x-pack/plugins/endpoint/server/routes/metadata/index.ts
index 99dc4ac9f9e33..08950930441df 100644
--- a/x-pack/plugins/endpoint/server/routes/metadata/index.ts
+++ b/x-pack/plugins/endpoint/server/routes/metadata/index.ts
@@ -171,7 +171,6 @@ async function enrichHostMetadata(
   try {
     /**
      * Get agent status by elastic agent id if available or use the host id.
-     * https://github.com/elastic/endpoint-app-team/issues/354
      */
 
     if (!elasticAgentId) {