diff --git a/internal/core/src/index/knowhere/knowhere/index/vector_index/Statistics.cpp b/internal/core/src/index/knowhere/knowhere/index/vector_index/Statistics.cpp
index 560d02b9d1..e3a56c5fdf 100644
--- a/internal/core/src/index/knowhere/knowhere/index/vector_index/Statistics.cpp
+++ b/internal/core/src/index/knowhere/knowhere/index/vector_index/Statistics.cpp
@@ -11,17 +11,12 @@
 
 #include <algorithm>
 #include <cstdio>
-#include <functional>
-#include <memory>
 #include <string>
 #include <unordered_map>
-#include <utility>
 #include <vector>
 
 #include "IndexIVF.h"
-#include "faiss/utils/ConcurrentBitset.h"
 #include "knowhere/common/Log.h"
-#include "knowhere/index/IndexType.h"
 #include "knowhere/index/vector_index/Statistics.h"
 
 namespace milvus {
diff --git a/internal/core/src/index/knowhere/knowhere/index/vector_index/Statistics.h b/internal/core/src/index/knowhere/knowhere/index/vector_index/Statistics.h
index ff67150b47..fae2db9236 100644
--- a/internal/core/src/index/knowhere/knowhere/index/vector_index/Statistics.h
+++ b/internal/core/src/index/knowhere/knowhere/index/vector_index/Statistics.h
@@ -20,7 +20,6 @@
 #include <utility>
 #include <vector>
 
-#include "faiss/utils/ConcurrentBitset.h"
 #include "knowhere/common/Log.h"
 #include "knowhere/index/IndexType.h"
 
diff --git a/internal/core/src/index/knowhere/knowhere/index/vector_index/VecIndex.h b/internal/core/src/index/knowhere/knowhere/index/vector_index/VecIndex.h
index b39ea83de8..8c1ca005ea 100644
--- a/internal/core/src/index/knowhere/knowhere/index/vector_index/VecIndex.h
+++ b/internal/core/src/index/knowhere/knowhere/index/vector_index/VecIndex.h
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <faiss/utils/BitsetView.h>
-#include <faiss/utils/ConcurrentBitset.h>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/internal/core/src/index/thirdparty/NGT/lib/NGT/Graph.cpp b/internal/core/src/index/thirdparty/NGT/lib/NGT/Graph.cpp
index ab7e3dda9e..eca46bd288 100644
--- a/internal/core/src/index/thirdparty/NGT/lib/NGT/Graph.cpp
+++ b/internal/core/src/index/thirdparty/NGT/lib/NGT/Graph.cpp
@@ -710,7 +710,7 @@ NeighborhoodGraph::setupSeeds(NGT::SearchContainer &sc, ObjectDistances &seeds,
               distanceChecked.insert(neighbor.id);
 
               // judge if id in blacklist
-              if (!bitset.empty() && bitset.test((faiss::ConcurrentBitset::id_type_t)neighbor.id - 1)) {
+              if (!bitset.empty() && bitset.test((int64_t)neighbor.id - 1)) {
                   continue;
               }
 
diff --git a/internal/core/src/index/thirdparty/NGT/lib/NGT/Graph.h b/internal/core/src/index/thirdparty/NGT/lib/NGT/Graph.h
index 6044df58b5..7dd44d8eab 100644
--- a/internal/core/src/index/thirdparty/NGT/lib/NGT/Graph.h
+++ b/internal/core/src/index/thirdparty/NGT/lib/NGT/Graph.h
@@ -23,7 +23,6 @@
 #include	"NGT/Common.h"
 #include	"NGT/ObjectSpaceRepository.h"
 
-#include "faiss/utils/ConcurrentBitset.h"
 #include "faiss/utils/BitsetView.h"
 
 #include	"NGT/HashBasedBooleanSet.h"
diff --git a/internal/core/src/index/thirdparty/NGT/lib/NGT/Tree.h b/internal/core/src/index/thirdparty/NGT/lib/NGT/Tree.h
index 71c0c2826a..4c4f0b0976 100644
--- a/internal/core/src/index/thirdparty/NGT/lib/NGT/Tree.h
+++ b/internal/core/src/index/thirdparty/NGT/lib/NGT/Tree.h
@@ -19,7 +19,6 @@
 #include "NGT/Common.h"
 #include "NGT/Node.h"
 #include "NGT/defines.h"
-#include "faiss/utils/ConcurrentBitset.h"
 #include "faiss/utils/BitsetView.h"
 
 #include <sstream>
diff --git a/internal/core/src/index/thirdparty/annoy/src/annoylib.h b/internal/core/src/index/thirdparty/annoy/src/annoylib.h
index deecc8fa41..9d1811ad9f 100644
--- a/internal/core/src/index/thirdparty/annoy/src/annoylib.h
+++ b/internal/core/src/index/thirdparty/annoy/src/annoylib.h
@@ -120,7 +120,6 @@ inline void set_error_from_string(char **error, const char* msg) {
 #include <intrin.h>
 #elif defined(__GNUC__)
 #include <x86intrin.h>
-#include "faiss/utils/ConcurrentBitset.h"
 #include "faiss/utils/BitsetView.h"
 
 #endif
@@ -1356,12 +1355,12 @@ protected:
       Node* nd = _get(i);
       q.pop();
       if (nd->n_descendants == 1 && i < _n_items) { // raw data
-        if (bitset.empty() || !bitset.test((faiss::ConcurrentBitset::id_type_t)i))
+        if (bitset.empty() || !bitset.test((int64_t)i))
           nns.push_back(i);
       } else if (nd->n_descendants <= _K) {
         const S* dst = nd->children;
         for (auto ii = 0; ii < nd->n_descendants; ++ ii) {
-          if (bitset.empty() || !bitset.test((faiss::ConcurrentBitset::id_type_t)dst[ii]))
+          if (bitset.empty() || !bitset.test((int64_t)dst[ii]))
             nns.push_back(dst[ii]);
 //            nns.insert(nns.end(), dst, &dst[nd->n_descendants]);
         }
diff --git a/internal/core/src/index/thirdparty/faiss/Index.h b/internal/core/src/index/thirdparty/faiss/Index.h
index a881735529..efa4245dde 100644
--- a/internal/core/src/index/thirdparty/faiss/Index.h
+++ b/internal/core/src/index/thirdparty/faiss/Index.h
@@ -11,7 +11,6 @@
 #define FAISS_INDEX_H
 
 #include <faiss/MetricType.h>
-#include <faiss/utils/ConcurrentBitset.h>
 #include <faiss/utils/BitsetView.h>
 #include <cstdio>
 #include <typeinfo>
diff --git a/internal/core/src/index/thirdparty/faiss/IndexIVF.h b/internal/core/src/index/thirdparty/faiss/IndexIVF.h
index dbfaae82c8..df4a3c17e5 100644
--- a/internal/core/src/index/thirdparty/faiss/IndexIVF.h
+++ b/internal/core/src/index/thirdparty/faiss/IndexIVF.h
@@ -23,7 +23,6 @@
 #include <faiss/DirectMap.h>
 #include <faiss/Clustering.h>
 #include <faiss/utils/Heap.h>
-#include <faiss/utils/ConcurrentBitset.h>
 #include <faiss/common.h>
 
 namespace faiss {
diff --git a/internal/core/src/index/thirdparty/faiss/IndexIVFPQ.cpp b/internal/core/src/index/thirdparty/faiss/IndexIVFPQ.cpp
index f698bf9b95..e1e220616c 100644
--- a/internal/core/src/index/thirdparty/faiss/IndexIVFPQ.cpp
+++ b/internal/core/src/index/thirdparty/faiss/IndexIVFPQ.cpp
@@ -804,7 +804,7 @@ struct KnnSearchResults {
     inline void add (idx_t j, float dis, const BitsetView bitset = nullptr) {
         if (C::cmp (heap_sim[0], dis)) {
             idx_t id = ids ? ids[j] : lo_build (key, j);
-            if (!bitset.empty() && bitset.test((faiss::ConcurrentBitset::id_type_t)id))
+            if (!bitset.empty() && bitset.test((int64_t)id))
                 return;
             heap_swap_top<C> (k, heap_sim, heap_ids, dis, id);
             nup++;
diff --git a/internal/core/src/index/thirdparty/faiss/gpu/GpuIndex.h b/internal/core/src/index/thirdparty/faiss/gpu/GpuIndex.h
index 0c6d5cf958..ff63a307f1 100644
--- a/internal/core/src/index/thirdparty/faiss/gpu/GpuIndex.h
+++ b/internal/core/src/index/thirdparty/faiss/gpu/GpuIndex.h
@@ -10,7 +10,6 @@
 
 #include <faiss/Index.h>
 #include <faiss/gpu/utils/MemorySpace.h>
-#include <faiss/utils/ConcurrentBitset.h>
 
 namespace faiss { namespace gpu {
 
diff --git a/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexFlat.h b/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexFlat.h
index 9ac71e7cf2..f8d7bebba4 100644
--- a/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexFlat.h
+++ b/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexFlat.h
@@ -10,7 +10,6 @@
 
 #include <vector>
 #include <faiss/gpu/GpuIndex.h>
-#include <faiss/utils/ConcurrentBitset.h>
 
 namespace faiss {
 
diff --git a/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexIVFFlat.h b/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexIVFFlat.h
index c51043b681..c2945b3efa 100644
--- a/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexIVFFlat.h
+++ b/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexIVFFlat.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <faiss/gpu/GpuIndexIVF.h>
-#include <faiss/utils/ConcurrentBitset.h>
 
 namespace faiss { struct IndexIVFFlat; }
 
diff --git a/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexIVFPQ.h b/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexIVFPQ.h
index d4681f3ec2..968aca8578 100644
--- a/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexIVFPQ.h
+++ b/internal/core/src/index/thirdparty/faiss/gpu/GpuIndexIVFPQ.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <faiss/gpu/GpuIndexIVF.h>
-#include <faiss/utils/ConcurrentBitset.h>
 #include <vector>
 
 namespace faiss { struct IndexIVFPQ; }
diff --git a/internal/core/src/index/thirdparty/faiss/gpu/impl/Distance.cuh b/internal/core/src/index/thirdparty/faiss/gpu/impl/Distance.cuh
index 3430ddf87f..c2fdc95524 100644
--- a/internal/core/src/index/thirdparty/faiss/gpu/impl/Distance.cuh
+++ b/internal/core/src/index/thirdparty/faiss/gpu/impl/Distance.cuh
@@ -11,7 +11,6 @@
 #include <faiss/gpu/utils/DeviceTensor.cuh>
 #include <faiss/gpu/utils/Float16.cuh>
 #include <faiss/gpu/impl/GeneralDistance.cuh>
-#include <faiss/utils/ConcurrentBitset.h>
 
 namespace faiss { namespace gpu {
 
diff --git a/internal/core/src/index/thirdparty/faiss/impl/RHNSW.cpp b/internal/core/src/index/thirdparty/faiss/impl/RHNSW.cpp
index 51e36f6b90..325b33f608 100644
--- a/internal/core/src/index/thirdparty/faiss/impl/RHNSW.cpp
+++ b/internal/core/src/index/thirdparty/faiss/impl/RHNSW.cpp
@@ -243,7 +243,7 @@ RHNSW::search_base_layer(DistanceComputer& ptdis,
   std::priority_queue<Node, std::vector<Node>, CompareByFirst> candidate_set;
 
   float lb;
-  if (bitset.empty() || !bitset.test((faiss::ConcurrentBitset::id_type_t)(nearest))) {
+  if (bitset.empty() || !bitset.test((int64_t)nearest)) {
     lb = d_nearest;
     top_candidates.emplace(d_nearest, nearest);
     candidate_set.emplace(-d_nearest, nearest);
@@ -268,7 +268,7 @@ RHNSW::search_base_layer(DistanceComputer& ptdis,
         float dcand = ptdis(candidate_id);
         if (top_candidates.size() < ef || lb > dcand) {
           candidate_set.emplace(-dcand, candidate_id);
-          if (bitset.empty() || !bitset.test((faiss::ConcurrentBitset::id_type_t)(candidate_id)))
+          if (bitset.empty() || !bitset.test((int64_t)candidate_id))
             top_candidates.emplace(dcand, candidate_id);
           if (top_candidates.size() > ef)
             top_candidates.pop();
diff --git a/internal/core/src/index/thirdparty/faiss/utils/distances.cpp b/internal/core/src/index/thirdparty/faiss/utils/distances.cpp
index 7746e9df2e..ce0ffc246f 100644
--- a/internal/core/src/index/thirdparty/faiss/utils/distances.cpp
+++ b/internal/core/src/index/thirdparty/faiss/utils/distances.cpp
@@ -18,7 +18,6 @@
 #include <faiss/FaissHook.h>
 #include <faiss/impl/AuxIndexStructures.h>
 #include <faiss/impl/FaissAssert.h>
-#include <faiss/utils/ConcurrentBitset.h>
 
 
 #ifndef FINTEGER
@@ -865,7 +864,7 @@ static void range_search_blas (
 
                 for (size_t j = j0; j < j1; j++) {
                     float ip = *ip_line++;
-                    if (bitset.empty() || !bitset.test((faiss::ConcurrentBitset::id_type_t)(j))) {
+                    if (bitset.empty() || !bitset.test((int64_t)j)) {
                         if (compute_l2) {
                             float dis =  x_norms[i] + y_norms[j] - 2 * ip;
                             if (dis < radius) {
@@ -912,7 +911,7 @@ static void range_search_sse (const float * x,
             RangeQueryResult & qres = pres->new_result (i);
 
             for (j = 0; j < ny; j++) {
-                if (bitset.empty() || !bitset.test((faiss::ConcurrentBitset::id_type_t)(j))) {
+                if (bitset.empty() || !bitset.test((int64_t)j)) {
                     if (compute_l2) {
                         float disij = fvec_L2sqr (x_, y_, d);
                         if (disij < radius) {
@@ -962,7 +961,7 @@ static void range_search_sse_sq (const float * x,
 #pragma omp for
         for (j = 0; j < ny; j++) {
             const float * y_ = y + j * d;
-            if (bitset.empty() || !bitset.test((faiss::ConcurrentBitset::id_type_t)(j))) {
+            if (bitset.empty() || !bitset.test((int64_t)j)) {
                 if (compute_l2) {
                     float disij = fvec_L2sqr (x_, y_, d);
                     if (disij < radius) {
diff --git a/internal/core/src/index/thirdparty/faiss/utils/distances.h b/internal/core/src/index/thirdparty/faiss/utils/distances.h
index 6ccff27773..eb59711faf 100644
--- a/internal/core/src/index/thirdparty/faiss/utils/distances.h
+++ b/internal/core/src/index/thirdparty/faiss/utils/distances.h
@@ -15,7 +15,6 @@
 #include <stdint.h>
 
 #include <faiss/utils/Heap.h>
-#include <faiss/utils/ConcurrentBitset.h>
 #include <faiss/utils/BitsetView.h>
 #include <faiss/impl/AuxIndexStructures.h>
 
diff --git a/internal/core/src/index/thirdparty/faiss/utils/extra_distances.cpp b/internal/core/src/index/thirdparty/faiss/utils/extra_distances.cpp
index 6f6a20a709..8933c613f9 100644
--- a/internal/core/src/index/thirdparty/faiss/utils/extra_distances.cpp
+++ b/internal/core/src/index/thirdparty/faiss/utils/extra_distances.cpp
@@ -16,7 +16,6 @@
 #include <faiss/utils/utils.h>
 #include <faiss/impl/FaissAssert.h>
 #include <faiss/impl/AuxIndexStructures.h>
-#include <faiss/utils/ConcurrentBitset.h>
 
 namespace faiss {
 
diff --git a/internal/core/src/index/thirdparty/faiss/utils/hamming.cpp b/internal/core/src/index/thirdparty/faiss/utils/hamming.cpp
index c95bb38e39..d84c36ffd0 100644
--- a/internal/core/src/index/thirdparty/faiss/utils/hamming.cpp
+++ b/internal/core/src/index/thirdparty/faiss/utils/hamming.cpp
@@ -408,7 +408,7 @@ void hamming_range_search_template (
 
 #pragma omp for
         for (size_t j = 0; j < nb; j++) {
-            if (bitset.empty() || !bitset.test((ConcurrentBitset::id_type_t)j)) {
+            if (bitset.empty() || !bitset.test((int64_t)j)) {
                 int dis = hc.compute (yi + j * code_size);
                 if (dis < radius) {
                     qres.add(dis, j);
diff --git a/internal/core/src/index/thirdparty/faiss/utils/hamming.h b/internal/core/src/index/thirdparty/faiss/utils/hamming.h
index 232064b1b5..55cdcf57f3 100644
--- a/internal/core/src/index/thirdparty/faiss/utils/hamming.h
+++ b/internal/core/src/index/thirdparty/faiss/utils/hamming.h
@@ -28,7 +28,6 @@
 #include <stdint.h>
 
 #include <faiss/utils/Heap.h>
-#include <faiss/utils/ConcurrentBitset.h>
 #include <faiss/utils/BitsetView.h>
 #include <faiss/impl/AuxIndexStructures.h>
 
diff --git a/internal/core/src/index/thirdparty/hnswlib/hnswalg.h b/internal/core/src/index/thirdparty/hnswlib/hnswalg.h
index 90a81eff09..b35e857a69 100644
--- a/internal/core/src/index/thirdparty/hnswlib/hnswalg.h
+++ b/internal/core/src/index/thirdparty/hnswlib/hnswalg.h
@@ -242,7 +242,7 @@ class HierarchicalNSW : public AlgorithmInterface<dist_t> {
 
         dist_t lowerBound;
 //        if (!has_deletions || !isMarkedDeleted(ep_id)) {
-          if (!has_deletions || !bitset.test((faiss::ConcurrentBitset::id_type_t)(ep_id))) {
+          if (!has_deletions || !bitset.test((int64_t)ep_id)) {
             dist_t dist = fstdistfunc_(data_point, getDataByInternalId(ep_id), dist_func_param_);
             lowerBound = dist;
             top_candidates.emplace(dist, ep_id);
@@ -299,7 +299,7 @@ class HierarchicalNSW : public AlgorithmInterface<dist_t> {
 #endif
 
 //                        if (!has_deletions || !isMarkedDeleted(candidate_id))
-                        if (!has_deletions || (!bitset.test((faiss::ConcurrentBitset::id_type_t)(candidate_id)))) {
+                        if (!has_deletions || (!bitset.test((int64_t)candidate_id))) {
                             top_candidates.emplace(dist, candidate_id);
                         }
 
diff --git a/internal/core/src/index/thirdparty/hnswlib/hnswlib.h b/internal/core/src/index/thirdparty/hnswlib/hnswlib.h
index b508005e86..1111051d80 100644
--- a/internal/core/src/index/thirdparty/hnswlib/hnswlib.h
+++ b/internal/core/src/index/thirdparty/hnswlib/hnswlib.h
@@ -28,7 +28,6 @@
 #include <vector>
 
 #include <string.h>
-#include <faiss/utils/ConcurrentBitset.h>
 #include <faiss/utils/BitsetView.h>
 
 namespace hnswlib {